Remove ensure JSON helpers
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
@@ -52,27 +52,27 @@ MetadataPtr parseJavaMeta(const QJsonObject& in)
|
||||
{
|
||||
auto meta = std::make_shared<Metadata>();
|
||||
|
||||
meta->m_name = Json::ensureString(in, "name", "");
|
||||
meta->vendor = Json::ensureString(in, "vendor", "");
|
||||
meta->url = Json::ensureString(in, "url", "");
|
||||
meta->releaseTime = timeFromS3Time(Json::ensureString(in, "releaseTime", ""));
|
||||
meta->downloadType = parseDownloadType(Json::ensureString(in, "downloadType", ""));
|
||||
meta->packageType = Json::ensureString(in, "packageType", "");
|
||||
meta->runtimeOS = Json::ensureString(in, "runtimeOS", "unknown");
|
||||
meta->m_name = in["name"].toString("");
|
||||
meta->vendor = in["vendor"].toString("");
|
||||
meta->url = in["url"].toString("");
|
||||
meta->releaseTime = timeFromS3Time(in["releaseTime"].toString(""));
|
||||
meta->downloadType = parseDownloadType(in["downloadType"].toString(""));
|
||||
meta->packageType = in["packageType"].toString("");
|
||||
meta->runtimeOS = in["runtimeOS"].toString("unknown");
|
||||
|
||||
if (in.contains("checksum")) {
|
||||
auto obj = Json::requireObject(in, "checksum");
|
||||
meta->checksumHash = Json::ensureString(obj, "hash", "");
|
||||
meta->checksumType = Json::ensureString(obj, "type", "");
|
||||
meta->checksumHash = obj["hash"].toString("");
|
||||
meta->checksumType = obj["type"].toString("");
|
||||
}
|
||||
|
||||
if (in.contains("version")) {
|
||||
auto obj = Json::requireObject(in, "version");
|
||||
auto name = Json::ensureString(obj, "name", "");
|
||||
auto major = Json::ensureInteger(obj, "major", 0);
|
||||
auto minor = Json::ensureInteger(obj, "minor", 0);
|
||||
auto security = Json::ensureInteger(obj, "security", 0);
|
||||
auto build = Json::ensureInteger(obj, "build", 0);
|
||||
auto name = obj["name"].toString("");
|
||||
auto major = obj["major"].toInteger();
|
||||
auto minor = obj["minor"].toInteger();
|
||||
auto security = obj["security"].toInteger();
|
||||
auto build = obj["build"].toInteger();
|
||||
meta->version = JavaVersion(major, minor, security, build, name);
|
||||
}
|
||||
return meta;
|
||||
|
||||
Reference in New Issue
Block a user