NOISSUE Flatten gui and logic libraries into MultiMC

2 files changed, 0 insertions, 208 deletions

diff --git a/api/logic/status/StatusChecker.cpp b/api/logic/status/StatusChecker.cpp
deleted file mode 100644
index 38fc2163..00000000
--- a/api/logic/status/StatusChecker.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "StatusChecker.h"
-
-#include <QByteArray>
-
-#include <QDebug>
-
-#include <BuildConfig.h>
-
-StatusChecker::StatusChecker()
-{
-
-}
-
-void StatusChecker::timerEvent(QTimerEvent *e)
-{
-    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(BuildConfig.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();
-}
-
-void StatusChecker::statusDownloadFailed(QString reason)
-{
-    fail(tr("Failed to load status JSON:\n%1").arg(reason));
-}
-
-
-QMap<QString, QString> StatusChecker::getStatusEntries() const
-{
-    return m_statusEntries;
-}
-
-bool StatusChecker::isLoadingStatus() const
-{
-    return m_statusNetJob.get() != nullptr;
-}
-
-QString StatusChecker::getLastLoadErrorMsg() const
-{
-    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);
-}
-
-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);
-}
-
diff --git a/api/logic/status/StatusChecker.h b/api/logic/status/StatusChecker.h
deleted file mode 100644
index e9961aff..00000000
--- a/api/logic/status/StatusChecker.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QString>
-#include <QList>
-
-#include <net/NetJob.h>
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT StatusChecker : public QObject
-{
-    Q_OBJECT
-public: /* con/des */
-    StatusChecker();
-
-public: /* methods */
-    QString getLastLoadErrorMsg() const;
-    bool isLoadingStatus() const;
-    QMap<QString, QString> getStatusEntries() const;
-
-signals:
-    void statusLoading(bool loading);
-    void statusChanged(QMap<QString, QString> newStatus);
-
-public slots:
-    void reloadStatus();
-
-protected: /* methods */
-    virtual void timerEvent(QTimerEvent *);
-
-protected slots:
-    void statusDownloadFinished();
-    void statusDownloadFailed(QString reason);
-    void succeed();
-    void fail(const QString& errorMsg);
-
-protected: /* data */
-    QMap<QString, QString> m_prevEntries;
-    QMap<QString, QString> m_statusEntries;
-    NetJobPtr m_statusNetJob;
-    QString m_lastLoadError;
-    QByteArray dataSink;
-};
-