NOISSUE force saving of any outstanding instance component state on exit

MultiMC · Dec 3, 2017 · 95e6f37 · 95e6f37
1 parent e0bea1e
commit 95e6f37
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 15 deletions.
diff --git a/api/logic/BaseInstance.h b/api/logic/BaseInstance.h
@@ -70,6 +70,7 @@ class MULTIMC_LOGIC_EXPORT BaseInstance : public QObject, public std::enable_sha
 	virtual ~BaseInstance() {};
 
 	virtual void init() = 0;
+	virtual void saveNow() = 0;
 
 	/// nuke thoroughly - deletes the instance contents, notifies the list/model which is
 	/// responsible of cleaning up the husk

diff --git a/api/logic/InstanceList.cpp b/api/logic/InstanceList.cpp
@@ -241,6 +241,14 @@ InstanceList::InstListError InstanceList::loadList(bool complete)
 	return NoError;
 }
 
+void InstanceList::saveNow()
+{
+	for(auto & item: m_instances)
+	{
+		item->saveNow();
+	}
+}
+
 void InstanceList::add(const QList<InstancePtr> &t)
 {
 	beginInsertRows(QModelIndex(), m_instances.count(), m_instances.count() + t.size() - 1);

diff --git a/api/logic/InstanceList.h b/api/logic/InstanceList.h
@@ -73,6 +73,7 @@ class MULTIMC_LOGIC_EXPORT InstanceList : public QAbstractListModel
 	}
 
 	InstListError loadList(bool complete = false);
+	void saveNow();
 
 	/// Add an instance provider. Takes ownership of it. Should only be done before the first load.
 	void addInstanceProvider(BaseInstanceProvider * provider);

diff --git a/api/logic/NullInstance.h b/api/logic/NullInstance.h
@@ -12,7 +12,10 @@ class NullInstance: public BaseInstance
 	virtual ~NullInstance() {};
 	virtual void init() override
 	{
-	};
+	}
+	virtual void saveNow() override
+	{
+	}
 	virtual QString getStatusbarDescription() override
 	{
 		return tr("Unknown instance type");

diff --git a/api/logic/minecraft/ComponentList.cpp b/api/logic/minecraft/ComponentList.cpp
@@ -43,16 +43,12 @@ ComponentList::ComponentList(MinecraftInstance * instance)
 	d->m_instance = instance;
 	d->m_saveTimer.setSingleShot(true);
 	d->m_saveTimer.setInterval(5000);
-	connect(&d->m_saveTimer, &QTimer::timeout, this, &ComponentList::save);
+	connect(&d->m_saveTimer, &QTimer::timeout, this, &ComponentList::save_internal);
 }
 
 ComponentList::~ComponentList()
 {
-	if(saveIsScheduled())
-	{
-		d->m_saveTimer.stop();
-		save();
-	}
+	saveNow();
 }
 
 // BEGIN: component file format
@@ -212,6 +208,15 @@ static bool loadComponentList(ComponentList * parent, const QString & filename,
 
 // BEGIN: save/load logic
 
+void ComponentList::saveNow()
+{
+	if(saveIsScheduled())
+	{
+		d->m_saveTimer.stop();
+		save_internal();
+	}
+}
+
 bool ComponentList::saveIsScheduled() const
 {
 	return d->dirty;
@@ -253,7 +258,7 @@ QString ComponentList::patchFilePathForUid(const QString& uid) const
 	return patchesPattern().arg(uid);
 }
 
-void ComponentList::save()
+void ComponentList::save_internal()
 {
 	qDebug() << "Component list save performed now for" << d->m_instance->name();
 	auto filename = componentsFilePath();
@@ -321,10 +326,7 @@ void ComponentList::reload(Net::Mode netmode)
 	}
 
 	// flush any scheduled saves to not lose state
-	if(saveIsScheduled())
-	{
-		save();
-	}
+	saveNow();
 
 	// FIXME: differentiate when a reapply is required by propagating state from components
 	invalidateLaunchProfile();

diff --git a/api/logic/minecraft/ComponentList.h b/api/logic/minecraft/ComponentList.h
@@ -104,6 +104,10 @@ class MULTIMC_LOGIC_EXPORT ComponentList : public QAbstractListModel
 	bool setComponentVersion(const QString &uid, const QString &version, bool important = false);
 
 	QString patchFilePathForUid(const QString &uid) const;
+
+	/// if there is a save scheduled, do it now.
+	void saveNow();
+
 public:
 	/// get the profile component by id
 	ComponentPtr getComponent(const QString &id);
@@ -127,7 +131,7 @@ class MULTIMC_LOGIC_EXPORT ComponentList : public QAbstractListModel
 	QString patchesPattern() const;
 
 private slots:
-	void save();
+	void save_internal();
 	void updateSucceeded();
 	void updateFailed(const QString & error);
 	void componentDataChanged();

diff --git a/api/logic/minecraft/MinecraftInstance.cpp b/api/logic/minecraft/MinecraftInstance.cpp
@@ -115,6 +115,11 @@ void MinecraftInstance::init()
 {
 }
 
+void MinecraftInstance::saveNow()
+{
+	m_components->saveNow();
+}
+
 QString MinecraftInstance::typeName() const
 {
 	return "Minecraft";

diff --git a/api/logic/minecraft/MinecraftInstance.h b/api/logic/minecraft/MinecraftInstance.h
@@ -18,6 +18,7 @@ class MULTIMC_LOGIC_EXPORT MinecraftInstance: public BaseInstance
 	MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
 	virtual ~MinecraftInstance() {};
 	virtual void init() override;
+	virtual void saveNow();
 
 	// FIXME: remove
 	QString typeName() const override;

diff --git a/api/logic/minecraft/legacy/LegacyInstance.h b/api/logic/minecraft/legacy/LegacyInstance.h
@@ -34,7 +34,8 @@ class MULTIMC_LOGIC_EXPORT LegacyInstance : public BaseInstance
 
 	explicit LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
 
-	virtual void init() override {};
+	virtual void init() override {}
+	virtual void saveNow() override {}
 
 	/// Path to the instance's minecraft.jar
 	QString runnableJar() const;

diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp
@@ -644,7 +644,8 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
 	connect(this, &MultiMC::aboutToQuit, [this](){
 		if(m_instances)
 		{
-			// m_instances->saveGroupList();
+			// save any remaining instance state
+			m_instances->saveNow();
 		}
 		if(logFile)
 		{