Merge pull request #4902 from nextcloud/bugfix/wrong-estimated-time-w…

…hen-syncing Fix wrong estimated time when doing sync.
nextcloud · Sep 7, 2022 · 66effe1 · 66effe1
2 parents 4dbbcbe + 7ba6815
commit 66effe1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
@@ -963,6 +963,10 @@ void FolderStatusModel::slotSetProgress(const ProgressInfo &progress)
 
     auto *pi = &_folders[folderIndex]._progress;
 
+    if (progress.status() == ProgressInfo::Starting) {
+        _isSyncRunningForAwhile = false;
+    }
+
     QVector<int> roles;
     roles << FolderStatusDelegate::SyncProgressItemString
           << FolderStatusDelegate::WarningCount
@@ -1086,13 +1090,23 @@ void FolderStatusModel::slotSetProgress(const ProgressInfo &progress)
         QString s1 = Utility::octetsToString(completedSize);
         QString s2 = Utility::octetsToString(totalSize);
 
-        if (progress.trustEta()) {
+        const auto estimatedEta = progress.totalProgress().estimatedEta;
+
+        if (progress.trustEta() && (estimatedEta > 0 || _isSyncRunningForAwhile)) {
+            _isSyncRunningForAwhile = true;
             //: Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"
-            overallSyncString = tr("%5 left, %1 of %2, file %3 of %4")
-                                    .arg(s1, s2)
-                                    .arg(currentFile)
-                                    .arg(totalFileCount)
-                                    .arg(Utility::durationToDescriptiveString1(progress.totalProgress().estimatedEta));
+            if (estimatedEta == 0) {
+                overallSyncString = tr("A few seconds left, %1 of %2, file %3 of %4")
+                                        .arg(s1, s2)
+                                        .arg(currentFile)
+                                        .arg(totalFileCount);
+            } else {
+                overallSyncString = tr("%5 left, %1 of %2, file %3 of %4")
+                                        .arg(s1, s2)
+                                        .arg(currentFile)
+                                        .arg(totalFileCount)
+                                        .arg(Utility::durationToDescriptiveString1(estimatedEta));
+            }
 
         } else {
             //: Example text: "12 MB of 345 MB, file 6 of 7"

diff --git a/src/gui/folderstatusmodel.h b/src/gui/folderstatusmodel.h
@@ -147,6 +147,8 @@ private slots:
     const AccountState *_accountState = nullptr;
     bool _dirty = false; // If the selective sync checkboxes were changed
 
+    bool _isSyncRunningForAwhile = false;
+
     /**
      * Keeps track of items that are fetching data from the server.
      *