From 4a77524b059c12165e20b38de6c0d4ed08e56419 Mon Sep 17 00:00:00 2001 From: robotbrain Date: Sun, 23 Feb 2014 16:14:24 -0500 Subject: Initial stuff. It doesnt work. --- logic/net/ScreenshotUploader.cpp | 144 +++++++++++++++++++++++++++++++++++++++ logic/net/ScreenshotUploader.h | 52 ++++++++++++++ logic/net/URLConstants.h | 2 + 3 files changed, 198 insertions(+) create mode 100644 logic/net/ScreenshotUploader.cpp create mode 100644 logic/net/ScreenshotUploader.h (limited to 'logic/net') diff --git a/logic/net/ScreenshotUploader.cpp b/logic/net/ScreenshotUploader.cpp new file mode 100644 index 00000000..03ea1cb4 --- /dev/null +++ b/logic/net/ScreenshotUploader.cpp @@ -0,0 +1,144 @@ +#include "ScreenshotUploader.h" +#include "logic/lists/ScreenshotList.h" +#include +#include +#include +#include "URLConstants.h" +#include "MultiMC.h" + +ScreenShotUpload::ScreenShotUpload(ScreenShot *shot) : m_shot(shot) +{ + m_status = Job_NotStarted; +} + +void ScreenShotUpload::start() +{ + m_status = Job_InProgress; + QNetworkRequest request(URLConstants::IMGUR_UPLOAD_URL); + request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)"); + request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3"); + + QJsonObject object; + object.insert("image", QJsonValue::fromVariant(m_shot->file.toBase64())); + object.insert("type", QJsonValue::fromVariant("base64")); + object.insert("name", QJsonValue::fromVariant(m_shot->timestamp)); + QJsonDocument doc; + doc.setObject(object); + + auto worker = MMC->qnam(); + QNetworkReply *rep = worker->post(request, doc.toJson()); + + m_reply = std::shared_ptr(rep); + connect(rep, SIGNAL(downloadProgress(qint64, qint64)), + SLOT(downloadProgress(qint64, qint64))); + connect(rep, SIGNAL(finished()), SLOT(downloadFinished())); + connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), + SLOT(downloadError(QNetworkReply::NetworkError))); + connect(rep, SIGNAL(readyRead()), SLOT(downloadReadyRead())); +} +void ScreenShotUpload::downloadError(QNetworkReply::NetworkError error) +{ + m_status = Job_Failed; +} +void ScreenShotUpload::downloadFinished() +{ + if (m_status != Job_Failed) + { + QByteArray data = m_reply->readAll(); + m_reply.reset(); + QJsonParseError jsonError; + QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError); + if (jsonError.error != QJsonParseError::NoError) + { + emit failed(m_index_within_job); + return; + } + auto object = doc.object(); + if (!object.value("success").toBool()) + { + emit failed(m_index_within_job); + return; + } + m_shot->imgurIndex = object.value("data").toVariant().toInt(); + m_status = Job_Finished; + emit succeeded(m_index_within_job); + return; + } + else + { + m_reply.reset(); + emit failed(m_index_within_job); + return; + } +} +void ScreenShotUpload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) +{ + m_total_progress = bytesTotal; + m_progress = bytesReceived; + emit progress(m_index_within_job, bytesReceived, bytesTotal); +} +void ScreenShotUpload::downloadReadyRead() +{ + // noop +} +ScreenShotGet::ScreenShotGet(ScreenShot *shot) : m_shot(shot) +{ + m_status = Job_NotStarted; +} +void ScreenShotGet::start() +{ + m_status = Job_InProgress; + QNetworkRequest request(URLConstants::IMGUR_GET_BASE + m_shot->imgurIndex + ".json"); + request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)"); + request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3"); + + auto worker = MMC->qnam(); + QNetworkReply *rep = worker->get(request); + + m_reply = std::shared_ptr(rep); + connect(rep, SIGNAL(downloadProgress(qint64, qint64)), + SLOT(downloadProgress(qint64, qint64))); + connect(rep, SIGNAL(finished()), SLOT(downloadFinished())); + connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), + SLOT(downloadError(QNetworkReply::NetworkError))); + connect(rep, SIGNAL(readyRead()), SLOT(downloadReadyRead())); +} +void ScreenShotGet::downloadError(QNetworkReply::NetworkError error) +{ + m_status = Job_Failed; +} +void ScreenShotGet::downloadFinished() +{ +} +void ScreenShotGet::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) +{ + m_total_progress = bytesTotal; + m_progress = bytesReceived; + emit progress(m_index_within_job, bytesReceived, bytesTotal); +} +void ScreenShotGet::downloadReadyRead() +{ + if (m_status != Job_Failed) + { + QByteArray data = m_reply->readAll(); + m_reply.reset(); + QJsonParseError jsonError; + QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError); + if (jsonError.error != QJsonParseError::NoError) + { + emit failed(m_index_within_job); + return; + } + auto object = doc.object(); + m_shot->url = object.value("link").toString(); + m_status = Job_Finished; + emit succeeded(m_index_within_job); + return; + } + else + { + m_reply.reset(); + emit failed(m_index_within_job); + return; + } +} diff --git a/logic/net/ScreenshotUploader.h b/logic/net/ScreenshotUploader.h new file mode 100644 index 00000000..09e58677 --- /dev/null +++ b/logic/net/ScreenshotUploader.h @@ -0,0 +1,52 @@ +#pragma once +#include "NetAction.h" + +class ScreenShot; +typedef std::shared_ptr ScreenShotUploadPtr; +typedef std::shared_ptr ScreenShotGetPtr; +class ScreenShotUpload : public NetAction +{ +public: + explicit ScreenShotUpload(ScreenShot *shot); + static ScreenShotUploadPtr make(ScreenShot *shot) + { + return ScreenShotUploadPtr(new ScreenShotUpload(shot)); + } + +protected +slots: + virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); + virtual void downloadError(QNetworkReply::NetworkError error); + virtual void downloadFinished(); + virtual void downloadReadyRead(); + +public +slots: + virtual void start(); + +private: + ScreenShot *m_shot; +}; +class ScreenShotGet : public NetAction +{ +public: + explicit ScreenShotGet(ScreenShot *shot); + static ScreenShotGetPtr make(ScreenShot *shot) + { + return ScreenShotGetPtr(new ScreenShotGet(shot)); + } + +protected +slots: + virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); + virtual void downloadError(QNetworkReply::NetworkError error); + virtual void downloadFinished(); + virtual void downloadReadyRead(); + +public +slots: + virtual void start(); + +private: + ScreenShot *m_shot; +}; diff --git a/logic/net/URLConstants.h b/logic/net/URLConstants.h index 8cb1f3fd..3e21d21e 100644 --- a/logic/net/URLConstants.h +++ b/logic/net/URLConstants.h @@ -33,4 +33,6 @@ const QString FORGE_LEGACY_URL("http://files.minecraftforge.net/minecraftforge/j const QString FORGE_GRADLE_URL("http://files.minecraftforge.net/maven/net/minecraftforge/forge/json"); const QString MOJANG_STATUS_URL("http://status.mojang.com/check"); const QString MOJANG_STATUS_NEWS_URL("http://status.mojang.com/news"); +const QString IMGUR_UPLOAD_URL("https://api.imgur.com/3/image.json"); +const QString IMGUR_GET_BASE("https://api.imgur.com/3/image/"); } -- cgit From 5e33da258c3b5159dba854eb4792d0852a1ca363 Mon Sep 17 00:00:00 2001 From: robotbrain Date: Sun, 23 Feb 2014 19:45:59 -0500 Subject: Close to finished. Need to fix the upload part. Viewing works (in grayscale) --- logic/net/ScreenshotUploader.cpp | 101 ++++++++++++--------------------------- logic/net/ScreenshotUploader.h | 23 --------- logic/net/URLConstants.h | 3 +- 3 files changed, 31 insertions(+), 96 deletions(-) (limited to 'logic/net') diff --git a/logic/net/ScreenshotUploader.cpp b/logic/net/ScreenshotUploader.cpp index 03ea1cb4..c1f62243 100644 --- a/logic/net/ScreenshotUploader.cpp +++ b/logic/net/ScreenshotUploader.cpp @@ -1,32 +1,48 @@ #include "ScreenshotUploader.h" #include "logic/lists/ScreenshotList.h" #include -#include +#include #include +#include +#include +#include +#include #include "URLConstants.h" #include "MultiMC.h" +#include "logger/QsLog.h" ScreenShotUpload::ScreenShotUpload(ScreenShot *shot) : m_shot(shot) { + m_url = URLConstants::IMGUR_UPLOAD_URL; m_status = Job_NotStarted; } void ScreenShotUpload::start() { m_status = Job_InProgress; - QNetworkRequest request(URLConstants::IMGUR_UPLOAD_URL); + QNetworkRequest request(m_url); request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)"); + request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3"); + request.setRawHeader("Accept", "application/json"); - QJsonObject object; - object.insert("image", QJsonValue::fromVariant(m_shot->file.toBase64())); - object.insert("type", QJsonValue::fromVariant("base64")); - object.insert("name", QJsonValue::fromVariant(m_shot->timestamp)); - QJsonDocument doc; - doc.setObject(object); + QHttpMultiPart *multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType); + QHttpPart filePart; + filePart.setBody(QFile(m_shot->file).readAll().toBase64()); + filePart.setHeader(QNetworkRequest::ContentTypeHeader, "image/png"); + filePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"image\""); + multipart->append(filePart); + QHttpPart typePart; + typePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"type\""); + typePart.setBody("base64"); + multipart->append(typePart); + QHttpPart namePart; + namePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"name\""); + namePart.setBody(m_shot->timestamp.toUtf8()); + multipart->append(namePart); auto worker = MMC->qnam(); - QNetworkReply *rep = worker->post(request, doc.toJson()); + QNetworkReply *rep = worker->post(request, multipart); m_reply = std::shared_ptr(rep); connect(rep, SIGNAL(downloadProgress(qint64, qint64)), @@ -38,6 +54,7 @@ void ScreenShotUpload::start() } void ScreenShotUpload::downloadError(QNetworkReply::NetworkError error) { + QLOG_DEBUG() << m_reply->errorString(); m_status = Job_Failed; } void ScreenShotUpload::downloadFinished() @@ -50,16 +67,19 @@ void ScreenShotUpload::downloadFinished() QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError); if (jsonError.error != QJsonParseError::NoError) { + QLOG_DEBUG() << jsonError.errorString(); emit failed(m_index_within_job); return; } auto object = doc.object(); if (!object.value("success").toBool()) { + QLOG_DEBUG() << doc.toJson(); emit failed(m_index_within_job); return; } - m_shot->imgurIndex = object.value("data").toVariant().toInt(); + m_shot->imgurIndex = object.value("data").toObject().value("id").toVariant().toInt(); + m_shot->url = "https://imgur.com/gallery/" + QString::number(m_shot->imgurIndex); m_status = Job_Finished; emit succeeded(m_index_within_job); return; @@ -81,64 +101,3 @@ void ScreenShotUpload::downloadReadyRead() { // noop } -ScreenShotGet::ScreenShotGet(ScreenShot *shot) : m_shot(shot) -{ - m_status = Job_NotStarted; -} -void ScreenShotGet::start() -{ - m_status = Job_InProgress; - QNetworkRequest request(URLConstants::IMGUR_GET_BASE + m_shot->imgurIndex + ".json"); - request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)"); - request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3"); - - auto worker = MMC->qnam(); - QNetworkReply *rep = worker->get(request); - - m_reply = std::shared_ptr(rep); - connect(rep, SIGNAL(downloadProgress(qint64, qint64)), - SLOT(downloadProgress(qint64, qint64))); - connect(rep, SIGNAL(finished()), SLOT(downloadFinished())); - connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), - SLOT(downloadError(QNetworkReply::NetworkError))); - connect(rep, SIGNAL(readyRead()), SLOT(downloadReadyRead())); -} -void ScreenShotGet::downloadError(QNetworkReply::NetworkError error) -{ - m_status = Job_Failed; -} -void ScreenShotGet::downloadFinished() -{ -} -void ScreenShotGet::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) -{ - m_total_progress = bytesTotal; - m_progress = bytesReceived; - emit progress(m_index_within_job, bytesReceived, bytesTotal); -} -void ScreenShotGet::downloadReadyRead() -{ - if (m_status != Job_Failed) - { - QByteArray data = m_reply->readAll(); - m_reply.reset(); - QJsonParseError jsonError; - QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError); - if (jsonError.error != QJsonParseError::NoError) - { - emit failed(m_index_within_job); - return; - } - auto object = doc.object(); - m_shot->url = object.value("link").toString(); - m_status = Job_Finished; - emit succeeded(m_index_within_job); - return; - } - else - { - m_reply.reset(); - emit failed(m_index_within_job); - return; - } -} diff --git a/logic/net/ScreenshotUploader.h b/logic/net/ScreenshotUploader.h index 09e58677..d5d1cef3 100644 --- a/logic/net/ScreenshotUploader.h +++ b/logic/net/ScreenshotUploader.h @@ -27,26 +27,3 @@ slots: private: ScreenShot *m_shot; }; -class ScreenShotGet : public NetAction -{ -public: - explicit ScreenShotGet(ScreenShot *shot); - static ScreenShotGetPtr make(ScreenShot *shot) - { - return ScreenShotGetPtr(new ScreenShotGet(shot)); - } - -protected -slots: - virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); - virtual void downloadError(QNetworkReply::NetworkError error); - virtual void downloadFinished(); - virtual void downloadReadyRead(); - -public -slots: - virtual void start(); - -private: - ScreenShot *m_shot; -}; diff --git a/logic/net/URLConstants.h b/logic/net/URLConstants.h index 3e21d21e..f2a943bf 100644 --- a/logic/net/URLConstants.h +++ b/logic/net/URLConstants.h @@ -33,6 +33,5 @@ const QString FORGE_LEGACY_URL("http://files.minecraftforge.net/minecraftforge/j const QString FORGE_GRADLE_URL("http://files.minecraftforge.net/maven/net/minecraftforge/forge/json"); const QString MOJANG_STATUS_URL("http://status.mojang.com/check"); const QString MOJANG_STATUS_NEWS_URL("http://status.mojang.com/news"); -const QString IMGUR_UPLOAD_URL("https://api.imgur.com/3/image.json"); -const QString IMGUR_GET_BASE("https://api.imgur.com/3/image/"); +const QString IMGUR_UPLOAD_URL("https://api.imgur.com/3/upload.json"); } -- cgit From 226c1bdae5ec615381965b6731f6496dffa3299e Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Mon, 24 Feb 2014 09:34:21 +0100 Subject: Screenshot fixes, move some code around, fix some stuff --- logic/net/ScreenshotUploader.cpp | 26 +++++++++++++++----------- logic/net/ScreenshotUploader.h | 4 +++- 2 files changed, 18 insertions(+), 12 deletions(-) (limited to 'logic/net') diff --git a/logic/net/ScreenshotUploader.cpp b/logic/net/ScreenshotUploader.cpp index c1f62243..829a0815 100644 --- a/logic/net/ScreenshotUploader.cpp +++ b/logic/net/ScreenshotUploader.cpp @@ -1,5 +1,5 @@ #include "ScreenshotUploader.h" -#include "logic/lists/ScreenshotList.h" + #include #include #include @@ -7,11 +7,13 @@ #include #include #include + +#include "logic/lists/ScreenshotList.h" #include "URLConstants.h" #include "MultiMC.h" #include "logger/QsLog.h" -ScreenShotUpload::ScreenShotUpload(ScreenShot *shot) : m_shot(shot) +ScreenShotUpload::ScreenShotUpload(ScreenShot *shot) : NetAction(), m_shot(shot) { m_url = URLConstants::IMGUR_UPLOAD_URL; m_status = Job_NotStarted; @@ -26,9 +28,16 @@ void ScreenShotUpload::start() request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3"); request.setRawHeader("Accept", "application/json"); + QFile f(m_shot->file); + if (!f.open(QFile::ReadOnly)) + { + emit failed(m_index_within_job); + return; + } + QHttpMultiPart *multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType); QHttpPart filePart; - filePart.setBody(QFile(m_shot->file).readAll().toBase64()); + filePart.setBody(f.readAll().toBase64()); filePart.setHeader(QNetworkRequest::ContentTypeHeader, "image/png"); filePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"image\""); multipart->append(filePart); @@ -45,12 +54,10 @@ void ScreenShotUpload::start() QNetworkReply *rep = worker->post(request, multipart); m_reply = std::shared_ptr(rep); - connect(rep, SIGNAL(downloadProgress(qint64, qint64)), - SLOT(downloadProgress(qint64, qint64))); - connect(rep, SIGNAL(finished()), SLOT(downloadFinished())); + connect(rep, &QNetworkReply::uploadProgress, this, &ScreenShotUpload::downloadProgress); + connect(rep, &QNetworkReply::finished, this, &ScreenShotUpload::downloadFinished); connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(downloadError(QNetworkReply::NetworkError))); - connect(rep, SIGNAL(readyRead()), SLOT(downloadReadyRead())); } void ScreenShotUpload::downloadError(QNetworkReply::NetworkError error) { @@ -86,6 +93,7 @@ void ScreenShotUpload::downloadFinished() } else { + QLOG_DEBUG() << m_reply->readAll(); m_reply.reset(); emit failed(m_index_within_job); return; @@ -97,7 +105,3 @@ void ScreenShotUpload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) m_progress = bytesReceived; emit progress(m_index_within_job, bytesReceived, bytesTotal); } -void ScreenShotUpload::downloadReadyRead() -{ - // noop -} diff --git a/logic/net/ScreenshotUploader.h b/logic/net/ScreenshotUploader.h index d5d1cef3..c1c9db6f 100644 --- a/logic/net/ScreenshotUploader.h +++ b/logic/net/ScreenshotUploader.h @@ -18,7 +18,9 @@ slots: virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); virtual void downloadError(QNetworkReply::NetworkError error); virtual void downloadFinished(); - virtual void downloadReadyRead(); + virtual void downloadReadyRead() + { + } public slots: -- cgit From a8811a27f78698f1ab2acad47e90f3b16274e221 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Mon, 24 Feb 2014 10:34:51 +0100 Subject: Working screenshot upload --- logic/net/ScreenshotUploader.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'logic/net') diff --git a/logic/net/ScreenshotUploader.cpp b/logic/net/ScreenshotUploader.cpp index 829a0815..490c74b3 100644 --- a/logic/net/ScreenshotUploader.cpp +++ b/logic/net/ScreenshotUploader.cpp @@ -24,7 +24,6 @@ void ScreenShotUpload::start() m_status = Job_InProgress; QNetworkRequest request(m_url); request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)"); - request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3"); request.setRawHeader("Accept", "application/json"); @@ -47,7 +46,7 @@ void ScreenShotUpload::start() multipart->append(typePart); QHttpPart namePart; namePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"name\""); - namePart.setBody(m_shot->timestamp.toUtf8()); + namePart.setBody(m_shot->timestamp.toString(Qt::ISODate).toUtf8()); multipart->append(namePart); auto worker = MMC->qnam(); @@ -85,8 +84,8 @@ void ScreenShotUpload::downloadFinished() emit failed(m_index_within_job); return; } - m_shot->imgurIndex = object.value("data").toObject().value("id").toVariant().toInt(); - m_shot->url = "https://imgur.com/gallery/" + QString::number(m_shot->imgurIndex); + m_shot->imgurIndex = object.value("data").toObject().value("id").toString(); + m_shot->url = object.value("data").toObject().value("link").toString(); m_status = Job_Finished; emit succeeded(m_index_within_job); return; -- cgit From da33fa4090b4510267d06b3fd3ec439ff563b80e Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Mon, 24 Feb 2014 11:30:27 +0100 Subject: Imgur album creation --- logic/net/ImgurAlbumCreation.cpp | 90 +++++++++++++++++++++++++++++++++ logic/net/ImgurAlbumCreation.h | 42 ++++++++++++++++ logic/net/ImgurUpload.cpp | 106 +++++++++++++++++++++++++++++++++++++++ logic/net/ImgurUpload.h | 30 +++++++++++ logic/net/ScreenshotUploader.cpp | 106 --------------------------------------- logic/net/ScreenshotUploader.h | 31 ------------ logic/net/URLConstants.h | 2 +- 7 files changed, 269 insertions(+), 138 deletions(-) create mode 100644 logic/net/ImgurAlbumCreation.cpp create mode 100644 logic/net/ImgurAlbumCreation.h create mode 100644 logic/net/ImgurUpload.cpp create mode 100644 logic/net/ImgurUpload.h delete mode 100644 logic/net/ScreenshotUploader.cpp delete mode 100644 logic/net/ScreenshotUploader.h (limited to 'logic/net') diff --git a/logic/net/ImgurAlbumCreation.cpp b/logic/net/ImgurAlbumCreation.cpp new file mode 100644 index 00000000..0d8c4dc1 --- /dev/null +++ b/logic/net/ImgurAlbumCreation.cpp @@ -0,0 +1,90 @@ +#include "ImgurAlbumCreation.h" + +#include +#include +#include +#include + +#include "logic/lists/ScreenshotList.h" +#include "URLConstants.h" +#include "MultiMC.h" +#include "logger/QsLog.h" + +ImgurAlbumCreation::ImgurAlbumCreation(QList screenshots) : NetAction(), m_screenshots(screenshots) +{ + m_url = URLConstants::IMGUR_BASE_URL + "album.json"; + m_status = Job_NotStarted; +} + +void ImgurAlbumCreation::start() +{ + m_status = Job_InProgress; + QNetworkRequest request(m_url); + request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)"); + request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); + request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3"); + request.setRawHeader("Accept", "application/json"); + + QStringList ids; + for (auto shot : m_screenshots) + { + ids.append(shot->imgurId); + } + + const QByteArray data = "ids=" + ids.join(',').toUtf8() + "&title=Minecraft%20Screenshots&privacy=hidden"; + + auto worker = MMC->qnam(); + QNetworkReply *rep = worker->post(request, data); + + m_reply = std::shared_ptr(rep); + connect(rep, &QNetworkReply::uploadProgress, this, &ImgurAlbumCreation::downloadProgress); + connect(rep, &QNetworkReply::finished, this, &ImgurAlbumCreation::downloadFinished); + connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), + SLOT(downloadError(QNetworkReply::NetworkError))); +} +void ImgurAlbumCreation::downloadError(QNetworkReply::NetworkError error) +{ + QLOG_DEBUG() << m_reply->errorString(); + m_status = Job_Failed; +} +void ImgurAlbumCreation::downloadFinished() +{ + if (m_status != Job_Failed) + { + QByteArray data = m_reply->readAll(); + m_reply.reset(); + QJsonParseError jsonError; + QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError); + if (jsonError.error != QJsonParseError::NoError) + { + QLOG_DEBUG() << jsonError.errorString(); + emit failed(m_index_within_job); + return; + } + auto object = doc.object(); + if (!object.value("success").toBool()) + { + QLOG_DEBUG() << doc.toJson(); + emit failed(m_index_within_job); + return; + } + m_deleteHash = object.value("data").toObject().value("deletehash").toString(); + m_id = object.value("data").toObject().value("id").toString(); + m_status = Job_Finished; + emit succeeded(m_index_within_job); + return; + } + else + { + QLOG_DEBUG() << m_reply->readAll(); + m_reply.reset(); + emit failed(m_index_within_job); + return; + } +} +void ImgurAlbumCreation::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) +{ + m_total_progress = bytesTotal; + m_progress = bytesReceived; + emit progress(m_index_within_job, bytesReceived, bytesTotal); +} diff --git a/logic/net/ImgurAlbumCreation.h b/logic/net/ImgurAlbumCreation.h new file mode 100644 index 00000000..7be255df --- /dev/null +++ b/logic/net/ImgurAlbumCreation.h @@ -0,0 +1,42 @@ +#pragma once +#include "NetAction.h" + +class ScreenShot; +typedef std::shared_ptr ImgurAlbumCreationPtr; +class ImgurAlbumCreation : public NetAction +{ +public: + explicit ImgurAlbumCreation(QList screenshots); + static ImgurAlbumCreationPtr make(QList screenshots) + { + return ImgurAlbumCreationPtr(new ImgurAlbumCreation(screenshots)); + } + + QString deleteHash() const + { + return m_deleteHash; + } + QString id() const + { + return m_id; + } + +protected +slots: + virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); + virtual void downloadError(QNetworkReply::NetworkError error); + virtual void downloadFinished(); + virtual void downloadReadyRead() + { + } + +public +slots: + virtual void start(); + +private: + QList m_screenshots; + + QString m_deleteHash; + QString m_id; +}; diff --git a/logic/net/ImgurUpload.cpp b/logic/net/ImgurUpload.cpp new file mode 100644 index 00000000..4992ee65 --- /dev/null +++ b/logic/net/ImgurUpload.cpp @@ -0,0 +1,106 @@ +#include "ImgurUpload.h" + +#include +#include +#include +#include +#include +#include +#include + +#include "logic/lists/ScreenshotList.h" +#include "URLConstants.h" +#include "MultiMC.h" +#include "logger/QsLog.h" + +ImgurUpload::ImgurUpload(ScreenShot *shot) : NetAction(), m_shot(shot) +{ + m_url = URLConstants::IMGUR_BASE_URL + "upload.json"; + m_status = Job_NotStarted; +} + +void ImgurUpload::start() +{ + m_status = Job_InProgress; + QNetworkRequest request(m_url); + request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)"); + request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3"); + request.setRawHeader("Accept", "application/json"); + + QFile f(m_shot->file); + if (!f.open(QFile::ReadOnly)) + { + emit failed(m_index_within_job); + return; + } + + QHttpMultiPart *multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType); + QHttpPart filePart; + filePart.setBody(f.readAll().toBase64()); + filePart.setHeader(QNetworkRequest::ContentTypeHeader, "image/png"); + filePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"image\""); + multipart->append(filePart); + QHttpPart typePart; + typePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"type\""); + typePart.setBody("base64"); + multipart->append(typePart); + QHttpPart namePart; + namePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"name\""); + namePart.setBody(m_shot->timestamp.toString(Qt::ISODate).toUtf8()); + multipart->append(namePart); + + auto worker = MMC->qnam(); + QNetworkReply *rep = worker->post(request, multipart); + + m_reply = std::shared_ptr(rep); + connect(rep, &QNetworkReply::uploadProgress, this, &ImgurUpload::downloadProgress); + connect(rep, &QNetworkReply::finished, this, &ImgurUpload::downloadFinished); + connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), + SLOT(downloadError(QNetworkReply::NetworkError))); +} +void ImgurUpload::downloadError(QNetworkReply::NetworkError error) +{ + QLOG_DEBUG() << m_reply->errorString(); + m_status = Job_Failed; +} +void ImgurUpload::downloadFinished() +{ + if (m_status != Job_Failed) + { + QByteArray data = m_reply->readAll(); + m_reply.reset(); + QJsonParseError jsonError; + QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError); + if (jsonError.error != QJsonParseError::NoError) + { + QLOG_DEBUG() << jsonError.errorString(); + emit failed(m_index_within_job); + return; + } + auto object = doc.object(); + if (!object.value("success").toBool()) + { + QLOG_DEBUG() << doc.toJson(); + emit failed(m_index_within_job); + return; + } + m_shot->imgurId = object.value("data").toObject().value("id").toString(); + m_shot->url = object.value("data").toObject().value("link").toString(); + m_status = Job_Finished; + emit succeeded(m_index_within_job); + return; + } + else + { + QLOG_DEBUG() << m_reply->readAll(); + m_reply.reset(); + emit failed(m_index_within_job); + return; + } +} +void ImgurUpload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) +{ + m_total_progress = bytesTotal; + m_progress = bytesReceived; + emit progress(m_index_within_job, bytesReceived, bytesTotal); +} diff --git a/logic/net/ImgurUpload.h b/logic/net/ImgurUpload.h new file mode 100644 index 00000000..e5e79587 --- /dev/null +++ b/logic/net/ImgurUpload.h @@ -0,0 +1,30 @@ +#pragma once +#include "NetAction.h" + +class ScreenShot; +typedef std::shared_ptr ImgurUploadPtr; +class ImgurUpload : public NetAction +{ +public: + explicit ImgurUpload(ScreenShot *shot); + static ImgurUploadPtr make(ScreenShot *shot) + { + return ImgurUploadPtr(new ImgurUpload(shot)); + } + +protected +slots: + virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); + virtual void downloadError(QNetworkReply::NetworkError error); + virtual void downloadFinished(); + virtual void downloadReadyRead() + { + } + +public +slots: + virtual void start(); + +private: + ScreenShot *m_shot; +}; diff --git a/logic/net/ScreenshotUploader.cpp b/logic/net/ScreenshotUploader.cpp deleted file mode 100644 index 490c74b3..00000000 --- a/logic/net/ScreenshotUploader.cpp +++ /dev/null @@ -1,106 +0,0 @@ -#include "ScreenshotUploader.h" - -#include -#include -#include -#include -#include -#include -#include - -#include "logic/lists/ScreenshotList.h" -#include "URLConstants.h" -#include "MultiMC.h" -#include "logger/QsLog.h" - -ScreenShotUpload::ScreenShotUpload(ScreenShot *shot) : NetAction(), m_shot(shot) -{ - m_url = URLConstants::IMGUR_UPLOAD_URL; - m_status = Job_NotStarted; -} - -void ScreenShotUpload::start() -{ - m_status = Job_InProgress; - QNetworkRequest request(m_url); - request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)"); - request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3"); - request.setRawHeader("Accept", "application/json"); - - QFile f(m_shot->file); - if (!f.open(QFile::ReadOnly)) - { - emit failed(m_index_within_job); - return; - } - - QHttpMultiPart *multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType); - QHttpPart filePart; - filePart.setBody(f.readAll().toBase64()); - filePart.setHeader(QNetworkRequest::ContentTypeHeader, "image/png"); - filePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"image\""); - multipart->append(filePart); - QHttpPart typePart; - typePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"type\""); - typePart.setBody("base64"); - multipart->append(typePart); - QHttpPart namePart; - namePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"name\""); - namePart.setBody(m_shot->timestamp.toString(Qt::ISODate).toUtf8()); - multipart->append(namePart); - - auto worker = MMC->qnam(); - QNetworkReply *rep = worker->post(request, multipart); - - m_reply = std::shared_ptr(rep); - connect(rep, &QNetworkReply::uploadProgress, this, &ScreenShotUpload::downloadProgress); - connect(rep, &QNetworkReply::finished, this, &ScreenShotUpload::downloadFinished); - connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), - SLOT(downloadError(QNetworkReply::NetworkError))); -} -void ScreenShotUpload::downloadError(QNetworkReply::NetworkError error) -{ - QLOG_DEBUG() << m_reply->errorString(); - m_status = Job_Failed; -} -void ScreenShotUpload::downloadFinished() -{ - if (m_status != Job_Failed) - { - QByteArray data = m_reply->readAll(); - m_reply.reset(); - QJsonParseError jsonError; - QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError); - if (jsonError.error != QJsonParseError::NoError) - { - QLOG_DEBUG() << jsonError.errorString(); - emit failed(m_index_within_job); - return; - } - auto object = doc.object(); - if (!object.value("success").toBool()) - { - QLOG_DEBUG() << doc.toJson(); - emit failed(m_index_within_job); - return; - } - m_shot->imgurIndex = object.value("data").toObject().value("id").toString(); - m_shot->url = object.value("data").toObject().value("link").toString(); - m_status = Job_Finished; - emit succeeded(m_index_within_job); - return; - } - else - { - QLOG_DEBUG() << m_reply->readAll(); - m_reply.reset(); - emit failed(m_index_within_job); - return; - } -} -void ScreenShotUpload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) -{ - m_total_progress = bytesTotal; - m_progress = bytesReceived; - emit progress(m_index_within_job, bytesReceived, bytesTotal); -} diff --git a/logic/net/ScreenshotUploader.h b/logic/net/ScreenshotUploader.h deleted file mode 100644 index c1c9db6f..00000000 --- a/logic/net/ScreenshotUploader.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once -#include "NetAction.h" - -class ScreenShot; -typedef std::shared_ptr ScreenShotUploadPtr; -typedef std::shared_ptr ScreenShotGetPtr; -class ScreenShotUpload : public NetAction -{ -public: - explicit ScreenShotUpload(ScreenShot *shot); - static ScreenShotUploadPtr make(ScreenShot *shot) - { - return ScreenShotUploadPtr(new ScreenShotUpload(shot)); - } - -protected -slots: - virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); - virtual void downloadError(QNetworkReply::NetworkError error); - virtual void downloadFinished(); - virtual void downloadReadyRead() - { - } - -public -slots: - virtual void start(); - -private: - ScreenShot *m_shot; -}; diff --git a/logic/net/URLConstants.h b/logic/net/URLConstants.h index f2a943bf..55c8d527 100644 --- a/logic/net/URLConstants.h +++ b/logic/net/URLConstants.h @@ -33,5 +33,5 @@ const QString FORGE_LEGACY_URL("http://files.minecraftforge.net/minecraftforge/j const QString FORGE_GRADLE_URL("http://files.minecraftforge.net/maven/net/minecraftforge/forge/json"); const QString MOJANG_STATUS_URL("http://status.mojang.com/check"); const QString MOJANG_STATUS_NEWS_URL("http://status.mojang.com/news"); -const QString IMGUR_UPLOAD_URL("https://api.imgur.com/3/upload.json"); +const QString IMGUR_BASE_URL("https://api.imgur.com/3/"); } -- cgit From cb5cfe724208beb7d506868fc4e50d9f13e28a53 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Tue, 25 Feb 2014 00:51:24 +0100 Subject: Reorganize all the screenshot files --- logic/net/ImgurAlbumCreation.cpp | 90 --------------------------------- logic/net/ImgurAlbumCreation.h | 42 ---------------- logic/net/ImgurUpload.cpp | 106 --------------------------------------- logic/net/ImgurUpload.h | 30 ----------- 4 files changed, 268 deletions(-) delete mode 100644 logic/net/ImgurAlbumCreation.cpp delete mode 100644 logic/net/ImgurAlbumCreation.h delete mode 100644 logic/net/ImgurUpload.cpp delete mode 100644 logic/net/ImgurUpload.h (limited to 'logic/net') diff --git a/logic/net/ImgurAlbumCreation.cpp b/logic/net/ImgurAlbumCreation.cpp deleted file mode 100644 index 0d8c4dc1..00000000 --- a/logic/net/ImgurAlbumCreation.cpp +++ /dev/null @@ -1,90 +0,0 @@ -#include "ImgurAlbumCreation.h" - -#include -#include -#include -#include - -#include "logic/lists/ScreenshotList.h" -#include "URLConstants.h" -#include "MultiMC.h" -#include "logger/QsLog.h" - -ImgurAlbumCreation::ImgurAlbumCreation(QList screenshots) : NetAction(), m_screenshots(screenshots) -{ - m_url = URLConstants::IMGUR_BASE_URL + "album.json"; - m_status = Job_NotStarted; -} - -void ImgurAlbumCreation::start() -{ - m_status = Job_InProgress; - QNetworkRequest request(m_url); - request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)"); - request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); - request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3"); - request.setRawHeader("Accept", "application/json"); - - QStringList ids; - for (auto shot : m_screenshots) - { - ids.append(shot->imgurId); - } - - const QByteArray data = "ids=" + ids.join(',').toUtf8() + "&title=Minecraft%20Screenshots&privacy=hidden"; - - auto worker = MMC->qnam(); - QNetworkReply *rep = worker->post(request, data); - - m_reply = std::shared_ptr(rep); - connect(rep, &QNetworkReply::uploadProgress, this, &ImgurAlbumCreation::downloadProgress); - connect(rep, &QNetworkReply::finished, this, &ImgurAlbumCreation::downloadFinished); - connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), - SLOT(downloadError(QNetworkReply::NetworkError))); -} -void ImgurAlbumCreation::downloadError(QNetworkReply::NetworkError error) -{ - QLOG_DEBUG() << m_reply->errorString(); - m_status = Job_Failed; -} -void ImgurAlbumCreation::downloadFinished() -{ - if (m_status != Job_Failed) - { - QByteArray data = m_reply->readAll(); - m_reply.reset(); - QJsonParseError jsonError; - QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError); - if (jsonError.error != QJsonParseError::NoError) - { - QLOG_DEBUG() << jsonError.errorString(); - emit failed(m_index_within_job); - return; - } - auto object = doc.object(); - if (!object.value("success").toBool()) - { - QLOG_DEBUG() << doc.toJson(); - emit failed(m_index_within_job); - return; - } - m_deleteHash = object.value("data").toObject().value("deletehash").toString(); - m_id = object.value("data").toObject().value("id").toString(); - m_status = Job_Finished; - emit succeeded(m_index_within_job); - return; - } - else - { - QLOG_DEBUG() << m_reply->readAll(); - m_reply.reset(); - emit failed(m_index_within_job); - return; - } -} -void ImgurAlbumCreation::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) -{ - m_total_progress = bytesTotal; - m_progress = bytesReceived; - emit progress(m_index_within_job, bytesReceived, bytesTotal); -} diff --git a/logic/net/ImgurAlbumCreation.h b/logic/net/ImgurAlbumCreation.h deleted file mode 100644 index 7be255df..00000000 --- a/logic/net/ImgurAlbumCreation.h +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once -#include "NetAction.h" - -class ScreenShot; -typedef std::shared_ptr ImgurAlbumCreationPtr; -class ImgurAlbumCreation : public NetAction -{ -public: - explicit ImgurAlbumCreation(QList screenshots); - static ImgurAlbumCreationPtr make(QList screenshots) - { - return ImgurAlbumCreationPtr(new ImgurAlbumCreation(screenshots)); - } - - QString deleteHash() const - { - return m_deleteHash; - } - QString id() const - { - return m_id; - } - -protected -slots: - virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); - virtual void downloadError(QNetworkReply::NetworkError error); - virtual void downloadFinished(); - virtual void downloadReadyRead() - { - } - -public -slots: - virtual void start(); - -private: - QList m_screenshots; - - QString m_deleteHash; - QString m_id; -}; diff --git a/logic/net/ImgurUpload.cpp b/logic/net/ImgurUpload.cpp deleted file mode 100644 index 4992ee65..00000000 --- a/logic/net/ImgurUpload.cpp +++ /dev/null @@ -1,106 +0,0 @@ -#include "ImgurUpload.h" - -#include -#include -#include -#include -#include -#include -#include - -#include "logic/lists/ScreenshotList.h" -#include "URLConstants.h" -#include "MultiMC.h" -#include "logger/QsLog.h" - -ImgurUpload::ImgurUpload(ScreenShot *shot) : NetAction(), m_shot(shot) -{ - m_url = URLConstants::IMGUR_BASE_URL + "upload.json"; - m_status = Job_NotStarted; -} - -void ImgurUpload::start() -{ - m_status = Job_InProgress; - QNetworkRequest request(m_url); - request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)"); - request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3"); - request.setRawHeader("Accept", "application/json"); - - QFile f(m_shot->file); - if (!f.open(QFile::ReadOnly)) - { - emit failed(m_index_within_job); - return; - } - - QHttpMultiPart *multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType); - QHttpPart filePart; - filePart.setBody(f.readAll().toBase64()); - filePart.setHeader(QNetworkRequest::ContentTypeHeader, "image/png"); - filePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"image\""); - multipart->append(filePart); - QHttpPart typePart; - typePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"type\""); - typePart.setBody("base64"); - multipart->append(typePart); - QHttpPart namePart; - namePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"name\""); - namePart.setBody(m_shot->timestamp.toString(Qt::ISODate).toUtf8()); - multipart->append(namePart); - - auto worker = MMC->qnam(); - QNetworkReply *rep = worker->post(request, multipart); - - m_reply = std::shared_ptr(rep); - connect(rep, &QNetworkReply::uploadProgress, this, &ImgurUpload::downloadProgress); - connect(rep, &QNetworkReply::finished, this, &ImgurUpload::downloadFinished); - connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), - SLOT(downloadError(QNetworkReply::NetworkError))); -} -void ImgurUpload::downloadError(QNetworkReply::NetworkError error) -{ - QLOG_DEBUG() << m_reply->errorString(); - m_status = Job_Failed; -} -void ImgurUpload::downloadFinished() -{ - if (m_status != Job_Failed) - { - QByteArray data = m_reply->readAll(); - m_reply.reset(); - QJsonParseError jsonError; - QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError); - if (jsonError.error != QJsonParseError::NoError) - { - QLOG_DEBUG() << jsonError.errorString(); - emit failed(m_index_within_job); - return; - } - auto object = doc.object(); - if (!object.value("success").toBool()) - { - QLOG_DEBUG() << doc.toJson(); - emit failed(m_index_within_job); - return; - } - m_shot->imgurId = object.value("data").toObject().value("id").toString(); - m_shot->url = object.value("data").toObject().value("link").toString(); - m_status = Job_Finished; - emit succeeded(m_index_within_job); - return; - } - else - { - QLOG_DEBUG() << m_reply->readAll(); - m_reply.reset(); - emit failed(m_index_within_job); - return; - } -} -void ImgurUpload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) -{ - m_total_progress = bytesTotal; - m_progress = bytesReceived; - emit progress(m_index_within_job, bytesReceived, bytesTotal); -} diff --git a/logic/net/ImgurUpload.h b/logic/net/ImgurUpload.h deleted file mode 100644 index e5e79587..00000000 --- a/logic/net/ImgurUpload.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once -#include "NetAction.h" - -class ScreenShot; -typedef std::shared_ptr ImgurUploadPtr; -class ImgurUpload : public NetAction -{ -public: - explicit ImgurUpload(ScreenShot *shot); - static ImgurUploadPtr make(ScreenShot *shot) - { - return ImgurUploadPtr(new ImgurUpload(shot)); - } - -protected -slots: - virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); - virtual void downloadError(QNetworkReply::NetworkError error); - virtual void downloadFinished(); - virtual void downloadReadyRead() - { - } - -public -slots: - virtual void start(); - -private: - ScreenShot *m_shot; -}; -- cgit