✨ Feature(custom): optimize second uploader

src/core/Lifecycle.ts

@@ -44,7 +44,10 @@ export class Lifecycle extends EventEmitter {
     this.ctx = ctx
     this.ttfPath = path.join(ctx.baseDir, 'assets', 'simhei.ttf')
     ensureDirSync(path.join(ctx.baseDir, 'imgTemp'))
-    emptyDirSync(path.join(ctx.baseDir, 'piclistTemp'))
+    const enableSecondUploader = ctx.getConfig<Undefinable<boolean>>('settings.enableSecondUploader') || false
+    if (!enableSecondUploader) {
+      emptyDirSync(path.join(ctx.baseDir, 'piclistTemp'))
+    }
   }
 
   private async downloadTTF(): Promise<boolean> {
@@ -84,21 +87,30 @@ export class Lifecycle extends EventEmitter {
     }
   }
 
-  async start(input: any[]): Promise<IPicGo> {
+  async start(input: any[], skipProcess = false): Promise<IPicGo> {
     // ensure every upload process has an unique context
     const ctx = createContext(this.ctx)
     try {
       if (!Array.isArray(input)) throw new Error('Input must be an array.')
       ctx.input = input
+      ctx.output = [] as IImgInfo[]
       ctx.rawInputPath = [] as string[]
       ctx.rawInput = cloneDeep(input)
-      ctx.output = [] as IImgInfo[]
+      if (skipProcess) {
+        ctx.log.info('Skip process.')
+        ctx.output = input
+        await this.doUpload(ctx)
+        ctx.input = ctx.rawInput
+        await this.afterUpload(ctx)
+        return ctx
+      }
       // lifecycle main
       await this.preprocess(ctx)
       await this.beforeTransform(ctx)
       await this.doTransform(ctx)
       await this.buildInRename(ctx)
       await this.beforeUpload(ctx)
+      ctx.processedInput = cloneDeep(ctx.output)
       await this.doUpload(ctx)
       ctx.input = ctx.rawInput
       await this.afterUpload(ctx)

src/core/PicGo.ts

@@ -51,6 +51,7 @@ export class PicGo extends EventEmitter implements IPicGo {
   output: IImgInfo[]
   input: any[]
   rawInput: any[]
+  processedInput: any[]
   pluginHandler: PluginHandler
   /**
    * @deprecated will be removed in v1.5.0+
@@ -71,6 +72,7 @@ export class PicGo extends EventEmitter implements IPicGo {
     this.configPath = configPath
     this.input = []
     this.rawInput = []
+    this.processedInput = []
     this.output = []
     this.helper = {
       transformer: new LifecyclePlugins('transformer'),
@@ -237,4 +239,36 @@ export class PicGo extends EventEmitter implements IPicGo {
       return output
     }
   }
+
+  async uploadReturnCtx(input?: any[], skipProcess = false): Promise<IPicGo> {
+    if (this.configPath === '') {
+      this.log.error('No config file found, please check your config file path')
+      return this
+    }
+
+    if (input === undefined || input.length === 0) {
+      try {
+        const { imgPath, shouldKeepAfterUploading } = await getClipboardImage(this)
+        const cleanup = (): void => {
+          if (!shouldKeepAfterUploading) {
+            remove(imgPath).catch(e => {
+              this.log.error(e)
+            })
+          }
+        }
+        if (imgPath === 'no image') {
+          throw new Error('image not found in clipboard')
+        } else {
+          this.once(IBuildInEvent.FAILED, cleanup)
+          this.once(IBuildInEvent.FINISHED, cleanup)
+          return await this.lifecycle.start([imgPath], skipProcess)
+        }
+      } catch (e) {
+        this.emit(IBuildInEvent.FAILED, e)
+        throw e
+      }
+    } else {
+      return await this.lifecycle.start(input, skipProcess)
+    }
+  }
 }

src/types/index.ts

@@ -34,6 +34,10 @@ export interface IPicGo extends NodeJS.EventEmitter {
    * the origin input
    */
   rawInput: any[]
+  /**
+   * processed input path
+   */
+  processedInput: any[]
   /**
    * register\unregister\get picgo's plugin
    */
@@ -99,6 +103,10 @@ export interface IPicGo extends NodeJS.EventEmitter {
    * upload gogogo
    */
   upload: (input?: any[]) => Promise<IImgInfo[] | Error>
+  /**
+   * transform gogogo
+   */
+  uploadReturnCtx: (input?: any[]) => Promise<IPicGo>
 }
 
 /**

src/utils/createContext.ts

@@ -13,6 +13,7 @@ export const createContext = (ctx: IPicGo): IPicGo => {
     output: [],
     input: [],
     rawInput: [],
+    processedInput: [],
     pluginLoader: ctx.pluginLoader,
     pluginHandler: ctx.pluginHandler,
     Request: ctx.Request,
@@ -27,6 +28,7 @@ export const createContext = (ctx: IPicGo): IPicGo => {
     setConfig: ctx.setConfig.bind(ctx),
     unsetConfig: ctx.unsetConfig.bind(ctx),
     upload: ctx.upload.bind(ctx),
+    uploadReturnCtx: ctx.uploadReturnCtx.bind(ctx),
     addListener: ctx.addListener.bind(ctx),
     on: ctx.on.bind(ctx),
     once: ctx.once.bind(ctx),