diff options
| author | warwickmm <warwickmm@users.noreply.github.com> | 2022-05-15 23:56:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-15 23:56:28 +0300 |
| commit | 93a4e2cb6e60c85357cfad9f1288c9833919a054 (patch) | |
| tree | 367d7fb1de42681ce278b65b0e98fe2e2d9ed5d3 | |
| parent | de13cbcbd0f85492e8b8603def0ced7d7472a8e4 (diff) | |
| parent | dc5064184b48d726aceef7118e9e5c780ecfb659 (diff) | |
Merge pull request #4713 from flawiddsouza/show-progress-when-restoring-files
Show progress when restoring files.
| -rw-r--r-- | Duplicati/Server/webroot/ngax/scripts/controllers/StateController.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Duplicati/Server/webroot/ngax/scripts/controllers/StateController.js b/Duplicati/Server/webroot/ngax/scripts/controllers/StateController.js index 0f8c2654b..72c0588b4 100644 --- a/Duplicati/Server/webroot/ngax/scripts/controllers/StateController.js +++ b/Duplicati/Server/webroot/ngax/scripts/controllers/StateController.js @@ -29,7 +29,7 @@ backupApp.controller('StateController', function($scope, $timeout, ServerStatus, text = ServerStatus.progress_state_text[$scope.state.lastPgEvent.Phase || ''] || $scope.state.lastPgEvent.Phase; - if ($scope.state.lastPgEvent.Phase == 'Backup_ProcessingFiles') { + if ($scope.state.lastPgEvent.Phase == 'Backup_ProcessingFiles' || $scope.state.lastPgEvent.Phase == 'Restore_DownloadingRemoteFiles') { if ($scope.state.lastPgEvent.StillCounting) { text = gettextCatalog.getString('Counting ({{files}} files found, {{size}})', { files: $scope.state.lastPgEvent.TotalFileCount, size: AppUtils.formatSizeString($scope.state.lastPgEvent.TotalFileSize) }); pg = 0; @@ -47,8 +47,10 @@ backupApp.controller('StateController', function($scope, $timeout, ServerStatus, // If we have a speed append it var speed_txt = ($scope.state.lastPgEvent.BackendSpeed < 0) ? "" : " at "+AppUtils.formatSizeString($scope.state.lastPgEvent.BackendSpeed)+"/s"; + var restoring_text = $scope.state.lastPgEvent.Phase == 'Restore_DownloadingRemoteFiles' ? 'Restoring: ' : ''; + // Finally construct the whole text - text = gettextCatalog.getString('{{files}} files ({{size}}) to go {{speed_txt}}', { files: filesleft, size: AppUtils.formatSizeString(sizeleft), speed_txt: speed_txt}); + text = gettextCatalog.getString(restoring_text + '{{files}} files ({{size}}) to go {{speed_txt}}', { files: filesleft, size: AppUtils.formatSizeString(sizeleft), speed_txt: speed_txt}); } } else if ($scope.state.lastPgEvent.Phase == 'Backup_Finalize' || $scope.state.lastPgEvent.Phase == 'Backup_WaitForUpload') |