From f8ea8d9e3bb949d7c4ea39c47ca6091f61dc1cfc Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 5 Feb 2013 13:40:43 -0600 Subject: Added base class for tasks. --- tasks/task.cpp | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tasks/task.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 tasks/task.cpp create mode 100644 tasks/task.h (limited to 'tasks') diff --git a/tasks/task.cpp b/tasks/task.cpp new file mode 100644 index 00000000..8d65b415 --- /dev/null +++ b/tasks/task.cpp @@ -0,0 +1,56 @@ +/* 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 "task.h" + +Task::Task(QObject *parent) : + QThread(parent) +{ + +} + +QString Task::getStatus() const +{ + return status; +} + +void Task::setStatus(const QString &status) +{ + this->status = status; + statusChanged(status); +} + +int Task::getProgress() const +{ + return progress; +} + +void Task::setProgress(int progress) +{ + this->progress = progress; + progressChanged(progress); +} + +void Task::startTask() +{ + start(); +} + +void Task::run() +{ + taskStarted(this); + executeTask(); + taskEnded(this); +} diff --git a/tasks/task.h b/tasks/task.h new file mode 100644 index 00000000..714889c8 --- /dev/null +++ b/tasks/task.h @@ -0,0 +1,53 @@ +/* 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 TASK_H +#define TASK_H + +#include +#include +#include + +class Task : public QThread +{ + Q_OBJECT +public: + explicit Task(QObject *parent = 0); + + // Starts the task. + void startTask(); + + QString getStatus() const; + int getProgress() const; + +signals: + void taskStarted(Task* task); + void taskEnded(Task* task); + + void statusChanged(const QString& status); + void progressChanged(int progress); + +protected: + void setStatus(const QString& status); + void setProgress(int progress); + + virtual void run(); + virtual void executeTask() = 0; + + QString status; + int progress; +}; + +#endif // TASK_H -- cgit v1.2.3 From a416c58a93dd9d108f4c4fa968b9431e30834c5c Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 5 Feb 2013 16:34:20 -0600 Subject: Started working on task system and login system. --- tasks/logintask.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++++ tasks/logintask.h | 40 ++++++++++++++++++++++++++++++++++++++++ tasks/task.cpp | 8 ++++---- tasks/task.h | 7 ++++--- 4 files changed, 92 insertions(+), 7 deletions(-) create mode 100644 tasks/logintask.cpp create mode 100644 tasks/logintask.h (limited to 'tasks') diff --git a/tasks/logintask.cpp b/tasks/logintask.cpp new file mode 100644 index 00000000..211e1c17 --- /dev/null +++ b/tasks/logintask.cpp @@ -0,0 +1,44 @@ +/* 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" + +LoginTask::LoginTask(const UserInfo &uInfo, QObject *parent) : + Task(parent), uInfo(uInfo) +{ + +} + +void LoginTask::executeTask() +{ + setStatus("Logging in..."); + + // TODO: PLACEHOLDER + for (int p = 0; p < 100; p++) + { + msleep(25); + setProgress(p); + } + + if (uInfo.getUsername() == "test") + { + LoginResponse response("test", "Fake Session ID"); + emit loginComplete(response); + } + else + { + emit loginFailed("Testing"); + } +} diff --git a/tasks/logintask.h b/tasks/logintask.h new file mode 100644 index 00000000..93aab9b3 --- /dev/null +++ b/tasks/logintask.h @@ -0,0 +1,40 @@ +/* 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 "data/userinfo.h" +#include "data/loginresponse.h" + +class LoginTask : public Task +{ + Q_OBJECT +public: + explicit LoginTask(const UserInfo& uInfo, QObject *parent = 0); + +signals: + void loginComplete(const LoginResponse& loginResponse); + void loginFailed(const QString& errorMsg); + +protected: + void executeTask(); + + UserInfo uInfo; +}; + +#endif // LOGINTASK_H diff --git a/tasks/task.cpp b/tasks/task.cpp index 8d65b415..d581a1dd 100644 --- a/tasks/task.cpp +++ b/tasks/task.cpp @@ -29,7 +29,7 @@ QString Task::getStatus() const void Task::setStatus(const QString &status) { this->status = status; - statusChanged(status); + emit statusChanged(status); } int Task::getProgress() const @@ -40,7 +40,7 @@ int Task::getProgress() const void Task::setProgress(int progress) { this->progress = progress; - progressChanged(progress); + emit progressChanged(progress); } void Task::startTask() @@ -50,7 +50,7 @@ void Task::startTask() void Task::run() { - taskStarted(this); + emit taskStarted(this); executeTask(); - taskEnded(this); + emit taskEnded(this); } diff --git a/tasks/task.h b/tasks/task.h index 714889c8..0124d8cf 100644 --- a/tasks/task.h +++ b/tasks/task.h @@ -32,6 +32,10 @@ public: QString getStatus() const; int getProgress() const; +public slots: + void setStatus(const QString& status); + void setProgress(int progress); + signals: void taskStarted(Task* task); void taskEnded(Task* task); @@ -40,9 +44,6 @@ signals: void progressChanged(int progress); protected: - void setStatus(const QString& status); - void setProgress(int progress); - virtual void run(); virtual void executeTask() = 0; -- cgit v1.2.3 From e475f5d51251ae57da0480bbadc9cb32a8bc72b2 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 5 Feb 2013 19:22:19 -0600 Subject: Implemented login system. --- tasks/logintask.cpp | 101 +++++++++++++++++++++++++++++++++++++++++++++------- tasks/logintask.h | 10 +++++- 2 files changed, 98 insertions(+), 13 deletions(-) (limited to 'tasks') diff --git a/tasks/logintask.cpp b/tasks/logintask.cpp index 211e1c17..f683b811 100644 --- a/tasks/logintask.cpp +++ b/tasks/logintask.cpp @@ -15,6 +15,15 @@ #include "logintask.h" +#include + +#include +#include +#include + +#include +#include + LoginTask::LoginTask(const UserInfo &uInfo, QObject *parent) : Task(parent), uInfo(uInfo) { @@ -25,20 +34,88 @@ void LoginTask::executeTask() { setStatus("Logging in..."); - // TODO: PLACEHOLDER - for (int p = 0; p < 100; p++) - { - msleep(25); - setProgress(p); - } + QNetworkAccessManager netMgr; + connect(&netMgr, SIGNAL(finished(QNetworkReply*)), + 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.getUsername()); + params.addQueryItem("password", uInfo.getPassword()); + params.addQueryItem("version", "13"); - if (uInfo.getUsername() == "test") + netReply = netMgr.post(netRequest, params.query(QUrl::EncodeSpaces).toUtf8()); + exec(); +} + +void LoginTask::processNetReply(QNetworkReply *reply) +{ + // Check for errors. + switch (reply->error()) { - LoginResponse response("test", "Fake Session ID"); - emit loginComplete(response); - } - else + case QNetworkReply::NoError: { - emit loginFailed("Testing"); + // 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]; + + LoginResponse response(username, sessionID, latestVersion); + emit loginComplete(response); + } + else + { + emit loginFailed("Failed to parse Minecraft version string."); + } + } + else + { + if (responseStr.toLower() == "bad login") + emit loginFailed("Invalid username or password."); + else if (responseStr.toLower() == "old version") + emit loginFailed("Launcher outdated, please update."); + else + emit loginFailed("Login failed: " + responseStr); + } + } + else if (responseCode == 503) + { + emit loginFailed("The login servers are currently unavailable. " + "Check http://help.mojang.com/ for more info."); + } + else + { + emit loginFailed(QString("Login failed: Unknown HTTP error %1 occurred."). + arg(QString::number(responseCode))); + } + break; + } + + case QNetworkReply::OperationCanceledError: + emit loginFailed("Login canceled."); + break; + + default: + emit loginFailed("Login failed: " + reply->errorString()); + break; } + + quit(); } diff --git a/tasks/logintask.h b/tasks/logintask.h index 93aab9b3..d96bfec7 100644 --- a/tasks/logintask.h +++ b/tasks/logintask.h @@ -21,19 +21,27 @@ #include "data/userinfo.h" #include "data/loginresponse.h" +//class QNetworkAccessManager; +class QNetworkReply; + class LoginTask : public Task { Q_OBJECT public: explicit LoginTask(const UserInfo& uInfo, QObject *parent = 0); +public slots: + void processNetReply(QNetworkReply* reply); + signals: - void loginComplete(const LoginResponse& loginResponse); + void loginComplete(LoginResponse loginResponse); void loginFailed(const QString& errorMsg); protected: void executeTask(); + QNetworkReply* netReply; + UserInfo uInfo; }; -- cgit v1.2.3