CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE Revert all recent changes to NetAction and NetJob

Browse Source
This commit is contained in:
Petr Mrázek
2017-05-03 23:11:52 +02:00
parent 0efa714ba5
commit e76e6329cd
45 changed files with 356 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
api/logic/screenshots/ImgurAlbumCreation.cpp
View File

@ -13,12 +13,12 @@
ImgurAlbumCreation::ImgurAlbumCreation(QList<ScreenshotPtr> screenshots) : NetAction(), m_screenshots(screenshots)
{
m_url = URLConstants::IMGUR_BASE_URL + "album.json";
m_status = Status::NotStarted;
m_status = Job_NotStarted;
}
void ImgurAlbumCreation::executeTask()
void ImgurAlbumCreation::start()
{
m_status = Status::InProgress;
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");
@ -43,11 +43,11 @@ void ImgurAlbumCreation::executeTask()
void ImgurAlbumCreation::downloadError(QNetworkReply::NetworkError error)
{
qDebug() << m_reply->errorString();
m_status = Status::Failed;
m_status = Job_Failed;
}
void ImgurAlbumCreation::downloadFinished()
{
if (m_status != Status::Failed)
if (m_status != Job_Failed)
{
QByteArray data = m_reply->readAll();
m_reply.reset();
@ -56,33 +56,33 @@ void ImgurAlbumCreation::downloadFinished()
if (jsonError.error != QJsonParseError::NoError)
{
qDebug() << jsonError.errorString();
emit failed();
emit failed(m_index_within_job);
return;
}
auto object = doc.object();
if (!object.value("success").toBool())
{
qDebug() << doc.toJson();
emit failed();
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 = Status::Finished;
emit succeeded();
m_status = Job_Finished;
emit succeeded(m_index_within_job);
return;
}
else
{
qDebug() << m_reply->readAll();
m_reply.reset();
emit failed();
emit failed(m_index_within_job);
return;
}
}
void ImgurAlbumCreation::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
{
m_progressTotal = bytesTotal;
m_total_progress = bytesTotal;
m_progress = bytesReceived;
emit progress(bytesReceived, bytesTotal);
emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
}

4
api/logic/screenshots/ImgurAlbumCreation.h
View File

@ -4,7 +4,7 @@
#include "multimc_logic_export.h"
typedef shared_qobject_ptr<class ImgurAlbumCreation> ImgurAlbumCreationPtr;
typedef std::shared_ptr<class ImgurAlbumCreation> ImgurAlbumCreationPtr;
class MULTIMC_LOGIC_EXPORT ImgurAlbumCreation : public NetAction
{
public:
@ -34,7 +34,7 @@ slots:
public
slots:
virtual void executeTask();
virtual void start();
private:
QList<ScreenshotPtr> m_screenshots;

24
api/logic/screenshots/ImgurUpload.cpp
View File

@ -15,13 +15,13 @@
ImgurUpload::ImgurUpload(ScreenshotPtr shot) : NetAction(), m_shot(shot)
{
m_url = URLConstants::IMGUR_BASE_URL + "upload.json";
m_status = Status::NotStarted;
m_status = Job_NotStarted;
}
void ImgurUpload::executeTask()
void ImgurUpload::start()
{
finished = false;
m_status = Status::InProgress;
m_status = Job_InProgress;
QNetworkRequest request(m_url);
request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)");
request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3");
@ -30,7 +30,7 @@ void ImgurUpload::executeTask()
QFile f(m_shot->m_file.absoluteFilePath());
if (!f.open(QFile::ReadOnly))
{
emit failed();
emit failed(m_index_within_job);
return;
}
@ -65,10 +65,10 @@ void ImgurUpload::downloadError(QNetworkReply::NetworkError error)
qCritical() << "Double finished ImgurUpload!";
return;
}
m_status = Status::Failed;
m_status = Job_Failed;
finished = true;
m_reply.reset();
emit failed();
emit failed(m_index_within_job);
}
void ImgurUpload::downloadFinished()
{
@ -86,7 +86,7 @@ void ImgurUpload::downloadFinished()
qDebug() << "imgur server did not reply with JSON" << jsonError.errorString();
finished = true;
m_reply.reset();
emit failed();
emit failed(m_index_within_job);
return;
}
auto object = doc.object();
@ -95,19 +95,19 @@ void ImgurUpload::downloadFinished()
qDebug() << "Screenshot upload not successful:" << doc.toJson();
finished = true;
m_reply.reset();
emit failed();
emit failed(m_index_within_job);
return;
}
m_shot->m_imgurId = object.value("data").toObject().value("id").toString();
m_shot->m_url = object.value("data").toObject().value("link").toString();
m_status = Status::Finished;
m_status = Job_Finished;
finished = true;
emit succeeded();
emit succeeded(m_index_within_job);
return;
}
void ImgurUpload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
{
m_progressTotal = bytesTotal;
m_total_progress = bytesTotal;
m_progress = bytesReceived;
emit progress(bytesReceived, bytesTotal);
emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
}

5
api/logic/screenshots/ImgurUpload.h
View File

@ -1,11 +1,10 @@
#pragma once
#include "net/NetAction.h"
#include "Screenshot.h"
#include "QObjectPtr.h"
#include "multimc_logic_export.h"
typedef shared_qobject_ptr<class ImgurUpload> ImgurUploadPtr;
typedef std::shared_ptr<class ImgurUpload> ImgurUploadPtr;
class MULTIMC_LOGIC_EXPORT ImgurUpload : public NetAction
{
public:
@ -26,7 +25,7 @@ slots:
public
slots:
virtual void executeTask();
virtual void start();
private:
ScreenshotPtr m_shot;