+
+
{{showBackupFileName(backup)}}
diff --git a/desktop-app/src/app/process-bucket.service.ts b/desktop-app/src/app/process-bucket.service.ts
index f570694..1fc483c 100644
--- a/desktop-app/src/app/process-bucket.service.ts
+++ b/desktop-app/src/app/process-bucket.service.ts
@@ -20,6 +20,7 @@ export interface ProcessTask {
})
export class ProcessBucketService {
tasks: ProcessTask[];
+ currentTask: ProcessTask;
is_running: boolean;
left_length: number;
failed_length: number;
@@ -84,12 +85,14 @@ export class ProcessBucketService {
if (objects.length) {
this.is_running = true;
let task = objects[0];
+ this.currentTask = task;
task.running = true;
await task
.resolve(task)
.then(() => {
task.running = false;
task.succeeded = true;
+ this.currentTask = null;
if (!task.cancelled) {
return timeout.then(() => this.processBucket());
}
@@ -99,6 +102,7 @@ export class ProcessBucketService {
task.status =
(task.app_name ? task.app_name + ': ' : '') + (e.message ? e.message : e.code ? e.code : e.toString());
task.failed = true;
+ this.currentTask = null;
this.statusService.showStatus(task.status, true);
if (!task.cancelled) {
return timeout.then(() => this.processBucket());
@@ -151,6 +155,9 @@ export class ProcessBucketService {
this.tasks = this.tasks.filter(t => !t.failed);
}
clearAll() {
+ if (this.currentTask) {
+ this.skipCurrent(this.currentTask);
+ }
this.tasks = [];
}
}
diff --git a/package.json b/package.json
index 994bdb2..cae6504 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
"main": "build-electron/boot.js",
"scripts": {
"concurrently": "concurrently",
- "start": "concurrently \"yarn electron-build && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev electron .\" \"cd desktop-app && ng serve --port 4205\"",
+ "start": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev electron .\" \"cd desktop-app && ng serve --port 4205\"",
"postinstall": "electron-builder install-app-deps && cd desktop-app && yarn install",
"dist": "yarn electron-build && yarn platform-tools && yarn app-build && electron-builder",
"angular": "cd desktop-app && ng serve --port 4205",