From 8d733a23d1209b7f0f7fbf87b50c98b41571d5cc Mon Sep 17 00:00:00 2001 From: LiHS Date: Fri, 5 Aug 2022 16:21:49 +0800 Subject: [PATCH 1/2] bump kodo-s3-adapter-sdk to v0.2.34 and fix resume upload status --- package.json | 4 ++-- src/common/models/job/download-job.ts | 1 - src/common/models/job/upload-job.ts | 1 - yarn.lock | 8 ++++---- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 3f6b1a92..affb9d93 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kodo-browser", - "version": "1.0.19-alpha3", + "version": "1.0.19-alpha5", "license": "Apache-2.0", "author": { "name": "Rong Zhou", @@ -106,7 +106,7 @@ "jquery.qrcode": "^1.0.3", "js-base64": "^3.4.5", "js-md5": "^0.7.3", - "kodo-s3-adapter-sdk": "0.2.32", + "kodo-s3-adapter-sdk": "0.2.34", "lodash": "^4.17.21", "mime": "^2.3.1", "moment": "^2.22.2", diff --git a/src/common/models/job/download-job.ts b/src/common/models/job/download-job.ts index 4b94ef5f..0b04d675 100644 --- a/src/common/models/job/download-job.ts +++ b/src/common/models/job/download-job.ts @@ -240,7 +240,6 @@ export default class DownloadJob extends TransferJob { }, ).catch(err => { if (err === Downloader.userCanceledError) { - this._status = Status.Stopped; return; } this._status = Status.Failed; diff --git a/src/common/models/job/upload-job.ts b/src/common/models/job/upload-job.ts index e27f9566..1930a5af 100644 --- a/src/common/models/job/upload-job.ts +++ b/src/common/models/job/upload-job.ts @@ -226,7 +226,6 @@ export default class UploadJob extends TransferJob { }, ).catch(err => { if (err === Uploader.userCanceledError) { - this._status = Status.Stopped; return; } this._status = Status.Failed; diff --git a/yarn.lock b/yarn.lock index d6f3867a..9af3406d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6919,10 +6919,10 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -kodo-s3-adapter-sdk@0.2.32: - version "0.2.32" - resolved "https://registry.yarnpkg.com/kodo-s3-adapter-sdk/-/kodo-s3-adapter-sdk-0.2.32.tgz#80932d034a6626d12708026fa426218e2e173bf3" - integrity sha512-5A72s6kbw3LRkkS45so9K1jMjuE+SHo5+mRfw9sFqvuumW1x99Kp6/nSRdQoLUPBV+RpnO/J6LDGDCCHz3IodA== +kodo-s3-adapter-sdk@0.2.34: + version "0.2.34" + resolved "https://registry.yarnpkg.com/kodo-s3-adapter-sdk/-/kodo-s3-adapter-sdk-0.2.34.tgz#6c49072bd86e1790a619d7b81700d6993c8076b2" + integrity sha512-OpjDTY9kRAEbOqoBSJezDD6Ka6GVoOsAL/9RAMxeH8wriiXh4gED08YgTOJWGzzXua7J1kUest//WjqJmT6iTg== dependencies: async-lock "^1.2.4" aws-sdk "^2.800.0" From 9017ba3a6e90bb30d3aa36dea227138d65cc3710 Mon Sep 17 00:00:00 2001 From: LiHS Date: Tue, 16 Aug 2022 15:12:28 +0800 Subject: [PATCH 2/2] bump version to v1.0.19 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index affb9d93..39d333b3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kodo-browser", - "version": "1.0.19-alpha5", + "version": "1.0.19", "license": "Apache-2.0", "author": { "name": "Rong Zhou",