✨ Feature(custom): add log for cloud delete

src/main/apis/delete/alist.ts

@@ -15,10 +15,8 @@ interface IConfigMap {
 }
 
 export default class AlistApi {
-  static async delete(configMap: IConfigMap): Promise<boolean> {
+  static async delete({ fileName, config: { version, url, uploadPath, token } }: IConfigMap): Promise<boolean> {
-    const { fileName, config } = configMap
     try {
-      const { version, url, uploadPath, token } = config
       if (String(version) === '2') {
         deleteLog(fileName, 'Alist', false, 'Alist version 2 is not supported, deletion is skipped')
         return true
@@ -35,12 +33,9 @@ export default class AlistApi {
           names: [path.basename(fileName)]
         }
       })
-      if (result.data.code === 200) {
+      const ok = result.data.code === 200
-        deleteLog(fileName, 'Alist')
+      deleteLog(fileName, 'Alist', ok)
-        return true
+      return ok
-      }
-      deleteLog(fileName, 'Alist', false)
-      return false
     } catch (error: any) {
       deleteFailedLog(fileName, 'Alist', error)
       return false

src/main/apis/delete/alistplist.ts

@@ -50,12 +50,9 @@ export default class AListplistApi {
           names: [path.basename(fileName)]
         }
       })
-      if (result.data.code === 200) {
+      const ok = result.data.code === 200
-        deleteLog(fileName, 'Alist')
+      deleteLog(fileName, 'Alist', ok)
-        return true
+      return ok
-      }
-      deleteLog(fileName, 'Alist', false)
-      return false
     } catch (error: any) {
       deleteFailedLog(fileName, 'Alist', error)
       return false

src/main/apis/delete/aliyun.ts

@@ -19,12 +19,9 @@ export default class AliyunApi {
       const client = new OSS({ ...config, region: config.area })
       const key = AliyunApi.#getKey(fileName, config.path)
       const result = await client.delete(key)
-      if (result.res.status === 204) {
+      const ok = result.res.status === 204
-        deleteLog(fileName, 'Aliyun')
+      deleteLog(fileName, 'Aliyun', ok)
-        return true
+      return ok
-      }
-      deleteLog(fileName, 'Aliyun', false)
-      return false
     } catch (error: any) {
       deleteFailedLog(fileName, 'Aliyun', error)
       return false

src/main/apis/delete/github.ts

@@ -39,12 +39,9 @@ export default class GithubApi {
         sha: hash,
         branch
       })
-      if (status === 200) {
+      const ok = status === 200
-        deleteLog(fileName, 'GitHub')
+      deleteLog(fileName, 'GitHub', ok)
-        return true
+      return ok
-      }
-      deleteLog(fileName, 'GitHub', false)
-      return false
     } catch (error: any) {
       deleteFailedLog(fileName, 'GitHub', error)
       return false

src/main/apis/delete/imgur.ts

@@ -30,12 +30,9 @@ export default class ImgurApi {
         headers: { Authorization },
         timeout: 30000
       })
-      if (response.status === 200) {
+      const ok = response.status === 200
-        deleteLog(hash, 'Imgur')
+      deleteLog(hash, 'Imgur', ok)
-        return true
+      return ok
-      }
-      deleteLog(hash, 'Imgur', false)
-      return false
     } catch (error: any) {
       deleteFailedLog(hash, 'Imgur', error)
       return false

src/main/apis/delete/lskyplist.ts

@@ -33,12 +33,9 @@ export default class LskyplistApi {
         timeout: 30000,
         httpsAgent: requestAgent
       })
-      if (response.status === 200 && response.data.status === true) {
+      const ok = response.status === 200 && response.data.status === true
-        deleteLog(hash, 'Lskyplist')
+      deleteLog(hash, 'Lskyplist', ok)
-        return true
+      return ok
-      }
-      deleteLog(hash, 'Lskyplist', false)
-      return false
     } catch (error: any) {
       deleteFailedLog(hash, 'Lskyplist', error)
       return false

src/main/apis/delete/piclist.ts

@@ -20,12 +20,9 @@ export default class PiclistApi {
       const response: AxiosResponse = await axios.post(url, {
         list: [fullResult]
       })
-      if (response.status === 200 && response.data?.success) {
+      const ok = response.status === 200 && response.data?.success
-        deleteLog(fullResult, 'Piclist')
+      deleteLog(fullResult, 'Piclist', ok)
-        return true
+      return ok
-      }
-      deleteLog(fullResult, 'Piclist', false)
-      return false
     } catch (error: any) {
       deleteFailedLog(fullResult, 'Piclist', error)
       return false

src/main/apis/delete/qiniu.ts

@@ -31,12 +31,9 @@ export default class QiniuApi {
           }
         })
       })) as any
-      if (res?.respInfo?.statusCode === 200) {
+      const ok = res?.respInfo?.statusCode === 200
-        deleteLog(fileName, 'Qiniu')
+      deleteLog(fileName, 'Qiniu', ok)
-        return true
+      return ok
-      }
-      deleteLog(fileName, 'Qiniu', false)
-      return false
     } catch (error: any) {
       deleteFailedLog(fileName, 'Qiniu', error)
       return false

src/main/apis/delete/smms.ts

@@ -31,12 +31,9 @@ export default class SmmsApi {
         },
         timeout: 30000
       })
-      if (response.status === 200) {
+      const ok = response.status === 200
-        deleteLog(hash, 'Smms')
+      deleteLog(hash, 'Smms', ok)
-        return true
+      return ok
-      }
-      deleteLog(hash, 'Smms', false)
-      return false
     } catch (error: any) {
       deleteFailedLog(hash, 'Smms', error)
       return false

src/main/apis/delete/tcyun.ts

@@ -32,12 +32,9 @@ export default class TcyunApi {
         Region: area,
         Key: key
       })
-      if (result.statusCode === 204) {
+      const ok = result.statusCode === 204
-        deleteLog(fileName, 'Tcyun')
+      deleteLog(fileName, 'Tcyun', ok)
-        return true
+      return ok
-      }
-      deleteLog(fileName, 'Tcyun', false)
-      return false
     } catch (error: any) {
       deleteFailedLog(fileName, 'Tcyun', error)
       return false

src/main/apis/delete/upyun.ts

@@ -24,12 +24,8 @@ export default class UpyunApi {
         key = `${path.replace(/^\/+|\/+$/, '')}/${fileName}`
       }
       const result = await client.deleteFile(key)
-      if (result) {
+      deleteLog(fileName, 'Upyun', !!result)
-        deleteLog(fileName, 'Upyun')
+      return !!result
-        return true
-      }
-      deleteLog(fileName, 'Upyun', false)
-      return false
     } catch (error: any) {
       deleteFailedLog(fileName, 'Upyun', error)
       return false

src/main/utils/deleteFunc.ts

@@ -89,7 +89,6 @@ async function getDogeToken(accessKey: string, secretKey: string): Promise<IObj
 }
 
 export async function removeFileFromS3InMain(configMap: IStringKeyMap, dogeMode: boolean = false) {
-  try {
   const {
     url: rawUrl,
     type,
@@ -199,14 +198,9 @@ export async function removeFileFromS3InMain(configMap: IStringKeyMap, dogeMode:
     result = await client.send(command)
   }
   return result.$metadata.httpStatusCode === 204
-  } catch (err: any) {
-    logger.error(err)
-    return false
-  }
 }
 
 export async function removeFileFromDogeInMain(configMap: IStringKeyMap) {
-  try {
   const {
     config: { bucketName, AccessKey, SecretKey }
   } = configMap
@@ -223,10 +217,6 @@ export async function removeFileFromDogeInMain(configMap: IStringKeyMap) {
     bucketName: bucket?.s3Bucket
   }
   return await removeFileFromS3InMain(newConfigMap, true)
-  } catch (err: any) {
-    logger.error(err)
-    return false
-  }
 }
 
 function createHuaweiAuthorization(
@@ -250,7 +240,6 @@ export async function removeFileFromHuaweiInMain(configMap: IStringKeyMap) {
   path = path === '/' ? '' : path
   const date = new Date().toUTCString()
   const authorization = createHuaweiAuthorization(bucketName, path, fileName, accessKeyId, accessKeySecret, date)
-  try {
   const res = await axios.request({
     url: `https://${bucketName}.${endpoint}${encodeURI(path)}/${encodeURIComponent(fileName)}`,
     method: 'DELETE',
@@ -262,14 +251,9 @@ export async function removeFileFromHuaweiInMain(configMap: IStringKeyMap) {
     }
   })
   return res.status === 204
-  } catch (error: any) {
-    logger.error(error)
-    return false
-  }
 }
 
 export async function removeFileFromSFTPInMain(config: ISftpPlistConfig, fileName: string) {
-  try {
   const client = SSHClient.instance
   await client.connect(config)
   const uploadPath = `/${config.uploadPath || ''}/`.replace(/\/+/g, '/')
@@ -277,8 +261,4 @@ export async function removeFileFromSFTPInMain(config: ISftpPlistConfig, fileNam
   const deleteResult = await client.deleteFileSFTP(config, remote)
   client.close()
   return deleteResult
-  } catch (err: any) {
-    logger.error(err)
-    return false
-  }
 }

src/main/utils/deleteLog.ts

@@ -1,8 +1,10 @@
+import logger from '@core/picgo/logger'
+
 export const deleteLog = (fileName?: string, type?: string, isSuccess = true, msg?: string) => {
-  console.log(`Delete ${fileName} on ${type} ${isSuccess ? 'success' : 'failed'}, message: ${msg || ''}`)
+  logger.info(`Delete ${fileName} on ${type} ${isSuccess ? 'successfully' : 'failed'} ${msg ? 'msg: ' + msg : ''}`)
 }
 
 export const deleteFailedLog = (fileName: string, type: string, error: any) => {
   deleteLog(fileName, type, false)
-  console.error(error)
+  logger.error(error)
 }