Make 1.6+ work with new instance format.

1 files changed, 146 insertions, 9 deletions

diff --git a/logic/minecraft/RawLibrary.cpp b/logic/minecraft/RawLibrary.cpp
index 12aac8c8..7e0ebff0 100644
--- a/logic/minecraft/RawLibrary.cpp
+++ b/logic/minecraft/RawLibrary.cpp
@@ -11,7 +11,7 @@ RawLibraryPtr RawLibrary::fromJson(const QJsonObject &libObj, const QString &fil
 		throw JSONValidationError(filename +
 								  "contains a library that doesn't have a 'name' field");
 	}
-	out->name = libObj.value("name").toString();
+	out->m_name = libObj.value("name").toString();
 
 	auto readString = [libObj, filename](const QString & key, QString & variable)
 	{
@@ -29,22 +29,21 @@ RawLibraryPtr RawLibrary::fromJson(const QJsonObject &libObj, const QString &fil
 		}
 	};
 
-	readString("url", out->url);
-	readString("MMC-hint", out->hint);
-	readString("MMC-absulute_url", out->absoluteUrl);
-	readString("MMC-absoluteUrl", out->absoluteUrl);
+	readString("url", out->m_base_url);
+	readString("MMC-hint", out->m_hint);
+	readString("MMC-absulute_url", out->m_absolute_url);
+	readString("MMC-absoluteUrl", out->m_absolute_url);
 	if (libObj.contains("extract"))
 	{
 		out->applyExcludes = true;
 		auto extractObj = ensureObject(libObj.value("extract"));
 		for (auto excludeVal : ensureArray(extractObj.value("exclude")))
 		{
-			out->excludes.append(ensureString(excludeVal));
+			out->extract_excludes.append(ensureString(excludeVal));
 		}
 	}
 	if (libObj.contains("natives"))
 	{
-		out->applyNatives = true;
 		QJsonObject nativesObj = ensureObject(libObj.value("natives"));
 		for (auto it = nativesObj.begin(); it != nativesObj.end(); ++it)
 		{
@@ -55,14 +54,152 @@ RawLibraryPtr RawLibrary::fromJson(const QJsonObject &libObj, const QString &fil
 			OpSys opSys = OpSys_fromString(it.key());
 			if (opSys != Os_Other)
 			{
-				out->natives.append(qMakePair(opSys, it.value().toString()));
+				out->m_native_suffixes[opSys] = it.value().toString();
 			}
 		}
 	}
 	if (libObj.contains("rules"))
 	{
 		out->applyRules = true;
-		out->rules = rulesFromJsonV4(libObj);
+		out->m_rules = rulesFromJsonV4(libObj);
 	}
 	return out;
 }
+
+RawLibraryPtr RawLibrary::fromJsonPlus(const QJsonObject &libObj, const QString &filename)
+{
+	auto lib = RawLibrary::fromJson(libObj, filename);
+	if (libObj.contains("insert"))
+	{
+		QJsonValue insertVal = ensureExists(libObj.value("insert"), "library insert rule");
+		QString insertString;
+		{
+			if (insertVal.isString())
+			{
+				insertString = insertVal.toString();
+			}
+			else if (insertVal.isObject())
+			{
+				QJsonObject insertObj = insertVal.toObject();
+				if (insertObj.isEmpty())
+				{
+					throw JSONValidationError("One library has an empty insert object in " +
+											  filename);
+				}
+				insertString = insertObj.keys().first();
+				lib->insertData = insertObj.value(insertString).toString();
+			}
+		}
+		if (insertString == "apply")
+		{
+			lib->insertType = RawLibrary::Apply;
+		}
+		else if (insertString == "prepend")
+		{
+			lib->insertType = RawLibrary::Prepend;
+		}
+		else if (insertString == "append")
+		{
+			lib->insertType = RawLibrary::Append;
+		}
+		else if (insertString == "replace")
+		{
+			lib->insertType = RawLibrary::Replace;
+		}
+		else
+		{
+			throw JSONValidationError("A '+' library in " + filename +
+									  " contains an invalid insert type");
+		}
+	}
+	if (libObj.contains("MMC-depend"))
+	{
+		const QString dependString = ensureString(libObj.value("MMC-depend"));
+		if (dependString == "hard")
+		{
+			lib->dependType = RawLibrary::Hard;
+		}
+		else if (dependString == "soft")
+		{
+			lib->dependType = RawLibrary::Soft;
+		}
+		else
+		{
+			throw JSONValidationError("A '+' library in " + filename +
+									  " contains an invalid depend type");
+		}
+	}
+	return lib;
+}
+
+bool RawLibrary::isNative() const
+{
+	return m_native_suffixes.size() != 0;
+}
+
+QJsonObject RawLibrary::toJson()
+{
+	QJsonObject libRoot;
+	libRoot.insert("name", m_name);
+	if (m_absolute_url.size())
+		libRoot.insert("MMC-absoluteUrl", m_absolute_url);
+	if (m_hint.size())
+		libRoot.insert("MMC-hint", m_hint);
+	if (m_base_url != "http://" + URLConstants::AWS_DOWNLOAD_LIBRARIES &&
+		m_base_url != "https://" + URLConstants::AWS_DOWNLOAD_LIBRARIES &&
+		m_base_url != "https://" + URLConstants::LIBRARY_BASE && !m_base_url.isEmpty())
+	{
+		libRoot.insert("url", m_base_url);
+	}
+	if (isNative())
+	{
+		QJsonObject nativeList;
+		auto iter = m_native_suffixes.begin();
+		while (iter != m_native_suffixes.end())
+		{
+			nativeList.insert(OpSys_toString(iter.key()), iter.value());
+			iter++;
+		}
+		libRoot.insert("natives", nativeList);
+		if (extract_excludes.size())
+		{
+			QJsonArray excludes;
+			QJsonObject extract;
+			for (auto exclude : extract_excludes)
+			{
+				excludes.append(exclude);
+			}
+			extract.insert("exclude", excludes);
+			libRoot.insert("extract", extract);
+		}
+	}
+	if (m_rules.size())
+	{
+		QJsonArray allRules;
+		for (auto &rule : m_rules)
+		{
+			QJsonObject ruleObj = rule->toJson();
+			allRules.append(ruleObj);
+		}
+		libRoot.insert("rules", allRules);
+	}
+	return libRoot;
+}
+
+QString RawLibrary::fullname()
+{
+	QStringList parts = m_name.split(':');
+	return parts[0] + ":" + parts[1];
+}
+
+QString RawLibrary::group()
+{
+	QStringList parts = m_name.split(':');
+	return parts[0];
+}
+
+QString RawLibrary::version()
+{
+	QStringList parts = m_name.split(':');
+	return parts[2];
+}