Fix. Bulk upload. Accumulate sent bytes. Fix negative value in UI.

Signed-off-by: alex-z <[email protected]>
nextcloud · Nov 16, 2023 · 816dcee · 816dcee
1 parent d50a633
commit 816dcee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/libsync/bulkpropagatorjob.cpp b/src/libsync/bulkpropagatorjob.cpp
@@ -446,10 +446,11 @@ void BulkPropagatorJob::slotUploadProgress(SyncFileItemPtr item, qint64 sent, qi
     // resetting progress due to the sent being zero by ignoring it.
     // finishedSignal() is bound to be emitted soon anyway.
     // See https://bugreports.qt.io/browse/QTBUG-44782.
+    _sentTotal += sent;
     if (sent == 0 && total == 0) {
         return;
     }
-    propagator()->reportProgress(*item, sent - total);
+    propagator()->reportProgress(*item, _sentTotal);
 }
 
 void BulkPropagatorJob::slotJobDestroyed(QObject *job)

diff --git a/src/libsync/bulkpropagatorjob.h b/src/libsync/bulkpropagatorjob.h
@@ -17,6 +17,8 @@
 #include "owncloudpropagator.h"
 #include "abstractnetworkjob.h"
 
+#include <memory>
+
 #include <QLoggingCategory>
 #include <QVector>
 #include <QMap>
@@ -163,6 +165,8 @@ private slots:
 
     std::vector<BulkUploadItem> _filesToUpload;
 
+    std::atomic<qint64> _sentTotal = 0;
+
     SyncFileItem::Status _finalStatus = SyncFileItem::Status::NoStatus;
 };