mirror of
https://github.com/Kuingsmile/PicList.git
synced 2026-05-07 06:22:46 +08:00
🐛 Fix(custom): add fallback for webcontent
This commit is contained in:
@@ -16,11 +16,16 @@ import { runScriptInStage } from '~/utils/runScript'
|
|||||||
const handleClipboardUploadingReturnCtx = async (img?: IUploadOption): Promise<IuploadReturnCtxResult> => {
|
const handleClipboardUploadingReturnCtx = async (img?: IUploadOption): Promise<IuploadReturnCtxResult> => {
|
||||||
const useBuiltinClipboardConfig = picgo.getConfig<boolean | undefined>(configPaths.settings.useBuiltinClipboard)
|
const useBuiltinClipboardConfig = picgo.getConfig<boolean | undefined>(configPaths.settings.useBuiltinClipboard)
|
||||||
const useBuiltinClipboard = useBuiltinClipboardConfig === undefined ? true : !!useBuiltinClipboardConfig
|
const useBuiltinClipboard = useBuiltinClipboardConfig === undefined ? true : !!useBuiltinClipboardConfig
|
||||||
const win = windowManager.getAvailableWindow()
|
let webContents: WebContents | undefined
|
||||||
if (useBuiltinClipboard) {
|
try {
|
||||||
return await uploader.setWebContents(win?.webContents).uploadWithBuildInClipboardReturnCtx(img)
|
webContents = windowManager.getAvailableWindow()?.webContents
|
||||||
|
} catch (_e) {
|
||||||
|
picgo.log.warn('No available window to show upload progress, fallback to upload without progress indication.')
|
||||||
}
|
}
|
||||||
return await uploader.setWebContents(win?.webContents).uploadReturnCtx(img)
|
if (useBuiltinClipboard) {
|
||||||
|
return await uploader.setWebContents(webContents).uploadWithBuildInClipboardReturnCtx(img)
|
||||||
|
}
|
||||||
|
return await uploader.setWebContents(webContents).uploadReturnCtx(img)
|
||||||
}
|
}
|
||||||
|
|
||||||
export const uploadClipboardFiles = async (): Promise<IStringKeyMap> => {
|
export const uploadClipboardFiles = async (): Promise<IStringKeyMap> => {
|
||||||
|
|||||||
Reference in New Issue
Block a user