diff --git a/src/main/utils/common.ts b/src/main/utils/common.ts index 3ecc9fd..2ac8cd9 100644 --- a/src/main/utils/common.ts +++ b/src/main/utils/common.ts @@ -52,28 +52,21 @@ export const showMessageBox = (options: any) => { }) } +const thresholds = [ + { limit: 1000, value: 500 }, + { limit: 1500, value: 1000 }, + { limit: 3000, value: 2000 }, + { limit: 5000, value: 3000 }, + { limit: 7000, value: 5000 }, + { limit: 10000, value: 8000 }, + { limit: 12000, value: 10000 }, + { limit: 20000, value: 15000 }, + { limit: 30000, value: 20000 } +] + export const calcDurationRange = (duration: number) => { - if (duration < 1000) { - return 500 - } else if (duration < 1500) { - return 1000 - } else if (duration < 3000) { - return 2000 - } else if (duration < 5000) { - return 3000 - } else if (duration < 7000) { - return 5000 - } else if (duration < 10000) { - return 8000 - } else if (duration < 12000) { - return 10000 - } else if (duration < 20000) { - return 15000 - } else if (duration < 30000) { - return 20000 - } - // max range - return 100000 + const foundThreshold = thresholds.find(({ limit }) => duration < limit) + return foundThreshold ? foundThreshold.value : 100000 } /** diff --git a/src/main/utils/getMacOSVersion.ts b/src/main/utils/getMacOSVersion.ts index b0d35cb..ef5776b 100644 --- a/src/main/utils/getMacOSVersion.ts +++ b/src/main/utils/getMacOSVersion.ts @@ -8,19 +8,11 @@ export const isMacOS = process.platform === 'darwin' let version: string | undefined -const clean = (version: string) => { - const { length } = version.split('.') - - if (length === 1) { - return `${version}.0.0` - } - - if (length === 2) { - return `${version}.0` - } - - return version -} +const clean = (version: string) => version.split('.').length === 1 + ? `${version}.0.0` + : version.split('.').length === 2 + ? `${version}.0` + : version const parseVersion = (plist: string) => { const matches = /ProductVersion<\/key>\s*([\d.]+)<\/string>/.exec(plist) @@ -32,9 +24,7 @@ const parseVersion = (plist: string) => { } export function macOSVersion (): string { - if (!isMacOS) { - return '' - } + if (!isMacOS) return '' if (!version) { const file = fs.readFileSync('/System/Library/CoreServices/SystemVersion.plist', 'utf8') diff --git a/src/renderer/apis/aliyun.ts b/src/renderer/apis/aliyun.ts index dba2acb..39617a7 100644 --- a/src/renderer/apis/aliyun.ts +++ b/src/renderer/apis/aliyun.ts @@ -1,7 +1,18 @@ import OSS from 'ali-oss' +interface IConfigMap { + fileName: string + config: { + accessKeyId: string + accessKeySecret: string + bucket: string + area: string + path?: string + } +} + export default class AliyunApi { - static async delete (configMap: IStringKeyMap): Promise { + static async delete (configMap: IConfigMap): Promise { const { fileName, config: { accessKeyId, accessKeySecret, bucket, area, path } } = configMap try { const client = new OSS({ @@ -19,6 +30,7 @@ export default class AliyunApi { const result = await client.delete(key) as any return result.res.status === 204 } catch (error) { + console.log(error) return false } } diff --git a/src/renderer/apis/awss3.ts b/src/renderer/apis/awss3.ts index d15d9b3..99968d7 100644 --- a/src/renderer/apis/awss3.ts +++ b/src/renderer/apis/awss3.ts @@ -40,6 +40,7 @@ export default class AwsS3Api { }).promise() return result.$response.httpResponse.statusCode === 204 } catch (error) { + console.log(error) return false } } diff --git a/src/renderer/apis/github.ts b/src/renderer/apis/github.ts index f98ff1a..b46c994 100644 --- a/src/renderer/apis/github.ts +++ b/src/renderer/apis/github.ts @@ -25,6 +25,7 @@ export default class GithubApi { }) return result.status === 200 } catch (error) { + console.log(error) return false } } diff --git a/src/renderer/apis/imgur.ts b/src/renderer/apis/imgur.ts index 25fa2a1..16218f5 100644 --- a/src/renderer/apis/imgur.ts +++ b/src/renderer/apis/imgur.ts @@ -26,6 +26,7 @@ export default class ImgurApi { }) return res.status === 200 } catch (error) { + console.log(error) return false } } diff --git a/src/renderer/apis/qiniu.ts b/src/renderer/apis/qiniu.ts index 5ad5980..c678bb6 100644 --- a/src/renderer/apis/qiniu.ts +++ b/src/renderer/apis/qiniu.ts @@ -27,6 +27,7 @@ export default class QiniuApi { }) as any return res && res.respInfo.statusCode === 200 } catch (error) { + console.log(error) return false } } diff --git a/src/renderer/apis/smms.ts b/src/renderer/apis/smms.ts index e324f3b..d154316 100644 --- a/src/renderer/apis/smms.ts +++ b/src/renderer/apis/smms.ts @@ -1,13 +1,16 @@ import axios from 'axios' export default class SmmsApi { + private static readonly baseUrl = 'https://smms.app/api/v2' + static async delete (configMap: IStringKeyMap): Promise { const { hash, config: { token } } = configMap if (!hash || !token) { return false - } else { + } + try { const res = await axios.get( - `https://smms.app/api/v2/delete/${hash}`, { + `${SmmsApi.baseUrl}/delete/${hash}`, { headers: { Authorization: token }, @@ -18,6 +21,9 @@ export default class SmmsApi { timeout: 30000 }) return res.status === 200 + } catch (error) { + console.log(error) + return false } } } diff --git a/src/renderer/apis/tcyun.ts b/src/renderer/apis/tcyun.ts index 7c6d120..ac99bdc 100644 --- a/src/renderer/apis/tcyun.ts +++ b/src/renderer/apis/tcyun.ts @@ -21,6 +21,7 @@ export default class TcyunApi { }) return result.statusCode === 204 } catch (error) { + console.log(error) return false } } diff --git a/src/renderer/apis/upyun.ts b/src/renderer/apis/upyun.ts index 5a1d070..a08d0ce 100644 --- a/src/renderer/apis/upyun.ts +++ b/src/renderer/apis/upyun.ts @@ -13,9 +13,9 @@ export default class UpyunApi { } else { key = `${path.replace(/^\//, '').replace(/\/$/, '')}/${fileName}` } - const result = await client.deleteFile(key) - return result + return await client.deleteFile(key) } catch (error) { + console.log(error) return false } } diff --git a/src/renderer/apis/webdav.ts b/src/renderer/apis/webdav.ts index 3da4c70..b87266e 100644 --- a/src/renderer/apis/webdav.ts +++ b/src/renderer/apis/webdav.ts @@ -22,6 +22,7 @@ export default class WebdavApi { await ctx.deleteFile(key) return true } catch (error) { + console.log(error) return false } }