NOISSUE make new Mojang version format pass through MultiMC structures
Not yet used effectively, but it is read and written properly
This commit is contained in:
Petr Mrázek
parent
3d8728f52f
commit
d4eacb56b3
21 changed files with 493 additions and 155 deletions
|
|
@ -18,6 +18,37 @@ static void readString(const QJsonObject &root, const QString &key, QString &var
|
|||
}
|
||||
}
|
||||
|
||||
MojangAssetIndexInfoPtr MojangVersionFormat::assetIndexFromJson(const QJsonObject &obj)
|
||||
{
|
||||
auto out = std::make_shared<MojangAssetIndexInfo>();
|
||||
// optional, not used
|
||||
readString(obj, "path", out->m_path);
|
||||
// required!
|
||||
out->m_sha1 = requireString(obj, "sha1");
|
||||
out->m_url = requireString(obj, "url");
|
||||
out->m_size = requireInteger(obj, "size");
|
||||
out->m_totalSize = requireInteger(obj, "totalSize");
|
||||
out->m_id = requireString(obj, "id");
|
||||
// out->m_known = true;
|
||||
return out;
|
||||
}
|
||||
|
||||
QJsonObject MojangVersionFormat::assetIndexToJson(MojangAssetIndexInfoPtr info)
|
||||
{
|
||||
QJsonObject out;
|
||||
if(!info->m_path.isNull())
|
||||
{
|
||||
out.insert("path", info->m_path);
|
||||
}
|
||||
out.insert("sha1", info->m_sha1);
|
||||
out.insert("size", info->m_size);
|
||||
out.insert("url", info->m_url);
|
||||
out.insert("totalSize", info->m_totalSize);
|
||||
out.insert("id", info->m_id);
|
||||
return out;
|
||||
}
|
||||
|
||||
|
||||
VersionFilePtr MojangVersionFormat::versionFileFromJson(const QJsonDocument &doc, const QString &filename)
|
||||
{
|
||||
VersionFilePtr out(new VersionFile());
|
||||
|
|
@ -43,6 +74,10 @@ VersionFilePtr MojangVersionFormat::versionFileFromJson(const QJsonDocument &doc
|
|||
readString(root, "minecraftArguments", out->overwriteMinecraftArguments);
|
||||
readString(root, "type", out->type);
|
||||
|
||||
if(root.contains("assetIndex"))
|
||||
{
|
||||
out->mojangAssetIndex = assetIndexFromJson(requireObject(root, "assetIndex"));
|
||||
}
|
||||
readString(root, "assets", out->assets);
|
||||
|
||||
out->m_releaseTime = timeFromS3Time(root.value("releaseTime").toString(""));
|
||||
|
|
@ -67,14 +102,24 @@ VersionFilePtr MojangVersionFormat::versionFileFromJson(const QJsonDocument &doc
|
|||
{
|
||||
auto libObj = requireObject(libVal);
|
||||
|
||||
auto lib = OneSixVersionFormat::libraryFromJson(libObj, filename);
|
||||
auto lib = MojangVersionFormat::libraryFromJson(libObj, filename);
|
||||
out->addLibs.append(lib);
|
||||
}
|
||||
}
|
||||
if(root.contains("downloads"))
|
||||
{
|
||||
auto downloadsObj = requireObject(root, "downloads");
|
||||
for(auto iter = downloadsObj.begin(); iter != downloadsObj.end(); iter++)
|
||||
{
|
||||
auto classifier = iter.key();
|
||||
auto classifierObj = requireObject(iter.value());
|
||||
out->mojangDownloads[classifier] = downloadInfoFromJson(classifierObj);
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
static QJsonDocument versionFileToJson(VersionFilePtr patch)
|
||||
QJsonDocument MojangVersionFormat::versionFileToJson(VersionFilePtr patch)
|
||||
{
|
||||
QJsonObject root;
|
||||
writeString(root, "id", patch->id);
|
||||
|
|
@ -95,10 +140,23 @@ static QJsonDocument versionFileToJson(VersionFilePtr patch)
|
|||
QJsonArray array;
|
||||
for (auto value: patch->addLibs)
|
||||
{
|
||||
array.append(OneSixVersionFormat::libraryToJson(value.get()));
|
||||
array.append(MojangVersionFormat::libraryToJson(value.get()));
|
||||
}
|
||||
root.insert("libraries", array);
|
||||
}
|
||||
if(patch->mojangAssetIndex && patch->mojangAssetIndex->sizeAndHashKnown())
|
||||
{
|
||||
root.insert("assetIndex", MojangVersionFormat::assetIndexToJson(patch->mojangAssetIndex));
|
||||
}
|
||||
if(patch->mojangDownloads.size())
|
||||
{
|
||||
QJsonObject downloadsOut;
|
||||
for(auto iter = patch->mojangDownloads.begin(); iter != patch->mojangDownloads.end(); iter++)
|
||||
{
|
||||
downloadsOut.insert(iter.key(), downloadInfoToJson(iter.value()));
|
||||
}
|
||||
root.insert("downloads", downloadsOut);
|
||||
}
|
||||
// write the contents to a json document.
|
||||
{
|
||||
QJsonDocument out;
|
||||
|
|
@ -133,3 +191,244 @@ QJsonDocument MojangVersionFormat::profilePatchToJson(const ProfilePatchPtr &pat
|
|||
}
|
||||
throw VersionIncomplete(QObject::tr("Unhandled object type while processing %1").arg(patch->getPatchName()));
|
||||
}
|
||||
|
||||
/*
|
||||
class MojangDownloadInfo
|
||||
{
|
||||
friend class MojangVersionFormat;
|
||||
public:
|
||||
QString getUrl()
|
||||
{
|
||||
return m_url;
|
||||
}
|
||||
|
||||
QString getSha1()
|
||||
{
|
||||
return m_sha1;
|
||||
}
|
||||
|
||||
int getSize()
|
||||
{
|
||||
return m_size;
|
||||
}
|
||||
|
||||
protected:
|
||||
QString m_url;
|
||||
QString m_sha1;
|
||||
int m_size;
|
||||
};
|
||||
*/
|
||||
|
||||
MojangDownloadInfoPtr MojangVersionFormat::downloadInfoFromJson(const QJsonObject &obj)
|
||||
{
|
||||
auto out = std::make_shared<MojangDownloadInfo>();
|
||||
// optional, not used
|
||||
readString(obj, "path", out->m_path);
|
||||
// required!
|
||||
out->m_sha1 = requireString(obj, "sha1");
|
||||
out->m_url = requireString(obj, "url");
|
||||
out->m_size = requireInteger(obj, "size");
|
||||
return out;
|
||||
}
|
||||
|
||||
/*
|
||||
class MojangLibraryDownloadInfo
|
||||
{
|
||||
friend class MojangVersionFormat;
|
||||
public:
|
||||
MojangDownloadInfo getDownloadInfo(QString classifier)
|
||||
{
|
||||
if (classifier.isNull())
|
||||
{
|
||||
return artifact;
|
||||
}
|
||||
|
||||
return classifiers[classifier];
|
||||
}
|
||||
private:
|
||||
MojangDownloadInfo artifact;
|
||||
QMap<QString, MojangDownloadInfo> classifiers;
|
||||
};
|
||||
*/
|
||||
|
||||
/*
|
||||
"downloads": {
|
||||
"artifact": {
|
||||
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar",
|
||||
"sha1": "b04f3ee8f5e43fa3b162981b50bb72fe1acabb33",
|
||||
"size": 22,
|
||||
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar"
|
||||
},
|
||||
"classifiers": {
|
||||
"natives-linux": {
|
||||
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar",
|
||||
"sha1": "931074f46c795d2f7b30ed6395df5715cfd7675b",
|
||||
"size": 578680,
|
||||
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar"
|
||||
},
|
||||
"natives-osx": {
|
||||
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar",
|
||||
"sha1": "bcab850f8f487c3f4c4dbabde778bb82bd1a40ed",
|
||||
"size": 426822,
|
||||
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"
|
||||
},
|
||||
"natives-windows": {
|
||||
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar",
|
||||
"sha1": "b84d5102b9dbfabfeb5e43c7e2828d98a7fc80e0",
|
||||
"size": 613748,
|
||||
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar"
|
||||
}
|
||||
}
|
||||
},
|
||||
*/
|
||||
|
||||
|
||||
MojangLibraryDownloadInfoPtr MojangVersionFormat::libDownloadInfoFromJson(const QJsonObject &libObj)
|
||||
{
|
||||
auto out = std::make_shared<MojangLibraryDownloadInfo>();
|
||||
auto dlObj = requireObject(libObj.value("downloads"));
|
||||
if(dlObj.contains("artifact"))
|
||||
{
|
||||
out->artifact = downloadInfoFromJson(requireObject(dlObj, "artifact"));
|
||||
}
|
||||
if(dlObj.contains("classifiers"))
|
||||
{
|
||||
auto classifiersObj = requireObject(dlObj, "classifiers");
|
||||
for(auto iter = classifiersObj.begin(); iter != classifiersObj.end(); iter++)
|
||||
{
|
||||
auto classifier = iter.key();
|
||||
auto classifierObj = requireObject(iter.value());
|
||||
out->classifiers[classifier] = downloadInfoFromJson(classifierObj);
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
LibraryPtr MojangVersionFormat::libraryFromJson(const QJsonObject &libObj, const QString &filename)
|
||||
{
|
||||
LibraryPtr out(new Library());
|
||||
if (!libObj.contains("name"))
|
||||
{
|
||||
throw JSONValidationError(filename + "contains a library that doesn't have a 'name' field");
|
||||
}
|
||||
out->m_name = libObj.value("name").toString();
|
||||
|
||||
readString(libObj, "url", out->m_base_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);
|
||||
}
|
||||
if (libObj.contains("downloads"))
|
||||
{
|
||||
out->m_mojang_downloads = libDownloadInfoFromJson(libObj);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
QJsonObject MojangVersionFormat::downloadInfoToJson(MojangDownloadInfoPtr info)
|
||||
{
|
||||
QJsonObject out;
|
||||
if(!info->m_path.isNull())
|
||||
{
|
||||
out.insert("path", info->m_path);
|
||||
}
|
||||
out.insert("sha1", info->m_sha1);
|
||||
out.insert("size", info->m_size);
|
||||
out.insert("url", info->m_url);
|
||||
return out;
|
||||
}
|
||||
|
||||
QJsonObject MojangVersionFormat::libDownloadInfoToJson(MojangLibraryDownloadInfoPtr libinfo)
|
||||
{
|
||||
QJsonObject out;
|
||||
if(libinfo->artifact)
|
||||
{
|
||||
out.insert("artifact", downloadInfoToJson(libinfo->artifact));
|
||||
}
|
||||
if(libinfo->classifiers.size())
|
||||
{
|
||||
QJsonObject classifiersOut;
|
||||
for(auto iter = libinfo->classifiers.begin(); iter != libinfo->classifiers.end(); iter++)
|
||||
{
|
||||
classifiersOut.insert(iter.key(), downloadInfoToJson(iter.value()));
|
||||
}
|
||||
out.insert("classifiers", classifiersOut);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
QJsonObject MojangVersionFormat::libraryToJson(Library *library)
|
||||
{
|
||||
QJsonObject libRoot;
|
||||
libRoot.insert("name", (QString)library->m_name);
|
||||
if (library->m_base_url != "http://" + URLConstants::AWS_DOWNLOAD_LIBRARIES &&
|
||||
library->m_base_url != "https://" + URLConstants::AWS_DOWNLOAD_LIBRARIES &&
|
||||
library->m_base_url != "https://" + URLConstants::LIBRARY_BASE && !library->m_base_url.isEmpty())
|
||||
{
|
||||
libRoot.insert("url", library->m_base_url);
|
||||
}
|
||||
if (library->isNative())
|
||||
{
|
||||
QJsonObject nativeList;
|
||||
auto iter = library->m_native_classifiers.begin();
|
||||
while (iter != library->m_native_classifiers.end())
|
||||
{
|
||||
nativeList.insert(OpSys_toString(iter.key()), iter.value());
|
||||
iter++;
|
||||
}
|
||||
libRoot.insert("natives", nativeList);
|
||||
if (library->extract_excludes.size())
|
||||
{
|
||||
QJsonArray excludes;
|
||||
QJsonObject extract;
|
||||
for (auto exclude : library->extract_excludes)
|
||||
{
|
||||
excludes.append(exclude);
|
||||
}
|
||||
extract.insert("exclude", excludes);
|
||||
libRoot.insert("extract", extract);
|
||||
}
|
||||
}
|
||||
if (library->m_rules.size())
|
||||
{
|
||||
QJsonArray allRules;
|
||||
for (auto &rule : library->m_rules)
|
||||
{
|
||||
QJsonObject ruleObj = rule->toJson();
|
||||
allRules.append(ruleObj);
|
||||
}
|
||||
libRoot.insert("rules", allRules);
|
||||
}
|
||||
if(library->m_mojang_downloads)
|
||||
{
|
||||
auto downloadsObj = libDownloadInfoToJson(library->m_mojang_downloads);
|
||||
libRoot.insert("downloads", downloadsObj);
|
||||
}
|
||||
return libRoot;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue