aboutsummaryrefslogtreecommitdiff
path: root/launcher/meta/JsonFormat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'launcher/meta/JsonFormat.cpp')
-rw-r--r--launcher/meta/JsonFormat.cpp114
1 files changed, 47 insertions, 67 deletions
diff --git a/launcher/meta/JsonFormat.cpp b/launcher/meta/JsonFormat.cpp
index cb2d06ea..6c993f72 100644
--- a/launcher/meta/JsonFormat.cpp
+++ b/launcher/meta/JsonFormat.cpp
@@ -16,8 +16,8 @@
#include "JsonFormat.h"
// FIXME: remove this from here... somehow
-#include "minecraft/OneSixVersionFormat.h"
#include "Json.h"
+#include "minecraft/OneSixVersionFormat.h"
#include "Index.h"
#include "Version.h"
@@ -25,8 +25,7 @@
using namespace Json;
-namespace Meta
-{
+namespace Meta {
MetadataVersion currentFormatVersion()
{
@@ -34,13 +33,12 @@ MetadataVersion currentFormatVersion()
}
// Index
-static std::shared_ptr<Index> parseIndexInternal(const QJsonObject &obj)
+static std::shared_ptr<Index> parseIndexInternal(const QJsonObject& obj)
{
const QVector<QJsonObject> objects = requireIsArrayOf<QJsonObject>(obj, "packages");
QVector<VersionList::Ptr> lists;
lists.reserve(objects.size());
- std::transform(objects.begin(), objects.end(), std::back_inserter(lists), [](const QJsonObject &obj)
- {
+ std::transform(objects.begin(), objects.end(), std::back_inserter(lists), [](const QJsonObject& obj) {
VersionList::Ptr list = std::make_shared<VersionList>(requireString(obj, "uid"));
list->setName(ensureString(obj, "name", QString()));
return list;
@@ -49,7 +47,7 @@ static std::shared_ptr<Index> parseIndexInternal(const QJsonObject &obj)
}
// Version
-static Version::Ptr parseCommonVersion(const QString &uid, const QJsonObject &obj)
+static Version::Ptr parseCommonVersion(const QString& uid, const QJsonObject& obj)
{
Version::Ptr version = std::make_shared<Version>(uid, requireString(obj, "version"));
version->setTime(QDateTime::fromString(requireString(obj, "releaseTime"), Qt::ISODate).toMSecsSinceEpoch() / 1000);
@@ -63,26 +61,24 @@ static Version::Ptr parseCommonVersion(const QString &uid, const QJsonObject &ob
return version;
}
-static Version::Ptr parseVersionInternal(const QJsonObject &obj)
+static Version::Ptr parseVersionInternal(const QJsonObject& obj)
{
Version::Ptr version = parseCommonVersion(requireString(obj, "uid"), obj);
- version->setData(OneSixVersionFormat::versionFileFromJson(QJsonDocument(obj),
- QString("%1/%2.json").arg(version->uid(), version->version()),
- obj.contains("order")));
+ version->setData(OneSixVersionFormat::versionFileFromJson(
+ QJsonDocument(obj), QString("%1/%2.json").arg(version->uid(), version->version()), obj.contains("order")));
return version;
}
// Version list / package
-static VersionList::Ptr parseVersionListInternal(const QJsonObject &obj)
+static VersionList::Ptr parseVersionListInternal(const QJsonObject& obj)
{
const QString uid = requireString(obj, "uid");
const QVector<QJsonObject> versionsRaw = requireIsArrayOf<QJsonObject>(obj, "versions");
QVector<Version::Ptr> versions;
versions.reserve(versionsRaw.size());
- std::transform(versionsRaw.begin(), versionsRaw.end(), std::back_inserter(versions), [uid](const QJsonObject &vObj)
- {
+ std::transform(versionsRaw.begin(), versionsRaw.end(), std::back_inserter(versions), [uid](const QJsonObject& vObj) {
auto version = parseCommonVersion(uid, vObj);
version->setProvidesRecommendations();
return version;
@@ -94,23 +90,18 @@ static VersionList::Ptr parseVersionListInternal(const QJsonObject &obj)
return list;
}
-
-MetadataVersion parseFormatVersion(const QJsonObject &obj, bool required)
+MetadataVersion parseFormatVersion(const QJsonObject& obj, bool required)
{
- if (!obj.contains("formatVersion"))
- {
- if(required)
- {
+ if (!obj.contains("formatVersion")) {
+ if (required) {
return MetadataVersion::Invalid;
}
return MetadataVersion::InitialRelease;
}
- if (!obj.value("formatVersion").isDouble())
- {
+ if (!obj.value("formatVersion").isDouble()) {
return MetadataVersion::Invalid;
}
- switch(obj.value("formatVersion").toInt())
- {
+ switch (obj.value("formatVersion").toInt()) {
case 0:
case 1:
return MetadataVersion::InitialRelease;
@@ -121,49 +112,45 @@ MetadataVersion parseFormatVersion(const QJsonObject &obj, bool required)
void serializeFormatVersion(QJsonObject& obj, Meta::MetadataVersion version)
{
- if(version == MetadataVersion::Invalid)
- {
+ if (version == MetadataVersion::Invalid) {
return;
}
obj.insert("formatVersion", int(version));
}
-void parseIndex(const QJsonObject &obj, Index *ptr)
+void parseIndex(const QJsonObject& obj, Index* ptr)
{
const MetadataVersion version = parseFormatVersion(obj);
- switch (version)
- {
- case MetadataVersion::InitialRelease:
- ptr->merge(parseIndexInternal(obj));
- break;
- case MetadataVersion::Invalid:
- throw ParseException(QObject::tr("Unknown format version!"));
+ switch (version) {
+ case MetadataVersion::InitialRelease:
+ ptr->merge(parseIndexInternal(obj));
+ break;
+ case MetadataVersion::Invalid:
+ throw ParseException(QObject::tr("Unknown format version!"));
}
}
-void parseVersionList(const QJsonObject &obj, VersionList *ptr)
+void parseVersionList(const QJsonObject& obj, VersionList* ptr)
{
const MetadataVersion version = parseFormatVersion(obj);
- switch (version)
- {
- case MetadataVersion::InitialRelease:
- ptr->merge(parseVersionListInternal(obj));
- break;
- case MetadataVersion::Invalid:
- throw ParseException(QObject::tr("Unknown format version!"));
+ switch (version) {
+ case MetadataVersion::InitialRelease:
+ ptr->merge(parseVersionListInternal(obj));
+ break;
+ case MetadataVersion::Invalid:
+ throw ParseException(QObject::tr("Unknown format version!"));
}
}
-void parseVersion(const QJsonObject &obj, Version *ptr)
+void parseVersion(const QJsonObject& obj, Version* ptr)
{
const MetadataVersion version = parseFormatVersion(obj);
- switch (version)
- {
- case MetadataVersion::InitialRelease:
- ptr->merge(parseVersionInternal(obj));
- break;
- case MetadataVersion::Invalid:
- throw ParseException(QObject::tr("Unknown format version!"));
+ switch (version) {
+ case MetadataVersion::InitialRelease:
+ ptr->merge(parseVersionInternal(obj));
+ break;
+ case MetadataVersion::Invalid:
+ throw ParseException(QObject::tr("Unknown format version!"));
}
}
@@ -172,40 +159,34 @@ void parseVersion(const QJsonObject &obj, Version *ptr)
{"uid":"foo", "equals":"version"}
]
*/
-void parseRequires(const QJsonObject& obj, RequireSet* ptr, const char * keyName)
+void parseRequires(const QJsonObject& obj, RequireSet* ptr, const char* keyName)
{
- if(obj.contains(keyName))
- {
+ if (obj.contains(keyName)) {
auto reqArray = requireArray(obj, keyName);
auto iter = reqArray.begin();
- while(iter != reqArray.end())
- {
+ while (iter != reqArray.end()) {
auto reqObject = requireObject(*iter);
auto uid = requireString(reqObject, "uid");
auto equals = ensureString(reqObject, "equals", QString());
auto suggests = ensureString(reqObject, "suggests", QString());
- ptr->insert({uid, equals, suggests});
+ ptr->insert({ uid, equals, suggests });
iter++;
}
}
}
-void serializeRequires(QJsonObject& obj, RequireSet* ptr, const char * keyName)
+void serializeRequires(QJsonObject& obj, RequireSet* ptr, const char* keyName)
{
- if(!ptr || ptr->empty())
- {
+ if (!ptr || ptr->empty()) {
return;
}
QJsonArray arrOut;
- for(auto &iter: *ptr)
- {
+ for (auto& iter : *ptr) {
QJsonObject reqOut;
reqOut.insert("uid", iter.uid);
- if(!iter.equalsVersion.isEmpty())
- {
+ if (!iter.equalsVersion.isEmpty()) {
reqOut.insert("equals", iter.equalsVersion);
}
- if(!iter.suggests.isEmpty())
- {
+ if (!iter.suggests.isEmpty()) {
reqOut.insert("suggests", iter.suggests);
}
arrOut.append(reqOut);
@@ -213,5 +194,4 @@ void serializeRequires(QJsonObject& obj, RequireSet* ptr, const char * keyName)
obj.insert(keyName, arrOut);
}
-}
-
+} // namespace Meta
generated by cgit (git 2.46.0) at 2025-02-02 20:06:51 +0000