From 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 Mon Sep 17 00:00:00 2001 From: Thomas Groman Date: Thu, 19 Sep 2019 00:41:48 -0700 Subject: merged from 0.6.7 codebase --- api/logic/status/StatusChecker.cpp | 168 ++++++++++++++++++------------------- api/logic/status/StatusChecker.h | 38 ++++----- 2 files changed, 103 insertions(+), 103 deletions(-) (limited to 'api/logic/status') diff --git a/api/logic/status/StatusChecker.cpp b/api/logic/status/StatusChecker.cpp index bff9fda9..f18ed364 100644 --- a/api/logic/status/StatusChecker.cpp +++ b/api/logic/status/StatusChecker.cpp @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,121 +28,121 @@ StatusChecker::StatusChecker() void StatusChecker::timerEvent(QTimerEvent *e) { - QObject::timerEvent(e); - reloadStatus(); + QObject::timerEvent(e); + reloadStatus(); } void StatusChecker::reloadStatus() { - if (isLoadingStatus()) - { - // qDebug() << "Ignored request to reload status. Currently reloading already."; - return; - } - - // qDebug() << "Reloading status."; - - NetJob* job = new NetJob("Status JSON"); - job->addNetAction(Net::Download::makeByteArray(URLConstants::MOJANG_STATUS_URL, &dataSink)); - QObject::connect(job, &NetJob::succeeded, this, &StatusChecker::statusDownloadFinished); - QObject::connect(job, &NetJob::failed, this, &StatusChecker::statusDownloadFailed); - m_statusNetJob.reset(job); - emit statusLoading(true); - job->start(); + if (isLoadingStatus()) + { + // qDebug() << "Ignored request to reload status. Currently reloading already."; + return; + } + + // qDebug() << "Reloading status."; + + NetJob* job = new NetJob("Status JSON"); + job->addNetAction(Net::Download::makeByteArray(URLConstants::MOJANG_STATUS_URL, &dataSink)); + QObject::connect(job, &NetJob::succeeded, this, &StatusChecker::statusDownloadFinished); + QObject::connect(job, &NetJob::failed, this, &StatusChecker::statusDownloadFailed); + m_statusNetJob.reset(job); + emit statusLoading(true); + job->start(); } void StatusChecker::statusDownloadFinished() { - qDebug() << "Finished loading status JSON."; - m_statusEntries.clear(); - m_statusNetJob.reset(); - - QJsonParseError jsonError; - QJsonDocument jsonDoc = QJsonDocument::fromJson(dataSink, &jsonError); - - if (jsonError.error != QJsonParseError::NoError) - { - fail("Error parsing status JSON:" + jsonError.errorString()); - return; - } - - if (!jsonDoc.isArray()) - { - fail("Error parsing status JSON: JSON root is not an array"); - return; - } - - QJsonArray root = jsonDoc.array(); - - for(auto status = root.begin(); status != root.end(); ++status) - { - QVariantMap map = (*status).toObject().toVariantMap(); - - for (QVariantMap::const_iterator iter = map.begin(); iter != map.end(); ++iter) - { - QString key = iter.key(); - QVariant value = iter.value(); - - if(value.type() == QVariant::Type::String) - { - m_statusEntries.insert(key, value.toString()); - //qDebug() << "Status JSON object: " << key << m_statusEntries[key]; - } - else - { - fail("Malformed status JSON: expected status type to be a string."); - return; - } - } - } - - succeed(); + qDebug() << "Finished loading status JSON."; + m_statusEntries.clear(); + m_statusNetJob.reset(); + + QJsonParseError jsonError; + QJsonDocument jsonDoc = QJsonDocument::fromJson(dataSink, &jsonError); + + if (jsonError.error != QJsonParseError::NoError) + { + fail("Error parsing status JSON:" + jsonError.errorString()); + return; + } + + if (!jsonDoc.isArray()) + { + fail("Error parsing status JSON: JSON root is not an array"); + return; + } + + QJsonArray root = jsonDoc.array(); + + for(auto status = root.begin(); status != root.end(); ++status) + { + QVariantMap map = (*status).toObject().toVariantMap(); + + for (QVariantMap::const_iterator iter = map.begin(); iter != map.end(); ++iter) + { + QString key = iter.key(); + QVariant value = iter.value(); + + if(value.type() == QVariant::Type::String) + { + m_statusEntries.insert(key, value.toString()); + //qDebug() << "Status JSON object: " << key << m_statusEntries[key]; + } + else + { + fail("Malformed status JSON: expected status type to be a string."); + return; + } + } + } + + succeed(); } void StatusChecker::statusDownloadFailed(QString reason) { - fail(tr("Failed to load status JSON:\n%1").arg(reason)); + fail(tr("Failed to load status JSON:\n%1").arg(reason)); } QMap StatusChecker::getStatusEntries() const { - return m_statusEntries; + return m_statusEntries; } bool StatusChecker::isLoadingStatus() const { - return m_statusNetJob.get() != nullptr; + return m_statusNetJob.get() != nullptr; } QString StatusChecker::getLastLoadErrorMsg() const { - return m_lastLoadError; + return m_lastLoadError; } void StatusChecker::succeed() { - if(m_prevEntries != m_statusEntries) - { - emit statusChanged(m_statusEntries); - m_prevEntries = m_statusEntries; - } - m_lastLoadError = ""; - qDebug() << "Status loading succeeded."; - m_statusNetJob.reset(); - emit statusLoading(false); + if(m_prevEntries != m_statusEntries) + { + emit statusChanged(m_statusEntries); + m_prevEntries = m_statusEntries; + } + m_lastLoadError = ""; + qDebug() << "Status loading succeeded."; + m_statusNetJob.reset(); + emit statusLoading(false); } void StatusChecker::fail(const QString& errorMsg) { - if(m_prevEntries != m_statusEntries) - { - emit statusChanged(m_statusEntries); - m_prevEntries = m_statusEntries; - } - m_lastLoadError = errorMsg; - qDebug() << "Failed to load status:" << errorMsg; - m_statusNetJob.reset(); - emit statusLoading(false); + if(m_prevEntries != m_statusEntries) + { + emit statusChanged(m_statusEntries); + m_prevEntries = m_statusEntries; + } + m_lastLoadError = errorMsg; + qDebug() << "Failed to load status:" << errorMsg; + m_statusNetJob.reset(); + emit statusLoading(false); } diff --git a/api/logic/status/StatusChecker.h b/api/logic/status/StatusChecker.h index f19aba9a..829b139d 100644 --- a/api/logic/status/StatusChecker.h +++ b/api/logic/status/StatusChecker.h @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,36 +25,36 @@ class MULTIMC_LOGIC_EXPORT StatusChecker : public QObject { - Q_OBJECT + Q_OBJECT public: /* con/des */ - StatusChecker(); + StatusChecker(); public: /* methods */ - QString getLastLoadErrorMsg() const; - bool isLoadingStatus() const; - QMap getStatusEntries() const; + QString getLastLoadErrorMsg() const; + bool isLoadingStatus() const; + QMap getStatusEntries() const; signals: - void statusLoading(bool loading); - void statusChanged(QMap newStatus); + void statusLoading(bool loading); + void statusChanged(QMap newStatus); public slots: - void reloadStatus(); + void reloadStatus(); protected: /* methods */ - virtual void timerEvent(QTimerEvent *); + virtual void timerEvent(QTimerEvent *); protected slots: - void statusDownloadFinished(); - void statusDownloadFailed(QString reason); - void succeed(); - void fail(const QString& errorMsg); + void statusDownloadFinished(); + void statusDownloadFailed(QString reason); + void succeed(); + void fail(const QString& errorMsg); protected: /* data */ - QMap m_prevEntries; - QMap m_statusEntries; - NetJobPtr m_statusNetJob; - QString m_lastLoadError; - QByteArray dataSink; + QMap m_prevEntries; + QMap m_statusEntries; + NetJobPtr m_statusNetJob; + QString m_lastLoadError; + QByteArray dataSink; }; -- cgit v1.2.3