From 5ad95134dc521d5eeb85cc37e6681b72b8d62c62 Mon Sep 17 00:00:00 2001 From: robotbrainify Date: Fri, 6 Dec 2013 16:24:55 -0500 Subject: work on pasting instance logs blame clang for formatting changes --- logic/net/PasteUpload.cpp | 84 +++++++++++++++++++++++++++++++++++++++++++++++ logic/net/PasteUpload.h | 30 +++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 logic/net/PasteUpload.cpp create mode 100644 logic/net/PasteUpload.h (limited to 'logic/net') diff --git a/logic/net/PasteUpload.cpp b/logic/net/PasteUpload.cpp new file mode 100644 index 00000000..9945d85e --- /dev/null +++ b/logic/net/PasteUpload.cpp @@ -0,0 +1,84 @@ +#include "PasteUpload.h" +#include "MultiMC.h" +#include "logger/QsLog.h" +#include +#include +#include "gui/dialogs/CustomMessageBox.h" + +PasteUpload::PasteUpload(QWidget *window, QString text) : m_text(text), m_window(window) +{ +} + +void PasteUpload::executeTask() +{ + QNetworkRequest request(QUrl("http://paste.ee/api")); + request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)"); + QByteArray content( + "key=public&description=MultiMC5+Log+File&language=plain&format=json&paste=" + + m_text.toUtf8()); + request.setRawHeader("Content-Type", "application/x-www-form-urlencoded"); + request.setRawHeader("Content-Length", QByteArray::number(content.size())); + + auto worker = MMC->qnam(); + QNetworkReply *rep = worker->post(request, content); + + m_reply = std::shared_ptr(rep); + connect(rep, &QNetworkReply::downloadProgress, [&](qint64 value, qint64 max) + { setProgress(value / max * 100); }); + connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), this, + SLOT(downloadError(QNetworkReply::NetworkError))); + connect(rep, SIGNAL(finished()), this, SLOT(downloadFinished())); +} + +void PasteUpload::downloadError(QNetworkReply::NetworkError error) +{ + // error happened during download. + QLOG_ERROR() << "Network error: " << error; + emitFailed(m_reply->errorString()); +} + +void PasteUpload::downloadFinished() +{ + // if the download succeeded + if (m_reply->error() == QNetworkReply::NetworkError::NoError) + { + QByteArray data = m_reply->readAll(); + m_reply.reset(); + QJsonParseError jsonError; + QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError); + if (jsonError.error != QJsonParseError::NoError) + { + emitFailed(jsonError.errorString()); + return; + } + QString error; + if (parseResult(doc, &error)) + { + emitFailed(error); + return; + } + } + // else the download failed + else + { + emitFailed(QString("Network error: %s").arg(m_reply->errorString())); + m_reply.reset(); + return; + } + emitSucceeded(); +} + +bool PasteUpload::parseResult(QJsonDocument doc, QString *parseError) +{ + auto object = doc.object(); + auto status = object.value("status").toString("error"); + if (status == "error") + { + parseError = new QString(object.value("error").toString()); + return false; + } + QString pasteUrl = object.value("paste").toObject().value("link").toString(); + m_messageBox = + CustomMessageBox::selectable(m_window, "Paste upload successful!", QString("Find your paste at %s").arg(pasteUrl)); + return true; +} diff --git a/logic/net/PasteUpload.h b/logic/net/PasteUpload.h new file mode 100644 index 00000000..27186ba6 --- /dev/null +++ b/logic/net/PasteUpload.h @@ -0,0 +1,30 @@ +#pragma once +#include "logic/tasks/Task.h" +#include +#include +#include + +class PasteUpload : public Task +{ +public: + PasteUpload(QWidget *window, QString text); + QMessageBox *messageBox() const + { + return m_messageBox; + } + +protected: + virtual void executeTask(); + +private: + bool parseResult(QJsonDocument doc, QString *parseError); + QString m_text; + QString m_error; + QWidget *m_window; + QMessageBox *m_messageBox; + std::shared_ptr m_reply; +public +slots: + void downloadError(QNetworkReply::NetworkError); + void downloadFinished(); +}; -- cgit v1.2.3 From e2728317e7b6d6b0301e3ca17becd78d6455107e Mon Sep 17 00:00:00 2001 From: robotbrainify Date: Fri, 6 Dec 2013 17:13:09 -0500 Subject: Fixes to pasting --- logic/net/PasteUpload.cpp | 8 ++++---- logic/net/PasteUpload.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'logic/net') diff --git a/logic/net/PasteUpload.cpp b/logic/net/PasteUpload.cpp index 9945d85e..efe0e053 100644 --- a/logic/net/PasteUpload.cpp +++ b/logic/net/PasteUpload.cpp @@ -52,7 +52,7 @@ void PasteUpload::downloadFinished() return; } QString error; - if (parseResult(doc, &error)) + if (!parseResult(doc, &error)) { emitFailed(error); return; @@ -61,7 +61,7 @@ void PasteUpload::downloadFinished() // else the download failed else { - emitFailed(QString("Network error: %s").arg(m_reply->errorString())); + emitFailed(QString("Network error: %1").arg(m_reply->errorString())); m_reply.reset(); return; } @@ -78,7 +78,7 @@ bool PasteUpload::parseResult(QJsonDocument doc, QString *parseError) return false; } QString pasteUrl = object.value("paste").toObject().value("link").toString(); - m_messageBox = - CustomMessageBox::selectable(m_window, "Paste upload successful!", QString("Find your paste at %s").arg(pasteUrl)); + m_messageBox = CustomMessageBox::selectable(m_window, "Paste upload successful!", + QString("Find your paste at %1").arg(pasteUrl)); return true; } diff --git a/logic/net/PasteUpload.h b/logic/net/PasteUpload.h index 27186ba6..3105d6a1 100644 --- a/logic/net/PasteUpload.h +++ b/logic/net/PasteUpload.h @@ -6,6 +6,7 @@ class PasteUpload : public Task { + Q_OBJECT public: PasteUpload(QWidget *window, QString text); QMessageBox *messageBox() const -- cgit v1.2.3 From 4548930e34f5bc325c62ac5b6c5a1701ce914683 Mon Sep 17 00:00:00 2001 From: robotbrainify Date: Fri, 6 Dec 2013 17:17:32 -0500 Subject: Open the url direectly. --- logic/net/PasteUpload.cpp | 4 ++-- logic/net/PasteUpload.h | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'logic/net') diff --git a/logic/net/PasteUpload.cpp b/logic/net/PasteUpload.cpp index efe0e053..acf09291 100644 --- a/logic/net/PasteUpload.cpp +++ b/logic/net/PasteUpload.cpp @@ -4,6 +4,7 @@ #include #include #include "gui/dialogs/CustomMessageBox.h" +#include PasteUpload::PasteUpload(QWidget *window, QString text) : m_text(text), m_window(window) { @@ -78,7 +79,6 @@ bool PasteUpload::parseResult(QJsonDocument doc, QString *parseError) return false; } QString pasteUrl = object.value("paste").toObject().value("link").toString(); - m_messageBox = CustomMessageBox::selectable(m_window, "Paste upload successful!", - QString("Find your paste at %1").arg(pasteUrl)); + QDesktopServices::openUrl(pasteUrl); return true; } diff --git a/logic/net/PasteUpload.h b/logic/net/PasteUpload.h index 3105d6a1..917a0016 100644 --- a/logic/net/PasteUpload.h +++ b/logic/net/PasteUpload.h @@ -9,10 +9,6 @@ class PasteUpload : public Task Q_OBJECT public: PasteUpload(QWidget *window, QString text); - QMessageBox *messageBox() const - { - return m_messageBox; - } protected: virtual void executeTask(); @@ -22,7 +18,6 @@ private: QString m_text; QString m_error; QWidget *m_window; - QMessageBox *m_messageBox; std::shared_ptr m_reply; public slots: -- cgit v1.2.3