4 files changed, 80 insertions, 247 deletions

diff --git a/api/logic/meta/format/Format.cpp b/api/logic/meta/format/Format.cpp
index e0fddb0b..39d3f14f 100644
--- a/api/logic/meta/format/Format.cpp
+++ b/api/logic/meta/format/Format.cpp
@@ -15,15 +15,85 @@
 
 #include "Format.h"
 
-#include "FormatV1.h"
+#include "minecraft/onesix/OneSixVersionFormat.h""
 
 #include "meta/Index.h"
 #include "meta/Version.h"
 #include "meta/VersionList.h"
 
+#include "Json.h"
+using namespace Json;
+
 namespace Meta
 {
 
+static const int currentFormatVersion = 0;
+
+// Index
+static BaseEntity::Ptr parseIndexInternal(const QJsonObject &obj)
+{
+	const QVector<QJsonObject> objects = requireIsArrayOf<QJsonObject>(obj, "packages");
+	QVector<VersionListPtr> lists;
+	lists.reserve(objects.size());
+	std::transform(objects.begin(), objects.end(), std::back_inserter(lists), [](const QJsonObject &obj)
+	{
+		VersionListPtr list = std::make_shared<VersionList>(requireString(obj, "uid"));
+		list->setName(ensureString(obj, "name", QString()));
+		return list;
+	});
+	return std::make_shared<Index>(lists);
+}
+
+// Version
+static VersionPtr parseCommonVersion(const QString &uid, const QJsonObject &obj)
+{
+	const QVector<QJsonObject> requiresRaw = obj.contains("requires") ? requireIsArrayOf<QJsonObject>(obj, "requires") : QVector<QJsonObject>();
+	QVector<Reference> requires;
+	requires.reserve(requiresRaw.size());
+	std::transform(requiresRaw.begin(), requiresRaw.end(), std::back_inserter(requires), [](const QJsonObject &rObj)
+	{
+		Reference ref(requireString(rObj, "uid"));
+		ref.setVersion(ensureString(rObj, "version", QString()));
+		return ref;
+	});
+
+	VersionPtr version = std::make_shared<Version>(uid, requireString(obj, "version"));
+	version->setTime(QDateTime::fromString(requireString(obj, "releaseTime"), Qt::ISODate).toMSecsSinceEpoch() / 1000);
+	version->setType(ensureString(obj, "type", QString()));
+	version->setRequires(requires);
+	return version;
+}
+
+static BaseEntity::Ptr parseVersionInternal(const QJsonObject &obj)
+{
+	VersionPtr version = parseCommonVersion(requireString(obj, "uid"), obj);
+
+	version->setData(OneSixVersionFormat::versionFileFromJson(QJsonDocument(obj),
+										   QString("%1/%2.json").arg(version->uid(), version->version()),
+										   obj.contains("order")));
+	return version;
+}
+
+// Version list / package
+static BaseEntity::Ptr parseVersionListInternal(const QJsonObject &obj)
+{
+	const QString uid = requireString(obj, "uid");
+
+	const QVector<QJsonObject> versionsRaw = requireIsArrayOf<QJsonObject>(obj, "versions");
+	QVector<VersionPtr> versions;
+	versions.reserve(versionsRaw.size());
+	std::transform(versionsRaw.begin(), versionsRaw.end(), std::back_inserter(versions), [uid](const QJsonObject &vObj)
+	{
+		return parseCommonVersion(uid, vObj);
+	});
+
+	VersionListPtr list = std::make_shared<VersionList>(uid);
+	list->setName(ensureString(obj, "name", QString()));
+	list->setVersions(versions);
+	return list;
+}
+
+
 static int formatVersion(const QJsonObject &obj)
 {
 	if (!obj.contains("formatVersion")) {
@@ -35,56 +105,39 @@ static int formatVersion(const QJsonObject &obj)
 	return obj.value("formatVersion").toInt();
 }
 
-void Format::parseIndex(const QJsonObject &obj, Index *ptr)
+void parseIndex(const QJsonObject &obj, Index *ptr)
 {
 	const int version = formatVersion(obj);
 	switch (version) {
 	case 0:
-		ptr->merge(FormatV1().parseIndexInternal(obj));
+		ptr->merge(parseIndexInternal(obj));
 		break;
 	default:
 		throw ParseException(QObject::tr("Unknown formatVersion: %1").arg(version));
 	}
 }
 
-void Format::parseVersionList(const QJsonObject &obj, VersionList *ptr)
+void parseVersionList(const QJsonObject &obj, VersionList *ptr)
 {
 	const int version = formatVersion(obj);
 	switch (version) {
 	case 0:
-		ptr->merge(FormatV1().parseVersionListInternal(obj));
+		ptr->merge(parseVersionListInternal(obj));
 		break;
 	default:
 		throw ParseException(QObject::tr("Unknown formatVersion: %1").arg(version));
 	}
 }
 
-void Format::parseVersion(const QJsonObject &obj, Version *ptr)
+void parseVersion(const QJsonObject &obj, Version *ptr)
 {
 	const int version = formatVersion(obj);
 	switch (version) {
 	case 0:
-		ptr->merge(FormatV1().parseVersionInternal(obj));
+		ptr->merge(parseVersionInternal(obj));
 		break;
 	default:
 		throw ParseException(QObject::tr("Unknown formatVersion: %1").arg(version));
 	}
 }
-
-
-QJsonObject Format::serializeIndex(const Index *ptr)
-{
-	return FormatV1().serializeIndexInternal(ptr);
-}
-
-QJsonObject Format::serializeVersionList(const VersionList *ptr)
-{
-	return FormatV1().serializeVersionListInternal(ptr);
-}
-
-QJsonObject Format::serializeVersion(const Version *ptr)
-{
-	return FormatV1().serializeVersionInternal(ptr);
-}
-
 }
diff --git a/api/logic/meta/format/Format.h b/api/logic/meta/format/Format.h
index 79605a6f..aaed07fc 100644
--- a/api/logic/meta/format/Format.h
+++ b/api/logic/meta/format/Format.h
@@ -33,25 +33,8 @@ public:
 	using Exception::Exception;
 };
 
-class Format
-{
-public:
-	virtual ~Format() {}
-
-	static void parseIndex(const QJsonObject &obj, Index *ptr);
-	static void parseVersion(const QJsonObject &obj, Version *ptr);
-	static void parseVersionList(const QJsonObject &obj, VersionList *ptr);
+void parseIndex(const QJsonObject &obj, Index *ptr);
+void parseVersion(const QJsonObject &obj, Version *ptr);
+void parseVersionList(const QJsonObject &obj, VersionList *ptr);
 
-	static QJsonObject serializeIndex(const Index *ptr);
-	static QJsonObject serializeVersion(const Version *ptr);
-	static QJsonObject serializeVersionList(const VersionList *ptr);
-
-protected:
-	virtual BaseEntity::Ptr parseIndexInternal(const QJsonObject &obj) const = 0;
-	virtual BaseEntity::Ptr parseVersionInternal(const QJsonObject &obj) const = 0;
-	virtual BaseEntity::Ptr parseVersionListInternal(const QJsonObject &obj) const = 0;
-	virtual QJsonObject serializeIndexInternal(const Index *ptr) const = 0;
-	virtual QJsonObject serializeVersionInternal(const Version *ptr) const = 0;
-	virtual QJsonObject serializeVersionListInternal(const VersionList *ptr) const = 0;
-};
 }
diff --git a/api/logic/meta/format/FormatV1.cpp b/api/logic/meta/format/FormatV1.cpp
deleted file mode 100644
index ee2c5291..00000000
--- a/api/logic/meta/format/FormatV1.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Copyright 2015-2017 MultiMC Contributors
- *
- * 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
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "FormatV1.h"
-#include <minecraft/onesix/OneSixVersionFormat.h>
-
-#include "Json.h"
-
-#include "meta/Index.h"
-#include "meta/Version.h"
-#include "meta/VersionList.h"
-#include "Env.h"
-
-using namespace Json;
-
-namespace Meta
-{
-
-static const int currentFormatVersion = 0;
-
-// Index
-
-BaseEntity::Ptr FormatV1::parseIndexInternal(const QJsonObject &obj) const
-{
-	const QVector<QJsonObject> objects = requireIsArrayOf<QJsonObject>(obj, "packages");
-	QVector<VersionListPtr> lists;
-	lists.reserve(objects.size());
-	std::transform(objects.begin(), objects.end(), std::back_inserter(lists), [](const QJsonObject &obj)
-	{
-		VersionListPtr list = std::make_shared<VersionList>(requireString(obj, "uid"));
-		list->setName(ensureString(obj, "name", QString()));
-		return list;
-	});
-	return std::make_shared<Index>(lists);
-}
-
-QJsonObject FormatV1::serializeIndexInternal(const Index *ptr) const
-{
-	QJsonArray packages;
-	for (const VersionListPtr &list : ptr->lists())
-	{
-		QJsonObject out;
-		out["uid"] = list->uid();
-		out["name"] = list->name();
-		packages.append(out);
-	}
-	QJsonObject out;
-	out["formatVersion"] = currentFormatVersion;
-	out["packages"] = packages;
-	return out;
-}
-
-
-// Version
-
-static VersionPtr parseCommonVersion(const QString &uid, const QJsonObject &obj)
-{
-	const QVector<QJsonObject> requiresRaw = obj.contains("requires") ? requireIsArrayOf<QJsonObject>(obj, "requires") : QVector<QJsonObject>();
-	QVector<Reference> requires;
-	requires.reserve(requiresRaw.size());
-	std::transform(requiresRaw.begin(), requiresRaw.end(), std::back_inserter(requires), [](const QJsonObject &rObj)
-	{
-		Reference ref(requireString(rObj, "uid"));
-		ref.setVersion(ensureString(rObj, "version", QString()));
-		return ref;
-	});
-
-	VersionPtr version = std::make_shared<Version>(uid, requireString(obj, "version"));
-	version->setTime(QDateTime::fromString(requireString(obj, "releaseTime"), Qt::ISODate).toMSecsSinceEpoch() / 1000);
-	version->setType(ensureString(obj, "type", QString()));
-	version->setRequires(requires);
-	return version;
-}
-
-BaseEntity::Ptr FormatV1::parseVersionInternal(const QJsonObject &obj) const
-{
-	VersionPtr version = parseCommonVersion(requireString(obj, "uid"), obj);
-
-	version->setData(OneSixVersionFormat::versionFileFromJson(QJsonDocument(obj),
-										   QString("%1/%2.json").arg(version->uid(), version->version()),
-										   obj.contains("order")));
-	return version;
-}
-
-static void serializeCommonVersion(const Version *version, QJsonObject &obj)
-{
-	QJsonArray requires;
-	for (const Reference &ref : version->requires())
-	{
-		if (ref.version().isEmpty())
-		{
-			QJsonObject out;
-			out["uid"] = ref.uid();
-			requires.append(out);
-		}
-		else
-		{
-			QJsonObject out;
-			out["uid"] = ref.uid();
-			out["version"] = ref.version();
-			requires.append(out);
-		}
-	}
-
-	obj.insert("version", version->version());
-	obj.insert("type", version->type());
-	obj.insert("releaseTime", version->time().toString(Qt::ISODate));
-	obj.insert("requires", requires);
-}
-
-QJsonObject FormatV1::serializeVersionInternal(const Version *ptr) const
-{
-	QJsonObject obj = OneSixVersionFormat::versionFileToJson(ptr->data(), true).object();
-	serializeCommonVersion(ptr, obj);
-	obj.insert("formatVersion", currentFormatVersion);
-	obj.insert("uid", ptr->uid());
-	// TODO: the name should be looked up in the UI based on the uid
-	obj.insert("name", ENV.metadataIndex()->getListGuaranteed(ptr->uid())->name());
-
-	return obj;
-}
-
-
-// Version list / package
-
-BaseEntity::Ptr FormatV1::parseVersionListInternal(const QJsonObject &obj) const
-{
-	const QString uid = requireString(obj, "uid");
-
-	const QVector<QJsonObject> versionsRaw = requireIsArrayOf<QJsonObject>(obj, "versions");
-	QVector<VersionPtr> versions;
-	versions.reserve(versionsRaw.size());
-	std::transform(versionsRaw.begin(), versionsRaw.end(), std::back_inserter(versions), [this, uid](const QJsonObject &vObj)
-	{ return parseCommonVersion(uid, vObj); });
-
-	VersionListPtr list = std::make_shared<VersionList>(uid);
-	list->setName(ensureString(obj, "name", QString()));
-	list->setVersions(versions);
-	return list;
-}
-
-QJsonObject FormatV1::serializeVersionListInternal(const VersionList *ptr) const
-{
-	QJsonArray versions;
-	for (const VersionPtr &version : ptr->versions())
-	{
-		QJsonObject obj;
-		serializeCommonVersion(version.get(), obj);
-		versions.append(obj);
-	}
-	QJsonObject out;
-	out["formatVersion"] = currentFormatVersion;
-	out["uid"] = ptr->uid();
-	out["name"] = ptr->name().isNull() ? QJsonValue() : ptr->name();
-	out["versions"] = versions;
-	return out;
-}
-}
diff --git a/api/logic/meta/format/FormatV1.h b/api/logic/meta/format/FormatV1.h
deleted file mode 100644
index ab986083..00000000
--- a/api/logic/meta/format/FormatV1.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2015-2017 MultiMC Contributors
- *
- * 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
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "Format.h"
-
-namespace Meta
-{
-class FormatV1 : public Format
-{
-public:
-	BaseEntity::Ptr parseIndexInternal(const QJsonObject &obj) const override;
-	BaseEntity::Ptr parseVersionInternal(const QJsonObject &obj) const override;
-	BaseEntity::Ptr parseVersionListInternal(const QJsonObject &obj) const override;
-
-	QJsonObject serializeIndexInternal(const Index *ptr) const override;
-	QJsonObject serializeVersionInternal(const Version *ptr) const override;
-	QJsonObject serializeVersionListInternal(const VersionList *ptr) const override;
-};
-}