Add instance copying, fix instance creation (with identical names)
This commit is contained in:
@ -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;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
Reference in New Issue
Block a user