From b8fdb2bbeed8071b0c5faadf5b494799c07f5160 Mon Sep 17 00:00:00 2001
From: hexxa <hexxa@outlook.com>
Date: Tue, 28 Sep 2021 21:12:50 +0800
Subject: [PATCH] fix(upload_mgr): show errors in uploading

---
 src/client/web/src/worker/upload_mgr.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/client/web/src/worker/upload_mgr.ts b/src/client/web/src/worker/upload_mgr.ts
index 6a2e02e..c40474d 100644
--- a/src/client/web/src/worker/upload_mgr.ts
+++ b/src/client/web/src/worker/upload_mgr.ts
@@ -25,7 +25,10 @@ export class UploadMgr {
   private intervalID: number;
   private worker: IWorker;
   private infos = OrderedMap<string, UploadEntry>();
-  private statusCb = (infos: Map<string, UploadEntry>, refresh: boolean): void => {};
+  private statusCb = (
+    infos: Map<string, UploadEntry>,
+    refresh: boolean
+  ): void => {};
 
   constructor(worker: IWorker) {
     this.worker = worker;
@@ -49,7 +52,6 @@ export class UploadMgr {
           info.state === UploadState.Ready ||
           info.state === UploadState.Created
         ) {
-
           this.infos = this.infos.set(info.filePath, {
             ...info,
             state: UploadState.Uploading,
@@ -88,7 +90,9 @@ export class UploadMgr {
     return this.cycle;
   };
 
-  setStatusCb = (cb: (infos: Map<string, UploadEntry>, refresh: boolean) => void) => {
+  setStatusCb = (
+    cb: (infos: Map<string, UploadEntry>, refresh: boolean) => void
+  ) => {
     this.statusCb = cb;
   };
 
@@ -144,12 +148,10 @@ export class UploadMgr {
   stop = (filePath: string) => {
     const entry = this.infos.get(filePath);
     if (entry != null) {
-
       this.infos = this.infos.set(filePath, {
         ...entry,
         state: UploadState.Stopped,
       });
-
     } else {
       alert(`failed to stop uploading ${filePath}: not found`);
     }
@@ -178,7 +180,7 @@ export class UploadMgr {
           this.infos = this.infos.set(errResp.filePath, {
             ...errEntry,
             state: UploadState.Error,
-            err: `${errEntry.err} / ${errResp.filePath}`,
+            err: errResp.err,
           });
         } else {
           // TODO: refine this
@@ -201,7 +203,8 @@ export class UploadMgr {
               uploaded: infoResp.uploaded,
               state:
                 // this avoids overwriting Stopped/Error state
-                (entry.state === UploadState.Stopped || entry.state === UploadState.Error)
+                entry.state === UploadState.Stopped ||
+                entry.state === UploadState.Error
                   ? UploadState.Stopped
                   : infoResp.state,
             });