🐛 Fix(error): throw error when transform failed (#96)

PicGo · Aug 21, 2021 · 57fce75 · 57fce75
1 parent d2b73c1
commit 57fce75
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/src/core/Lifecycle.ts b/src/core/Lifecycle.ts
@@ -31,7 +31,7 @@ class Lifecycle extends EventEmitter {
       await this.afterUpload(ctx)
       return ctx
     } catch (e) {
-      ctx.log.warn('failed')
+      ctx.log.warn(IBuildInEvent.FAILED)
       ctx.emit(IBuildInEvent.UPLOAD_PROGRESS, -1)
       ctx.emit(IBuildInEvent.FAILED, e)
       ctx.log.error(e)

diff --git a/src/core/PicGo.ts b/src/core/PicGo.ts
@@ -186,7 +186,7 @@ class PicGo extends EventEmitter implements IPicGo {
         if (imgPath === 'no image') {
           throw new Error('image not found in clipboard')
         } else {
-          this.once('failed', () => {
+          this.once(IBuildInEvent.FAILED, () => {
             if (!isExistFile) {
               // 删除 picgo 生成的图片文件，例如 `~/.picgo/20200621205720.png`
               fs.remove(imgPath).catch((e) => { this.log.error(e) })

diff --git a/src/plugins/transformer/path.ts b/src/plugins/transformer/path.ts
@@ -16,20 +16,16 @@ const handle = async (ctx: IPicGo): Promise<IPicGo> => {
       info = await getFSFile(item)
     }
     if (info.success && info.buffer) {
-      try {
-        const imgSize = getImgSize(ctx, info.buffer, item)
-        results[index] = {
-          buffer: info.buffer,
-          fileName: info.fileName,
-          width: imgSize.width,
-          height: imgSize.height,
-          extname: info.extname
-        }
-      } catch (e) {
-        ctx.log.error(e)
+      const imgSize = getImgSize(ctx, info.buffer, item)
+      results[index] = {
+        buffer: info.buffer,
+        fileName: info.fileName,
+        width: imgSize.width,
+        height: imgSize.height,
+        extname: info.extname
       }
     } else {
-      ctx.log.error(info.reason)
+      throw new Error(info.reason)
     }
   }))
   // remove empty item