octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 10:58:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

gui, lib/scanner: Improve scan progress indication (ref #8331) (#9308)

Browse Source
This commit is contained in:
Simon Frei 2023-12-31 23:01:16 +01:00 committed by GitHub
parent 1ce2af1238
commit 2f3eacdb6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1039,18 +1039,29 @@ angular.module('syncthing.core')
// Do the same thing in case we only have zero byte files to sync.
return 95;
}
var pct = 100 * $scope.model[folder].inSyncBytes / $scope.model[folder].globalBytes;
return Math.floor(pct);
return progressIntegerPercentage($scope.model[folder].inSyncBytes, $scope.model[folder].globalBytes);
};
$scope.scanPercentage = function (folder) {
if (!$scope.scanProgress[folder]) {
return undefined;
}
var pct = 100 * $scope.scanProgress[folder].current / $scope.scanProgress[folder].total;
return Math.floor(pct);
return progressIntegerPercentage($scope.scanProgress[folder].current, $scope.scanProgress[folder].total);
};
function progressIntegerPercentage(current, total) {
// Even after whatever is being tracked (e.g. hashed or synced
// bytes) is completed, there's likely some more work to be done to
// fully finish the process (db updates, ...). Users apparently
// don't like seeing 100%, so give them 99% to indicate "about to be
// finished".
if (current === total) {
return 99;
}
var pct = 100 * current / total;
return Math.floor(pct);
}
$scope.scanRate = function (folder) {
if (!$scope.scanProgress[folder]) {
return 0;

28
lib/scanner/walk.go
View File

@ -160,6 +160,11 @@ func (w *walker) walk(ctx context.Context) chan ScanResult {
total += file.Size
}
if len(filesToHash) == 0 {
close(finishedChan)
return
}
realToHashChan := make(chan protocol.FileInfo)
done := make(chan struct{})
progress := newByteCounter()
@ -171,22 +176,27 @@ func (w *walker) walk(ctx context.Context) chan ScanResult {
go func() {
defer progress.Close()
emitProgressEvent := func() {
current := progress.Total()
rate := progress.Rate()
l.Debugf("%v: Walk %s %s current progress %d/%d at %.01f MiB/s (%d%%)", w, w.Folder, w.Subs, current, total, rate/1024/1024, current*100/total)
w.EventLogger.Log(events.FolderScanProgress, map[string]interface{}{
"folder": w.Folder,
"current": current,
"total": total,
"rate": rate, // bytes per second
})
}
for {
select {
case <-done:
emitProgressEvent()
l.Debugln(w, "Walk progress done", w.Folder, w.Subs, w.Matcher)
ticker.Stop()
return
case <-ticker.C:
current := progress.Total()
rate := progress.Rate()
l.Debugf("%v: Walk %s %s current progress %d/%d at %.01f MiB/s (%d%%)", w, w.Folder, w.Subs, current, total, rate/1024/1024, current*100/total)
w.EventLogger.Log(events.FolderScanProgress, map[string]interface{}{
"folder": w.Folder,
"current": current,
"total": total,
"rate": rate, // bytes per second
})
emitProgressEvent()
case <-ctx.Done():
ticker.Stop()
return