summaryrefslogtreecommitdiffstats
path: root/api/logic/screenshots/ImgurAlbumCreation.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-04-29 02:24:00 +0200
committerPetr Mrázek <peterix@gmail.com>2017-04-29 02:24:00 +0200
commite1465f4848d003cab3d3d1288c1a0f3b945083ee (patch)
tree6721fbaac70aa39cb0f0dd75b75e8e6f87d42743 /api/logic/screenshots/ImgurAlbumCreation.cpp
parent243f7e4fb4d58fa530404930566f83d1dc481588 (diff)
downloadMultiMC-e1465f4848d003cab3d3d1288c1a0f3b945083ee.tar
MultiMC-e1465f4848d003cab3d3d1288c1a0f3b945083ee.tar.gz
MultiMC-e1465f4848d003cab3d3d1288c1a0f3b945083ee.tar.lz
MultiMC-e1465f4848d003cab3d3d1288c1a0f3b945083ee.tar.xz
MultiMC-e1465f4848d003cab3d3d1288c1a0f3b945083ee.zip
NOISSUE refactor NetAction to be based on Task
Still missing some things, this is part 1.
Diffstat (limited to 'api/logic/screenshots/ImgurAlbumCreation.cpp')
-rw-r--r--api/logic/screenshots/ImgurAlbumCreation.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/api/logic/screenshots/ImgurAlbumCreation.cpp b/api/logic/screenshots/ImgurAlbumCreation.cpp
index a6964681..63179c6a 100644
--- a/api/logic/screenshots/ImgurAlbumCreation.cpp
+++ b/api/logic/screenshots/ImgurAlbumCreation.cpp
@@ -13,12 +13,12 @@
ImgurAlbumCreation::ImgurAlbumCreation(QList<ScreenshotPtr> screenshots) : NetAction(), m_screenshots(screenshots)
{
m_url = URLConstants::IMGUR_BASE_URL + "album.json";
- m_status = Job_NotStarted;
+ m_status = Status::NotStarted;
}
-void ImgurAlbumCreation::start()
+void ImgurAlbumCreation::executeTask()
{
- m_status = Job_InProgress;
+ m_status = Status::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::start()
void ImgurAlbumCreation::downloadError(QNetworkReply::NetworkError error)
{
qDebug() << m_reply->errorString();
- m_status = Job_Failed;
+ m_status = Status::Failed;
}
void ImgurAlbumCreation::downloadFinished()
{
- if (m_status != Job_Failed)
+ if (m_status != Status::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(m_index_within_job);
+ emit failed();
return;
}
auto object = doc.object();
if (!object.value("success").toBool())
{
qDebug() << doc.toJson();
- emit failed(m_index_within_job);
+ emit failed();
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);
+ m_status = Status::Finished;
+ emit succeeded();
return;
}
else
{
qDebug() << m_reply->readAll();
m_reply.reset();
- emit failed(m_index_within_job);
+ emit failed();
return;
}
}
void ImgurAlbumCreation::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
{
- m_total_progress = bytesTotal;
+ m_progressTotal = bytesTotal;
m_progress = bytesReceived;
- emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
+ emit progress(bytesReceived, bytesTotal);
}