diff options
author | Petr Mrázek <peterix@gmail.com> | 2016-02-28 19:01:54 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2016-02-28 19:01:54 +0100 |
commit | 9497b7e96cfac6e60a53fe05c0ca945ecc839533 (patch) | |
tree | a7b129de1109995e4416304e0e873af44bcca5ee /logic/minecraft/RawLibrary.cpp | |
parent | a0b47aee5ba8d96e5ceec12798be9f63a16dbcd5 (diff) | |
download | MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.tar MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.tar.gz MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.tar.lz MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.tar.xz MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.zip |
NOISSUE even more version file refactors
There is no end to them in sight
Diffstat (limited to 'logic/minecraft/RawLibrary.cpp')
-rw-r--r-- | logic/minecraft/RawLibrary.cpp | 117 |
1 files changed, 0 insertions, 117 deletions
diff --git a/logic/minecraft/RawLibrary.cpp b/logic/minecraft/RawLibrary.cpp index a10536ea..735f5b0a 100644 --- a/logic/minecraft/RawLibrary.cpp +++ b/logic/minecraft/RawLibrary.cpp @@ -1,123 +1,6 @@ -#include "Json.h" -using namespace Json; - #include "RawLibrary.h" #include <FileSystem.h> -RawLibraryPtr RawLibrary::fromJson(const QJsonObject &libObj, const QString &filename) -{ - RawLibraryPtr out(new RawLibrary()); - if (!libObj.contains("name")) - { - throw JSONValidationError(filename + - "contains a library that doesn't have a 'name' field"); - } - out->m_name = libObj.value("name").toString(); - - auto readString = [libObj, filename](const QString & key, QString & variable) -> bool - { - if (!libObj.contains(key)) - return false; - QJsonValue val = libObj.value(key); - - if (!val.isString()) - { - qWarning() << key << "is not a string in" << filename << "(skipping)"; - return false; - } - - variable = val.toString(); - return true; - }; - - QString urlStr; - readString("url", urlStr); - out->m_base_url = urlStr; - 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 = requireObject(libObj.value("extract")); - for (auto excludeVal : requireArray(extractObj.value("exclude"))) - { - out->extract_excludes.append(requireString(excludeVal)); - } - } - if (libObj.contains("natives")) - { - QJsonObject nativesObj = requireObject(libObj.value("natives")); - for (auto it = nativesObj.begin(); it != nativesObj.end(); ++it) - { - if (!it.value().isString()) - { - qWarning() << filename << "contains an invalid native (skipping)"; - } - OpSys opSys = OpSys_fromString(it.key()); - if (opSys != Os_Other) - { - out->m_native_classifiers[opSys] = it.value().toString(); - } - } - } - if (libObj.contains("rules")) - { - out->applyRules = true; - out->m_rules = rulesFromJsonV4(libObj); - } - return out; -} - -QJsonObject RawLibrary::toJson() const -{ - QJsonObject libRoot; - libRoot.insert("name", (QString)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_classifiers.begin(); - while (iter != m_native_classifiers.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; -} - QStringList RawLibrary::files() const { QStringList retval; |