diff options
| author | Kenneth Skovhede <kenneth@hexad.dk> | 2016-03-13 18:23:58 +0300 |
|---|---|---|
| committer | Kenneth Skovhede <kenneth@hexad.dk> | 2016-03-13 18:23:58 +0300 |
| commit | 51612aabf9f85599091c3170ffd3d9274f0cc5c1 (patch) | |
| tree | a10a0b14c340411d8238e9b13a4b0ad76ff2aa9b /Duplicati | |
| parent | a4e196f20d0ae2c14f2eba95eb41863ba28e0d54 (diff) | |
Added bug report progress information.
This fixes #1619
Diffstat (limited to 'Duplicati')
4 files changed, 7 insertions, 1 deletions
diff --git a/Duplicati/Library/Main/Operation/CreateBugReportHandler.cs b/Duplicati/Library/Main/Operation/CreateBugReportHandler.cs index 5cf4ea125..5cdc39d57 100644 --- a/Duplicati/Library/Main/Operation/CreateBugReportHandler.cs +++ b/Duplicati/Library/Main/Operation/CreateBugReportHandler.cs @@ -47,6 +47,9 @@ namespace Duplicati.Library.Main.Operation if (!System.IO.File.Exists(m_options.Dbpath))
throw new Exception(string.Format("Database file does not exist: {0}", m_options.Dbpath));
+ m_result.OperationProgressUpdater.UpdatePhase(OperationPhase.BugReport_Running);
+ m_result.OperationProgressUpdater.UpdateProgress(0);
+
m_result.AddMessage("Scrubbing filenames from database, this may take a while, please wait");
using(var tmp = new Library.Utility.TempFile())
diff --git a/Duplicati/Library/Main/OperationPhase.cs b/Duplicati/Library/Main/OperationPhase.cs index 179c86799..0170aff41 100644 --- a/Duplicati/Library/Main/OperationPhase.cs +++ b/Duplicati/Library/Main/OperationPhase.cs @@ -48,6 +48,8 @@ namespace Duplicati.Library.Main Recreate_Running,
Verify_Running,
+ BugReport_Running,
+
Error
}
}
diff --git a/Duplicati/Server/webroot/ngax/scripts/services/ServerStatus.js b/Duplicati/Server/webroot/ngax/scripts/services/ServerStatus.js index 094335659..6cd401826 100644 --- a/Duplicati/Server/webroot/ngax/scripts/services/ServerStatus.js +++ b/Duplicati/Server/webroot/ngax/scripts/services/ServerStatus.js @@ -54,6 +54,7 @@ backupApp.service('ServerStatus', function($rootScope, $timeout, AppService, App 'Recreate_Running': 'Recreating database ...', 'Repair_Running': 'Reparing ...', 'Verify_Running': 'Verifying ...', + 'BugReport_Running': 'Creating bug report ...', 'Error': 'Error!' }; diff --git a/Duplicati/Server/webroot/ngax/templates/home.html b/Duplicati/Server/webroot/ngax/templates/home.html index 5e85fa839..f104bc1de 100644 --- a/Duplicati/Server/webroot/ngax/templates/home.html +++ b/Duplicati/Server/webroot/ngax/templates/home.html @@ -8,7 +8,7 @@ </div> <div ng-hide="activeBackup == null"> - <strong>Running backup</strong> + <strong>Running task: </strong> {{activeBackup.Backup.Name}} <a class="button" ng-click="stopTask()">{{StopReqId == state.activeTask.Item1 ? 'Force stop' : 'Stop'}}</a> |