Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gui, lib/model: Prevent negative sync completion (fixes #4570) (#6248)

This commit is contained in:
Simon Frei 2020-01-03 14:07:57 +01:00 committed by Jakob Borg
parent 7a8e73d599
commit f56a5545d4
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gui/default/syncthing/core/syncthingController.js
View File

@ -849,10 +849,15 @@ angular.module('syncthing.core')
if (typeof $scope.model[folder] === 'undefined') {
return 100;
}
if ($scope.model[folder].globalBytes === 0) {
if ($scope.model[folder].needTotalItems === 0) {
return 100;
}
if ($scope.model[folder].needBytes == 0 && $scope.model[folder].needDeletes > 0) {
// We don't need any data, but we have deletes that we need
// to do. Drop down the completion percentage to indicate
// that we have stuff to do.
return 95;
}
var pct = 100 * $scope.model[folder].inSyncBytes / $scope.model[folder].globalBytes;
return Math.floor(pct);
};

5
lib/model/model.go
View File

@ -894,6 +894,11 @@ func (m *model) NeedSize(folder string) db.Counts {
})
}
result.Bytes -= m.progressEmitter.BytesCompleted(folder)
// This may happen if we are in progress of pulling files that were
// deleted globally after the pull started.
if result.Bytes < 0 {
result.Bytes = 0
}
l.Debugf("%v NeedSize(%q): %v", m, folder, result)
return result
}