summaryrefslogtreecommitdiffstats
path: root/api/logic/screenshots
diff options
context:
space:
mode:
Diffstat (limited to 'api/logic/screenshots')
-rw-r--r--api/logic/screenshots/ImgurAlbumCreation.cpp24
-rw-r--r--api/logic/screenshots/ImgurAlbumCreation.h2
-rw-r--r--api/logic/screenshots/ImgurUpload.cpp24
-rw-r--r--api/logic/screenshots/ImgurUpload.h2
4 files changed, 26 insertions, 26 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);
}
diff --git a/api/logic/screenshots/ImgurAlbumCreation.h b/api/logic/screenshots/ImgurAlbumCreation.h
index 469174e4..af5b9a2f 100644
--- a/api/logic/screenshots/ImgurAlbumCreation.h
+++ b/api/logic/screenshots/ImgurAlbumCreation.h
@@ -34,7 +34,7 @@ slots:
public
slots:
- virtual void start();
+ virtual void executeTask();
private:
QList<ScreenshotPtr> m_screenshots;
diff --git a/api/logic/screenshots/ImgurUpload.cpp b/api/logic/screenshots/ImgurUpload.cpp
index ef7fee6b..13c0c624 100644
--- a/api/logic/screenshots/ImgurUpload.cpp
+++ b/api/logic/screenshots/ImgurUpload.cpp
@@ -15,13 +15,13 @@
ImgurUpload::ImgurUpload(ScreenshotPtr shot) : NetAction(), m_shot(shot)
{
m_url = URLConstants::IMGUR_BASE_URL + "upload.json";
- m_status = Job_NotStarted;
+ m_status = Status::NotStarted;
}
-void ImgurUpload::start()
+void ImgurUpload::executeTask()
{
finished = false;
- m_status = Job_InProgress;
+ m_status = Status::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::start()
QFile f(m_shot->m_file.absoluteFilePath());
if (!f.open(QFile::ReadOnly))
{
- emit failed(m_index_within_job);
+ emit failed();
return;
}
@@ -65,10 +65,10 @@ void ImgurUpload::downloadError(QNetworkReply::NetworkError error)
qCritical() << "Double finished ImgurUpload!";
return;
}
- m_status = Job_Failed;
+ m_status = Status::Failed;
finished = true;
m_reply.reset();
- emit failed(m_index_within_job);
+ emit failed();
}
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(m_index_within_job);
+ emit failed();
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(m_index_within_job);
+ emit failed();
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 = Job_Finished;
+ m_status = Status::Finished;
finished = true;
- emit succeeded(m_index_within_job);
+ emit succeeded();
return;
}
void ImgurUpload::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);
}
diff --git a/api/logic/screenshots/ImgurUpload.h b/api/logic/screenshots/ImgurUpload.h
index 0a766b8f..4fcf5233 100644
--- a/api/logic/screenshots/ImgurUpload.h
+++ b/api/logic/screenshots/ImgurUpload.h
@@ -25,7 +25,7 @@ slots:
public
slots:
- virtual void start();
+ virtual void executeTask();
private:
ScreenshotPtr m_shot;