1 files changed, 46 insertions, 16 deletions

diff --git a/Duplicati/Server/webroot/ngax/scripts/controllers/StateController.js b/Duplicati/Server/webroot/ngax/scripts/controllers/StateController.js
index c8c0980ff..19b6fb208 100644
--- a/Duplicati/Server/webroot/ngax/scripts/controllers/StateController.js
+++ b/Duplicati/Server/webroot/ngax/scripts/controllers/StateController.js
@@ -1,4 +1,4 @@
-backupApp.controller('StateController', function($scope, $timeout, ServerStatus, BackupList, AppService, AppUtils, gettextCatalog) {
+backupApp.controller('StateController', function($scope, $timeout, ServerStatus, BackupList, AppService, AppUtils, DialogService, gettextCatalog) {
     $scope.state = ServerStatus.watch($scope);
     $scope.backups = BackupList.watch($scope);
     $scope.ServerStatus = ServerStatus;
@@ -6,6 +6,7 @@ backupApp.controller('StateController', function($scope, $timeout, ServerStatus,
     $scope.activeTask = null;
 
     var updateActiveTask = function() {
+        $scope.activeTaskID = $scope.state.activeTask == null ? null : $scope.state.activeTask.Item1;
         $scope.activeBackup = $scope.state.activeTask == null ? null : BackupList.lookup[$scope.state.activeTask.Item2];
         $scope.nextTask = ($scope.state.schedulerQueueIds == null || $scope.state.schedulerQueueIds.length == 0) ? null : BackupList.lookup[$scope.state.schedulerQueueIds[0].Item2];
         $scope.nextScheduledTask = ($scope.state.proposedSchedule == null || $scope.state.proposedSchedule.length == 0) ? null : BackupList.lookup[$scope.state.proposedSchedule[0].Item1];
@@ -23,7 +24,7 @@ backupApp.controller('StateController', function($scope, $timeout, ServerStatus,
     function updateStateDisplay() {
         var text = gettextCatalog.getString('Running ...');
         var pg = -1;
-        if ($scope.state.lastPgEvent != null)
+        if ($scope.state.lastPgEvent != null && $scope.state.activeTask != null)
         {
             text = ServerStatus.progress_state_text[$scope.state.lastPgEvent.Phase || ''] || $scope.state.lastPgEvent.Phase;
 
@@ -34,15 +35,19 @@ backupApp.controller('StateController', function($scope, $timeout, ServerStatus,
                     pg = 0;
                 } else {
                     var filesleft = $scope.state.lastPgEvent.TotalFileCount - $scope.state.lastPgEvent.ProcessedFileCount;
-                    var sizeleft = $scope.state.lastPgEvent.TotalFileSize - $scope.state.lastPgEvent.ProcessedFileSize;
-                    pg = $scope.state.lastPgEvent.ProcessedFileSize / $scope.state.lastPgEvent.TotalFileSize;
+                    var sizeleft = $scope.state.lastPgEvent.TotalFileSize - $scope.state.lastPgEvent.ProcessedFileSize - $scope.state.lastPgEvent.CurrentFileoffset;
+                    pg = ($scope.state.lastPgEvent.ProcessedFileSize + $scope.state.lastPgEvent.CurrentFileoffset) / $scope.state.lastPgEvent.TotalFileSize;
 
                     if ($scope.state.lastPgEvent.ProcessedFileCount == 0)
                         pg = 0;
                     else if (pg >= 0.90)
                         pg = 0.90;
-
-                    text = gettextCatalog.getString('{{files}} files ({{size}}) to go', { files: filesleft, size: AppUtils.formatSizeString(sizeleft) });
+                    
+                    // If we have a speed append it
+                    var speed_txt = ($scope.state.lastPgEvent.BackendSpeed < 0) ? "" : " at "+AppUtils.formatSizeString($scope.state.lastPgEvent.BackendSpeed)+"/s";
+                    
+                    // 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});
                 }
             }
             else if ($scope.state.lastPgEvent.Phase == 'Backup_Finalize' || $scope.state.lastPgEvent.Phase == 'Backup_WaitForUpload')
@@ -71,20 +76,45 @@ backupApp.controller('StateController', function($scope, $timeout, ServerStatus,
     };
 
     $scope.$watch('state.lastPgEvent', updateStateDisplay, true);
+    $scope.$on('serverstatechanged', updateStateDisplay);
 
-    $scope.stopTask = function() {
-        var taskId = $scope.state.activeTask.Item1;
-        if ($scope.StopReqId == taskId) {
-            AppService.post('/task/' + taskId + '/abort');
-        } else {
-            AppService.post('/task/' + taskId + '/stop');
-        }
+    $scope.stopDialog = function() {
+        if ($scope.activeTaskID == null)
+            return;
+
+        var taskId = $scope.activeTaskID;
+        var txt = $scope.state.lastPgEvent == null ? '' : ($scope.state.lastPgEvent.Phase || '');
+
+        function handleClick(ix) {
+            if (ix == 0) 
+            {
+                AppService.post('/task/' + taskId + '/stop');
+                $scope.StopReqId = taskId;
+            }
+            else if (ix == 1)
+                AppService.post('/task/' + taskId + '/abort');
+        };
 
-        $scope.StopReqId = taskId;
+        if (txt.indexOf('Backup_') == 0)
+        {
+            DialogService.dialog(
+                gettextCatalog.getString('Stop running backup'),
+                gettextCatalog.getString('You can stop the backup immediately, or stop after the current file has been uploaded.'),
+                [gettextCatalog.getString('Stop after upload'), gettextCatalog.getString('Stop now'), gettextCatalog.getString('Cancel')],
+                handleClick
+            );
+        }
+        else
+        {
+            DialogService.dialog(
+                gettextCatalog.getString('Stop running task'),
+                gettextCatalog.getString('You can stop the task immediately, or allow the process to continue its current file and the stop.'),
+                [gettextCatalog.getString('Stop after the current file'), gettextCatalog.getString('Stop now'), gettextCatalog.getString('Cancel')],
+                handleClick
+            );
+        }
     };
 
     updateStateDisplay();
     updateActiveTask();
-
-
 });