Merge branch 'master' of http://github.com/peterix/MultiMC5

Conflicts:
	CMakeLists.txt
	main.cpp

1 files changed, 155 insertions, 5 deletions

diff --git a/libmultimc/src/instancelist.cpp b/libmultimc/src/instancelist.cpp
index 78650634..f9c525d0 100644
--- a/libmultimc/src/instancelist.cpp
+++ b/libmultimc/src/instancelist.cpp
@@ -15,17 +15,21 @@
 
 #include "include/instancelist.h"
 
-#include "siglist_impl.h"
-
 #include <QDir>
 #include <QFile>
 #include <QDirIterator>
+#include <QThread>
+#include <QTextStream>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonArray>
 
 #include "include/instance.h"
 #include "include/instanceloader.h"
 
 #include "pathutils.h"
 
+const static int GROUP_FILE_FORMAT_VERSION = 1;
 
 InstanceList::InstanceList(const QString &instDir, QObject *parent) :
 	QObject(parent), m_instDir("instances")
@@ -38,6 +42,104 @@ InstanceList::InstListError InstanceList::loadList()
 	QDir dir(m_instDir);
 	QDirIterator iter(dir);
 	
+	QString groupFileName = m_instDir + "/instgroups.json";
+	// temporary map from instance ID to group name
+	QMap<QString, QString> groupMap;
+	
+	// HACK: this is really an if. breaks after one iteration.
+	while (QFileInfo(groupFileName).exists())
+	{
+		QFile groupFile(groupFileName);
+		
+		if (!groupFile.open(QIODevice::ReadOnly))
+		{
+			// An error occurred. Ignore it.
+			qDebug("Failed to read instance group file.");
+			break;
+		}
+		
+		QTextStream in(&groupFile);
+		QString jsonStr = in.readAll();
+		groupFile.close();
+		
+		QJsonParseError error;
+		QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonStr.toUtf8(), &error);
+		
+		if (error.error != QJsonParseError::NoError)
+		{
+			qWarning(QString("Failed to parse instance group file: %1 at offset %2").
+					 arg(error.errorString(), QString::number(error.offset)).toUtf8());
+			break;
+		}
+		
+		if (!jsonDoc.isObject())
+		{
+			qWarning("Invalid group file. Root entry should be an object.");
+			break;
+		}
+		
+		QJsonObject rootObj = jsonDoc.object();
+		
+		// Make sure the format version matches.
+		if (rootObj.value("formatVersion").toVariant().toInt() == GROUP_FILE_FORMAT_VERSION)
+		{
+			// Get the group list.
+			if (!rootObj.value("groups").isObject())
+			{
+				qWarning("Invalid group list JSON: 'groups' should be an object.");
+				break;
+			}
+			
+			// Iterate through the list.
+			QJsonObject groupList = rootObj.value("groups").toObject();
+			
+			for (QJsonObject::iterator iter = groupList.begin(); 
+				 iter != groupList.end(); iter++)
+			{
+				QString groupName = iter.key();
+				
+				// If not an object, complain and skip to the next one.
+				if (!iter.value().isObject())
+				{
+					qWarning(QString("Group '%1' in the group list should "
+									 "be an object.").arg(groupName).toUtf8());
+					continue;
+				}
+				
+				QJsonObject groupObj = iter.value().toObject();
+				/*
+				// Create the group object.
+				InstanceGroup *group = new InstanceGroup(groupName, this);
+				groups.push_back(group);
+				
+				// If 'hidden' isn't a bool value, just assume it's false.
+				if (groupObj.value("hidden").isBool() && groupObj.value("hidden").toBool())
+				{
+					group->setHidden(groupObj.value("hidden").toBool());
+				}
+				*/
+				
+				if (!groupObj.value("instances").isArray())
+				{
+					qWarning(QString("Group '%1' in the group list is invalid. "
+									 "It should contain an array "
+									 "called 'instances'.").arg(groupName).toUtf8());
+					continue;
+				}
+				
+				// Iterate through the list of instances in the group.
+				QJsonArray instancesArray = groupObj.value("instances").toArray();
+				
+				for (QJsonArray::iterator iter2 = instancesArray.begin(); 
+					 iter2 != instancesArray.end(); iter2++)
+				{
+					groupMap[(*iter2).toString()] = groupName;
+				}
+			}
+		}
+		break;
+	}
+	m_instances.clear();
 	while (iter.hasNext())
 	{
 		QString subDir = iter.next();
@@ -75,13 +177,61 @@ InstanceList::InstListError InstanceList::loadList()
 			else
 			{
 				QSharedPointer<Instance> inst(instPtr);
-				
+				auto iter = groupMap.find(inst->id());
+				if(iter != groupMap.end())
+				{
+					inst->setGroup((*iter));
+				}
 				qDebug(QString("Loaded instance %1").arg(inst->name()).toUtf8());
 				inst->setParent(this);
-				append(QSharedPointer<Instance>(inst));
+				m_instances.append(inst);
+				connect(instPtr, SIGNAL(propertiesChanged(Instance*)),this, SLOT(propertiesChanged(Instance*)));
 			}
 		}
 	}
-	
+	emit invalidated();
 	return NoError;
 }
+
+/// Clear all instances. Triggers notifications.
+void InstanceList::clear()
+{
+	m_instances.clear();
+	emit invalidated();
+};
+
+/// Add an instance. Triggers notifications, returns the new index
+int InstanceList::add(InstancePtr t)
+{
+	m_instances.append(t);
+	emit instanceAdded(count() - 1);
+	return count() - 1;
+}
+
+InstancePtr InstanceList::getInstanceById(QString instId)
+{
+	QListIterator<InstancePtr> iter(m_instances);
+	InstancePtr inst;
+	while(iter.hasNext())
+	{
+		inst = iter.next();
+		if (inst->id() == instId)
+			break;
+	}
+	if (inst->id() != instId)
+		return InstancePtr();
+	else
+		return iter.peekPrevious();
+}
+
+void InstanceList::propertiesChanged(Instance * inst)
+{
+	for(int i = 0; i < m_instances.count(); i++)
+	{
+		if(inst == m_instances[i].data())
+		{
+			emit instanceChanged(i);
+			break;
+		}
+	}
+}
\ No newline at end of file