summaryrefslogtreecommitdiffstats
path: root/logic/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'logic/tasks')
-rw-r--r--logic/tasks/LoginTask.cpp111
-rw-r--r--logic/tasks/LoginTask.h58
-rw-r--r--logic/tasks/ProgressProvider.h20
-rw-r--r--logic/tasks/Task.cpp48
-rw-r--r--logic/tasks/Task.h48
5 files changed, 53 insertions, 232 deletions
diff --git a/logic/tasks/LoginTask.cpp b/logic/tasks/LoginTask.cpp
deleted file mode 100644
index ad9de7f5..00000000
--- a/logic/tasks/LoginTask.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright 2013 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 "LoginTask.h"
-#include "MultiMC.h"
-
-#include <QStringList>
-
-#include <QNetworkReply>
-#include <QNetworkRequest>
-
-#include <QUrl>
-#include <QUrlQuery>
-
-LoginTask::LoginTask( const UserInfo& uInfo, QObject* parent ) : Task(parent), uInfo(uInfo){}
-
-void LoginTask::executeTask()
-{
- setStatus("Logging in...");
- auto worker = MMC->qnam();
- connect(worker, SIGNAL(finished(QNetworkReply*)), this, SLOT(processNetReply(QNetworkReply*)));
-
- QUrl loginURL("https://login.minecraft.net/");
- QNetworkRequest netRequest(loginURL);
- netRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-
- QUrlQuery params;
- params.addQueryItem("user", uInfo.username);
- params.addQueryItem("password", uInfo.password);
- params.addQueryItem("version", "13");
-
- netReply = worker->post(netRequest, params.query(QUrl::EncodeSpaces).toUtf8());
-}
-
-void LoginTask::processNetReply(QNetworkReply *reply)
-{
- if(netReply != reply)
- return;
- // Check for errors.
- switch (reply->error())
- {
- case QNetworkReply::NoError:
- {
- // Check the response code.
- int responseCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-
- if (responseCode == 200)
- {
- QString responseStr(reply->readAll());
-
- QStringList strings = responseStr.split(":");
- if (strings.count() >= 4)
- {
- bool parseSuccess;
- qint64 latestVersion = strings[0].toLongLong(&parseSuccess);
- if (parseSuccess)
- {
- // strings[1] is the download ticket. It isn't used anymore.
- QString username = strings[2];
- QString sessionID = strings[3];
-
- result = {username, sessionID, latestVersion};
- emitSucceeded();
- }
- else
- {
- emitFailed("Failed to parse Minecraft version string.");
- }
- }
- else
- {
- if (responseStr.toLower() == "bad login")
- emitFailed("Invalid username or password.");
- else if (responseStr.toLower() == "old version")
- emitFailed("Launcher outdated, please update.");
- else
- emitFailed("Login failed: " + responseStr);
- }
- }
- else if (responseCode == 503)
- {
- emitFailed("The login servers are currently unavailable. Check http://help.mojang.com/ for more info.");
- }
- else
- {
- emitFailed(QString("Login failed: Unknown HTTP error %1 occurred.").arg(QString::number(responseCode)));
- }
- break;
- }
-
- case QNetworkReply::OperationCanceledError:
- emitFailed("Login canceled.");
- break;
-
- default:
- emitFailed("Login failed: " + reply->errorString());
- break;
- }
-}
diff --git a/logic/tasks/LoginTask.h b/logic/tasks/LoginTask.h
deleted file mode 100644
index bde672b8..00000000
--- a/logic/tasks/LoginTask.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2013 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.
- */
-
-#ifndef LOGINTASK_H
-#define LOGINTASK_H
-
-#include "Task.h"
-#include <QSharedPointer>
-
-struct UserInfo
-{
- QString username;
- QString password;
-};
-
-struct LoginResponse
-{
- QString username;
- QString sessionID;
- qint64 latestVersion;
-};
-
-class QNetworkReply;
-
-class LoginTask : public Task
-{
- Q_OBJECT
-public:
- explicit LoginTask(const UserInfo& uInfo, QObject *parent = 0);
- LoginResponse getResult()
- {
- return result;
- };
-
-protected slots:
- void processNetReply(QNetworkReply* reply);
-
-protected:
- void executeTask();
-
- LoginResponse result;
- QNetworkReply* netReply;
- UserInfo uInfo;
-};
-
-#endif // LOGINTASK_H
diff --git a/logic/tasks/ProgressProvider.h b/logic/tasks/ProgressProvider.h
new file mode 100644
index 00000000..e158eb54
--- /dev/null
+++ b/logic/tasks/ProgressProvider.h
@@ -0,0 +1,20 @@
+#pragma once
+#include <QObject>
+class ProgressProvider : public QObject
+{
+ Q_OBJECT
+protected:
+ explicit ProgressProvider(QObject* parent = 0): QObject(parent){}
+signals:
+ void started();
+ void progress(qint64 current, qint64 total);
+ void succeeded();
+ void failed(QString reason);
+ void status(QString status);
+public:
+ virtual QString getStatus() const = 0;
+ virtual void getProgress(qint64 &current, qint64 &total) = 0;
+ virtual bool isRunning() const = 0;
+public slots:
+ virtual void start() = 0;
+};
diff --git a/logic/tasks/Task.cpp b/logic/tasks/Task.cpp
index 7c148591..c75bcb8f 100644
--- a/logic/tasks/Task.cpp
+++ b/logic/tasks/Task.cpp
@@ -16,70 +16,56 @@
#include "Task.h"
Task::Task(QObject *parent) :
- QObject(parent)
+ ProgressProvider(parent)
{
}
QString Task::getStatus() const
{
- return status;
+ return m_status;
}
-void Task::setStatus(const QString &status)
+void Task::setStatus(const QString &new_status)
{
- this->status = status;
- emitStatusChange(status);
+ m_status = new_status;
+ emit status(new_status);
}
-int Task::getProgress() const
+void Task::setProgress(int new_progress)
{
- return progress;
+ m_progress = new_progress;
+ emit progress(new_progress, 100);
}
-void Task::setProgress(int progress)
+void Task::getProgress(qint64& current, qint64& total)
{
- this->progress = progress;
- emitProgressChange(progress);
+ current = m_progress;
+ total = 100;
}
-void Task::startTask()
-{
- emitStarted();
- executeTask();
-}
-void Task::emitStarted()
+void Task::start()
{
- running = true;
+ m_running = true;
emit started();
+ executeTask();
}
void Task::emitFailed(QString reason)
{
- running = false;
+ m_running = false;
emit failed(reason);
}
void Task::emitSucceeded()
{
- running = false;
+ m_running = false;
emit succeeded();
}
bool Task::isRunning() const
{
- return running;
-}
-
-
-void Task::emitStatusChange(const QString &status)
-{
- emit statusChanged(status);
-}
-
-void Task::emitProgressChange(int progress)
-{
- emit progressChanged(progress);
+ return m_running;
}
diff --git a/logic/tasks/Task.h b/logic/tasks/Task.h
index 91852b0f..cfe71c51 100644
--- a/logic/tasks/Task.h
+++ b/logic/tasks/Task.h
@@ -13,53 +13,37 @@
* limitations under the License.
*/
-#ifndef TASK_H
-#define TASK_H
+#pragma once
#include <QObject>
#include <QString>
+#include "ProgressProvider.h"
-class Task : public QObject
+class Task : public ProgressProvider
{
Q_OBJECT
public:
explicit Task(QObject *parent = 0);
- QString getStatus() const;
- int getProgress() const;
- bool isRunning() const;
+ virtual QString getStatus() const;
+ virtual void getProgress(qint64& current, qint64& total);
+ virtual bool isRunning() const;
public slots:
- void startTask();
-
-protected slots:
- void setStatus(const QString& status);
- void setProgress(int progress);
-
-signals:
- void started();
- void failed(QString reason);
- void succeeded();
-
- void statusChanged(Task* task, const QString& status);
- void progressChanged(Task* task, int progress);
-
- void statusChanged(const QString& status);
- void progressChanged(int progress);
+ virtual void start();
protected:
virtual void executeTask() = 0;
- virtual void emitStarted();
- virtual void emitFailed(QString reason);
virtual void emitSucceeded();
+ virtual void emitFailed(QString reason);
+
+protected slots:
+ void setStatus(const QString& status);
+ void setProgress(int progress);
- virtual void emitStatusChange(const QString &status);
- virtual void emitProgressChange(int progress);
-
- QString status;
- int progress;
- bool running = false;
+protected:
+ QString m_status;
+ int m_progress = 0;
+ bool m_running = false;
};
-
-#endif // TASK_H
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 16:11:48 +0000