summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
Diffstat (limited to 'logic')
-rw-r--r--logic/InstanceFactory.cpp118
-rw-r--r--logic/InstanceFactory.h38
2 files changed, 102 insertions, 54 deletions
diff --git a/logic/InstanceFactory.cpp b/logic/InstanceFactory.cpp
index 0da62803..e64d22ca 100644
--- a/logic/InstanceFactory.cpp
+++ b/logic/InstanceFactory.cpp
@@ -3,7 +3,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -34,30 +34,29 @@
InstanceFactory InstanceFactory::loader;
-InstanceFactory::InstanceFactory() :
- QObject(NULL)
+InstanceFactory::InstanceFactory() : QObject(NULL)
{
-
}
-InstanceFactory::InstLoadError InstanceFactory::loadInstance(BaseInstance *&inst, const QString &instDir)
+InstanceFactory::InstLoadError InstanceFactory::loadInstance(BaseInstance *&inst,
+ const QString &instDir)
{
auto m_settings = new INISettingsObject(PathCombine(instDir, "instance.cfg"));
-
+
m_settings->registerSetting(new Setting("InstanceType", "Legacy"));
-
+
QString inst_type = m_settings->get("InstanceType").toString();
-
- //FIXME: replace with a map lookup, where instance classes register their types
- if(inst_type == "Legacy")
+
+ // FIXME: replace with a map lookup, where instance classes register their types
+ if (inst_type == "Legacy")
{
inst = new LegacyInstance(instDir, m_settings, this);
}
- else if(inst_type == "OneSix")
+ else if (inst_type == "OneSix")
{
inst = new OneSixInstance(instDir, m_settings, this);
}
- else if(inst_type == "Nostalgia")
+ else if (inst_type == "Nostalgia")
{
inst = new NostalgiaInstance(instDir, m_settings, this);
}
@@ -68,50 +67,81 @@ InstanceFactory::InstLoadError InstanceFactory::loadInstance(BaseInstance *&inst
return NoLoadError;
}
-
-InstanceFactory::InstCreateError InstanceFactory::createInstance( BaseInstance*& inst, BaseVersionPtr version, const QString& instDir )
+InstanceFactory::InstCreateError InstanceFactory::createInstance(BaseInstance *&inst,
+ BaseVersionPtr version,
+ const QString &instDir)
{
QDir rootDir(instDir);
-
+
QLOG_DEBUG() << instDir.toUtf8();
if (!rootDir.exists() && !rootDir.mkpath("."))
{
return InstanceFactory::CantCreateDir;
}
auto mcVer = std::dynamic_pointer_cast<MinecraftVersion>(version);
- if(!mcVer)
+ if (!mcVer)
return InstanceFactory::NoSuchVersion;
-
+
auto m_settings = new INISettingsObject(PathCombine(instDir, "instance.cfg"));
m_settings->registerSetting(new Setting("InstanceType", "Legacy"));
-
- switch(mcVer->type)
+
+ switch (mcVer->type)
{
- case MinecraftVersion::Legacy:
- m_settings->set("InstanceType", "Legacy");
- inst = new LegacyInstance(instDir, m_settings, this);
- inst->setIntendedVersionId(version->descriptor());
- inst->setShouldUseCustomBaseJar(false);
- break;
- case MinecraftVersion::OneSix:
- m_settings->set("InstanceType", "OneSix");
- inst = new OneSixInstance(instDir, m_settings, this);
- inst->setIntendedVersionId(version->descriptor());
- inst->setShouldUseCustomBaseJar(false);
- break;
- case MinecraftVersion::Nostalgia:
- m_settings->set("InstanceType", "Nostalgia");
- inst = new NostalgiaInstance(instDir, m_settings, this);
- inst->setIntendedVersionId(version->descriptor());
- inst->setShouldUseCustomBaseJar(false);
- break;
- default:
- {
- delete m_settings;
- return InstanceFactory::NoSuchVersion;
- }
+ case MinecraftVersion::Legacy:
+ m_settings->set("InstanceType", "Legacy");
+ inst = new LegacyInstance(instDir, m_settings, this);
+ inst->setIntendedVersionId(version->descriptor());
+ inst->setShouldUseCustomBaseJar(false);
+ break;
+ case MinecraftVersion::OneSix:
+ m_settings->set("InstanceType", "OneSix");
+ inst = new OneSixInstance(instDir, m_settings, this);
+ inst->setIntendedVersionId(version->descriptor());
+ inst->setShouldUseCustomBaseJar(false);
+ break;
+ case MinecraftVersion::Nostalgia:
+ m_settings->set("InstanceType", "Nostalgia");
+ inst = new NostalgiaInstance(instDir, m_settings, this);
+ inst->setIntendedVersionId(version->descriptor());
+ inst->setShouldUseCustomBaseJar(false);
+ break;
+ default:
+ {
+ delete m_settings;
+ return InstanceFactory::NoSuchVersion;
+ }
}
-
- //FIXME: really, how do you even know?
+
+ // FIXME: really, how do you even know?
return InstanceFactory::NoCreateError;
}
+
+InstanceFactory::InstCreateError InstanceFactory::copyInstance(BaseInstance *&newInstance,
+ BaseInstance *&oldInstance,
+ const QString &instDir)
+{
+ QDir rootDir(instDir);
+
+ QLOG_DEBUG() << instDir.toUtf8();
+ if (!copyPath(oldInstance->instanceRoot(), instDir))
+ {
+ rootDir.removeRecursively();
+ return InstanceFactory::CantCreateDir;
+ }
+ auto error = loadInstance(newInstance, instDir);
+ switch(error)
+ {
+ case NoLoadError:
+ return NoCreateError;
+ case UnknownLoadError:
+ {
+ rootDir.removeRecursively();
+ return UnknownCreateError;
+ }
+ case NotAnInstance:
+ {
+ rootDir.removeRecursively();
+ return CantCreateDir;
+ }
+ };
+}
diff --git a/logic/InstanceFactory.h b/logic/InstanceFactory.h
index 1c527749..01e5af7e 100644
--- a/logic/InstanceFactory.h
+++ b/logic/InstanceFactory.h
@@ -3,7 +3,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -34,15 +34,18 @@ public:
/*!
* \brief Gets a reference to the instance loader.
*/
- static InstanceFactory &get() { return loader; }
-
+ static InstanceFactory &get()
+ {
+ return loader;
+ }
+
enum InstLoadError
{
NoLoadError = 0,
UnknownLoadError,
NotAnInstance
};
-
+
enum InstCreateError
{
NoCreateError = 0,
@@ -51,18 +54,33 @@ public:
InstExists,
CantCreateDir
};
-
+
/*!
* \brief Creates a stub instance
*
* \param inst Pointer to store the created instance in.
- * \param instDir The instance's directory.
+ * \param inst Game version to use for the instance
+ * \param instDir The new instance's directory.
+ * \return An InstCreateError error code.
+ * - InstExists if the given instance directory is already an instance.
+ * - CantCreateDir if the given instance directory cannot be created.
+ */
+ InstCreateError createInstance(BaseInstance *&inst, BaseVersionPtr version,
+ const QString &instDir);
+
+ /*!
+ * \brief Creates a copy of an existing instance with a new name
+ *
+ * \param newInstance Pointer to store the created instance in.
+ * \param oldInstance The instance to copy
+ * \param instDir The new instance's directory.
* \return An InstCreateError error code.
* - InstExists if the given instance directory is already an instance.
* - CantCreateDir if the given instance directory cannot be created.
*/
- InstCreateError createInstance(BaseInstance *&inst, BaseVersionPtr version, const QString &instDir);
-
+ InstCreateError copyInstance(BaseInstance *&newInstance, BaseInstance *&oldInstance,
+ const QString &instDir);
+
/*!
* \brief Loads an instance from the given directory.
* Checks the instance's INI file to figure out what the instance's type is first.
@@ -72,9 +90,9 @@ public:
* - NotAnInstance if the given instance directory isn't a valid instance.
*/
InstLoadError loadInstance(BaseInstance *&inst, const QString &instDir);
-
+
private:
InstanceFactory();
-
+
static InstanceFactory loader;
};