diff --git a/src/main/utils/updateChecker.ts b/src/main/utils/updateChecker.ts index 2623c9e..3aa834f 100644 --- a/src/main/utils/updateChecker.ts +++ b/src/main/utils/updateChecker.ts @@ -1,7 +1,7 @@ import db from '~/main/apis/core/datastore' import { autoUpdater } from 'electron-updater' -const checkVersion = async () => { +const updateChecker = async () => { let showTip = db.get('settings.showUpdateTip') if (showTip === undefined) { db.set('settings.showUpdateTip', true) @@ -10,12 +10,8 @@ const checkVersion = async () => { if (showTip) { try { await autoUpdater.checkForUpdatesAndNotify() - } catch (err) { - return false - } - } else { - return false + } catch (err) {} } } -export default checkVersion +export default updateChecker diff --git a/src/renderer/manage/pages/bucketPage.vue b/src/renderer/manage/pages/bucketPage.vue index d691140..089389f 100644 --- a/src/renderer/manage/pages/bucketPage.vue +++ b/src/renderer/manage/pages/bucketPage.vue @@ -2736,32 +2736,20 @@ function handleBatchCopyInfo () { } async function handleBatchCopyLink (type: string) { - if (selectedItems.length === 0) { + if (!selectedItems.length) { ElMessage.warning($T('MANAGE_BUCKET_BATCH_COPY_URL_ERROR_MSG')) return } const result = [] as string[] - for (let i = 0; i < selectedItems.length; i++) { - const item = selectedItems[i] + for (const item of selectedItems) { if (!item.isDir) { - if (type !== 'preSignedUrl') { - result.push(await formatLink(item.url, item.fileName, type, manageStore.config.settings.customPasteFormat)) - } else { - getPreSignedUrl(item).then(async (url: string) => { - result.push(await formatLink(url, item.fileName, type, manageStore.config.settings.customPasteFormat)) - }).then(() => { - if (result.length === selectedItems.length) { - clipboard.writeText(result.join('\n')) - ElMessage.success(`${$T('MANAGE_BUCKET_BATCH_COPY_URL_MSG_A')} ${result.length} ${$T('MANAGE_BUCKET_BATCH_COPY_URL_MSG_B')}`) - } - }) - } + const preSignedUrl = type === 'preSignedUrl' ? await getPreSignedUrl(item) : null + const url = await formatLink(preSignedUrl || item.url, item.fileName, type, manageStore.config.settings.customPasteFormat) + result.push(url) } } - if (type !== 'preSignedUrl') { - clipboard.writeText(result.join('\n')) - ElMessage.success(`${$T('MANAGE_BUCKET_BATCH_COPY_URL_MSG_A')} ${result.length} ${$T('MANAGE_BUCKET_BATCH_COPY_URL_MSG_B')}`) - } + clipboard.writeText(result.join('\n')) + ElMessage.success(`${$T('MANAGE_BUCKET_BATCH_COPY_URL_MSG_A')} ${result.length} ${$T('MANAGE_BUCKET_BATCH_COPY_URL_MSG_B')}`) } function cancelLoading () {