BaseJob: afterStart(), beforeAbandon(), up/downloadProgress()

To support the upcoming DownloadFileJob

2 files changed, 20 insertions, 3 deletions

diff --git a/jobs/basejob.cpp b/jobs/basejob.cpp
index 4e0879b0..6f80bfd7 100644
--- a/jobs/basejob.cpp
+++ b/jobs/basejob.cpp
@@ -216,15 +216,21 @@ void BaseJob::Private::sendRequest()
     }
 }
 
-void BaseJob::beforeStart(const ConnectionData* connData)
-{
-}
+void BaseJob::beforeStart(const ConnectionData*)
+{ }
+
+void BaseJob::afterStart(const ConnectionData*, QNetworkReply*)
+{ }
+
+void BaseJob::beforeAbandon(QNetworkReply*)
+{ }
 
 void BaseJob::start(const ConnectionData* connData)
 {
     d->connection = connData;
     beforeStart(connData);
     sendRequest();
+    afterStart(connData, d->reply.data());
 }
 
 void BaseJob::sendRequest()
@@ -238,6 +244,10 @@ void BaseJob::sendRequest()
     connect( d->reply.data(), &QNetworkReply::finished, this, &BaseJob::gotReply );
     if (d->reply->isRunning())
     {
+        connect( d->reply.data(), &QNetworkReply::uploadProgress,
+                 this, &BaseJob::uploadProgress);
+        connect( d->reply.data(), &QNetworkReply::downloadProgress,
+                 this, &BaseJob::downloadProgress);
         d->timer.start(getCurrentTimeout());
         qCDebug(d->logCat) << this << "request has been sent";
         emit started();
@@ -430,6 +440,7 @@ void BaseJob::setStatus(int code, QString message)
 
 void BaseJob::abandon()
 {
+    beforeAbandon(d->reply.data());
     this->disconnect();
     if (d->reply)
         d->reply->disconnect(this);
diff --git a/jobs/basejob.h b/jobs/basejob.h
index 4567bca7..5e2734b1 100644
--- a/jobs/basejob.h
+++ b/jobs/basejob.h
@@ -192,6 +192,9 @@ namespace QMatrixClient
              */
             void failure(BaseJob*);
 
+            void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
+            void uploadProgress(qint64 bytesSent, qint64 bytesTotal);
+
         protected:
             using headers_t = QHash<QByteArray, QByteArray>;
 
@@ -210,6 +213,9 @@ namespace QMatrixClient
             void setExpectedContentTypes(const QByteArrayList& contentTypes);
 
             virtual void beforeStart(const ConnectionData* connData);
+            virtual void afterStart(const ConnectionData* connData,
+                                    QNetworkReply* reply);
+            virtual void beforeAbandon(QNetworkReply*);
 
             /**
              * Used by gotReply() to check the received reply for general