mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove ensure JSON helpers

Browse source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2025-11-09 18:30:07 +00:00
parent 7e8cf628e8
commit e42c9d2a1d
No known key found for this signature in database
GPG key ID: 5E39D70B4C93C38E
38 changed files with 228 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

24
launcher/net/HttpMetaCache.cpp
View file

@ -248,15 +248,15 @@ void HttpMetaCache::Load()
auto root = json.object();
// check file version first
auto version_val = Json::ensureString(root, "version");
auto version_val = root["version"].toString();
if (version_val != "1")
return;
// read the entry array
auto array = Json::ensureArray(root, "entries");
auto array = root["entries"].toArray();
for (auto element : array) {
auto element_obj = Json::ensureObject(element);
auto base = Json::ensureString(element_obj, "base");
auto element_obj = element.toObject();
auto base = element_obj["base"].toString();
if (!m_entries.contains(base))
continue;
@ -264,16 +264,16 @@ void HttpMetaCache::Load()
auto foo = new MetaEntry();
foo->m_baseId = base;
foo->m_relativePath = Json::ensureString(element_obj, "path");
foo->m_md5sum = Json::ensureString(element_obj, "md5sum");
foo->m_etag = Json::ensureString(element_obj, "etag");
foo->m_local_changed_timestamp = Json::ensureDouble(element_obj, "last_changed_timestamp");
foo->m_remote_changed_timestamp = Json::ensureString(element_obj, "remote_changed_timestamp");
foo->m_relativePath = element_obj["path"].toString();
foo->m_md5sum = element_obj["md5sum"].toString();
foo->m_etag = element_obj["etag"].toString();
foo->m_local_changed_timestamp = element_obj["last_changed_timestamp"].toDouble();
foo->m_remote_changed_timestamp = element_obj["remote_changed_timestamp"].toString();
foo->makeEternal(Json::ensureBoolean(element_obj, (const QString)QStringLiteral("eternal"), false));
foo->makeEternal(element_obj[QStringLiteral("eternal")].toBool(false));
if (!foo->isEternal()) {
foo->m_current_age = Json::ensureDouble(element_obj, "current_age");
foo->m_max_age = Json::ensureDouble(element_obj, "max_age");
foo->m_current_age = element_obj["current_age"].toDouble();
foo->m_max_age = element_obj["max_age"].toDouble();
}
// presumed innocent until closer examination