✨ Feature(custom): refactor all main ipc event

2026-07-02 21:22:00 +08:00 · 2024-06-12 23:38:17 +08:00
parent 106290f868
commit 5ddc182bd1
91 changed files with 1924 additions and 1806 deletions
--- a/src/main/apis/app/system/index.ts
+++ b/src/main/apis/app/system/index.ts
@@ -3,9 +3,10 @@ import {
  clipboard,
  dialog,
  Menu,
+  MenuItem,
+  MenuItemConstructorOptions,
  nativeTheme,
  Notification,
-  screen,
  Tray
 } from 'electron'
 import fs from 'fs-extra'
@@ -29,23 +30,16 @@ import { configPaths } from '#/utils/configPaths'
 import { IPasteStyle, IWindowList } from '#/types/enum'

 import pkg from 'root/package.json'
+import { hideMiniWindow, openMainWindow, openMiniWindow } from '~/utils/windowHelper'

 let contextMenu: Menu | null

 export function setDockMenu () {
  const isListeningClipboard = db.get(configPaths.settings.isListeningClipboard) || false
-  const autoCloseMiniWindow = db.get(configPaths.settings.autoCloseMiniWindow) || false
  const dockMenu = Menu.buildFromTemplate([
    {
      label: T('OPEN_MAIN_WINDOW'),
-      click () {
-        const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW)
-        settingWindow!.show()
-        settingWindow!.focus()
-        if (windowManager.has(IWindowList.MINI_WINDOW) && autoCloseMiniWindow) {
-          windowManager.get(IWindowList.MINI_WINDOW)!.hide()
-        }
-      }
+      click: openMainWindow
    },
    {
      label: T('START_WATCH_CLIPBOARD'),
@@ -58,7 +52,7 @@ export function setDockMenu () {
        })
        setDockMenu()
      },
-      enabled: !isListeningClipboard
+      visible: !isListeningClipboard
    },
    {
      label: T('STOP_WATCH_CLIPBOARD'),
@@ -68,7 +62,7 @@ export function setDockMenu () {
        clipboardPoll.removeAllListeners()
        setDockMenu()
      },
-      enabled: isListeningClipboard
+      visible: isListeningClipboard
    }
  ])
  app.dock.setMenu(dockMenu)
@@ -80,59 +74,27 @@ export function createMenu () {
    {
      label: 'PicList',
      submenu: [
-        {
-          label: T('OPEN_MAIN_WINDOW'),
-          click () {
-            const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW)
-            const autoCloseMiniWindow = db.get(configPaths.settings.autoCloseMiniWindow) || false
-            settingWindow!.show()
-            settingWindow!.focus()
-            if (windowManager.has(IWindowList.MINI_WINDOW) && autoCloseMiniWindow) {
-              windowManager.get(IWindowList.MINI_WINDOW)!.hide()
-            }
-          }
-        },
-        {
-          label: T('RELOAD_APP'),
-          click () {
-            app.relaunch()
-            app.exit(0)
-          }
-        }
+        { label: T('OPEN_MAIN_WINDOW'), click: openMainWindow },
+        { label: T('RELOAD_APP'), click () { app.relaunch(); app.exit(0) } }
      ]
    },
-    {
-      label: T('CHOOSE_DEFAULT_PICBED'),
-      type: 'submenu',
-      // @ts-ignore
-      submenu
-    },
+    { label: T('CHOOSE_DEFAULT_PICBED'), type: 'submenu', submenu },
    {
      label: 'Edit',
-      // @ts-ignore
      submenu: [
-        // @ts-ignore
-        { label: 'Undo', accelerator: 'CmdOrCtrl+Z', selector: 'undo:' },
-        // @ts-ignore
-        { label: 'Redo', accelerator: 'Shift+CmdOrCtrl+Z', selector: 'redo:' },
+        { label: 'Undo', accelerator: 'CmdOrCtrl+Z', role: 'undo' },
+        { label: 'Redo', accelerator: 'Shift+CmdOrCtrl+Z', role: 'redo' },
        { type: 'separator' },
-        // @ts-ignore
-        { label: 'Cut', accelerator: 'CmdOrCtrl+X', selector: 'cut:' },
-        // @ts-ignore
-        { label: 'Copy', accelerator: 'CmdOrCtrl+C', selector: 'copy:' },
-        // @ts-ignore
-        { label: 'Paste', accelerator: 'CmdOrCtrl+V', selector: 'paste:' },
-        // @ts-ignore
-        { label: 'Select All', accelerator: 'CmdOrCtrl+A', selector: 'selectAll:' }
+        { label: 'Cut', accelerator: 'CmdOrCtrl+X', role: 'cut' },
+        { label: 'Copy', accelerator: 'CmdOrCtrl+C', role: 'copy' },
+        { label: 'Paste', accelerator: 'CmdOrCtrl+V', role: 'paste' },
+        { label: 'Select All', accelerator: 'CmdOrCtrl+A', role: 'selectAll' }
      ]
    },
    {
      label: T('QUIT'),
      submenu: [
-        {
-          label: T('QUIT'),
-          role: 'quit'
-        }
+        { label: T('QUIT'), role: 'quit' }
      ]
    }
  ])
@@ -142,94 +104,39 @@ export function createMenu () {
 export function createContextMenu () {
  const ClipboardWatcher = clipboardPoll
  const isListeningClipboard = db.get(configPaths.settings.isListeningClipboard) || false
+  const isMiniWindowVisible = windowManager.has(IWindowList.MINI_WINDOW) && windowManager.get(IWindowList.MINI_WINDOW)!.isVisible()
+
+  const startWatchClipboard = () => {
+    db.set(configPaths.settings.isListeningClipboard, true)
+    ClipboardWatcher.startListening()
+    ClipboardWatcher.on('change', () => {
+      picgo.log.info('clipboard changed')
+      uploadClipboardFiles()
+    })
+    createContextMenu()
+  }
+
+  const stopWatchClipboard = () => {
+    db.set(configPaths.settings.isListeningClipboard, false)
+    ClipboardWatcher.stopListening()
+    ClipboardWatcher.removeAllListeners()
+    createContextMenu()
+  }
+
  if (process.platform === 'darwin' || process.platform === 'win32') {
    const submenu = buildPicBedListMenu()
-    const template = [
-      {
-        label: T('OPEN_MAIN_WINDOW'),
-        click () {
-          const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW)
-          const autoCloseMiniWindow = db.get(configPaths.settings.autoCloseMiniWindow) || false
-          settingWindow!.show()
-          settingWindow!.focus()
-          if (windowManager.has(IWindowList.MINI_WINDOW) && autoCloseMiniWindow) {
-            windowManager.get(IWindowList.MINI_WINDOW)!.hide()
-          }
-        }
-      },
-      {
-        label: T('CHOOSE_DEFAULT_PICBED'),
-        type: 'submenu',
-        // @ts-ignore
-        submenu
-      },
-      {
-        label: T('START_WATCH_CLIPBOARD'),
-        click () {
-          db.set(configPaths.settings.isListeningClipboard, true)
-          ClipboardWatcher.startListening()
-          ClipboardWatcher.on('change', () => {
-            picgo.log.info('clipboard changed')
-            uploadClipboardFiles()
-          })
-          createContextMenu()
-        },
-        enabled: !isListeningClipboard
-      },
-      {
-        label: T('STOP_WATCH_CLIPBOARD'),
-        click () {
-          db.set(configPaths.settings.isListeningClipboard, false)
-          ClipboardWatcher.stopListening()
-          ClipboardWatcher.removeAllListeners()
-          createContextMenu()
-        },
-        enabled: isListeningClipboard
-      },
-      {
-        label: T('RELOAD_APP'),
-        click () {
-          app.relaunch()
-          app.exit(0)
-        }
-      },
-      // @ts-ignore
-      {
-        role: 'quit',
-        label: T('QUIT')
-      }
-    ] as any
+    const template: Array<(MenuItemConstructorOptions) | (MenuItem)> = [
+      { label: T('OPEN_MAIN_WINDOW'), click: openMainWindow },
+      { label: T('CHOOSE_DEFAULT_PICBED'), type: 'submenu', submenu },
+      { label: T('START_WATCH_CLIPBOARD'), click: startWatchClipboard, visible: !isListeningClipboard },
+      { label: T('STOP_WATCH_CLIPBOARD'), click: stopWatchClipboard, visible: isListeningClipboard },
+      { label: T('RELOAD_APP'), click () { app.relaunch(); app.exit(0) } },
+      { label: T('QUIT'), role: 'quit' }
+    ]
    if (process.platform === 'win32') {
      template.splice(2, 0,
-        {
-          label: T('OPEN_MINI_WINDOW'),
-          click () {
-            const miniWindow = windowManager.get(IWindowList.MINI_WINDOW)!
-            miniWindow.removeAllListeners()
-            if (db.get(configPaths.settings.miniWindowOntop)) {
-              miniWindow.setAlwaysOnTop(true)
-            }
-            const { width, height } = screen.getPrimaryDisplay().workAreaSize
-            const lastPosition = db.get(configPaths.settings.miniWindowPosition)
-            if (lastPosition) {
-              miniWindow.setPosition(lastPosition[0], lastPosition[1])
-            } else {
-              miniWindow.setPosition(width - 100, height - 100)
-            }
-            const setPositionFunc = () => {
-              const position = miniWindow.getPosition()
-              db.set(configPaths.settings.miniWindowPosition, position)
-            }
-            miniWindow.on('close', setPositionFunc)
-            miniWindow.on('move', setPositionFunc)
-            miniWindow.show()
-            miniWindow.focus()
-            const autoCloseMainWindow = db.get(configPaths.settings.autoCloseMainWindow) || false
-            if (windowManager.has(IWindowList.SETTING_WINDOW) && autoCloseMainWindow) {
-              windowManager.get(IWindowList.SETTING_WINDOW)!.hide()
-            }
-          }
-        }
+        { label: T('OPEN_MINI_WINDOW'), click () { openMiniWindow(false) }, visible: !isMiniWindowVisible },
+        { label: T('HIDE_MINI_WINDOW'), click: hideMiniWindow, visible: isMiniWindowVisible }
      )
    }
    contextMenu = Menu.buildFromTemplate(template)
@@ -242,70 +149,11 @@ export function createContextMenu () {
    // 目前的实现无法正常工作

    contextMenu = Menu.buildFromTemplate([
-      {
-        label: T('OPEN_MAIN_WINDOW'),
-        click () {
-          const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW)
-          const autoCloseMiniWindow = db.get(configPaths.settings.autoCloseMiniWindow) || false
-          settingWindow!.show()
-          settingWindow!.focus()
-          if (windowManager.has(IWindowList.MINI_WINDOW) && autoCloseMiniWindow) {
-            windowManager.get(IWindowList.MINI_WINDOW)!.hide()
-          }
-        }
-      },
-      {
-        label: T('OPEN_MINI_WINDOW'),
-        click () {
-          const miniWindow = windowManager.get(IWindowList.MINI_WINDOW)!
-          miniWindow.removeAllListeners()
-          if (db.get(configPaths.settings.miniWindowOntop)) {
-            miniWindow.setAlwaysOnTop(true)
-          }
-          const { width, height } = screen.getPrimaryDisplay().workAreaSize
-          const lastPosition = db.get(configPaths.settings.miniWindowPosition)
-          if (lastPosition) {
-            miniWindow.setPosition(lastPosition[0], lastPosition[1])
-          } else {
-            miniWindow.setPosition(width - 100, height - 100)
-          }
-          const setPositionFunc = () => {
-            const position = miniWindow.getPosition()
-            db.set(configPaths.settings.miniWindowPosition, position)
-          }
-          miniWindow.on('close', setPositionFunc)
-          miniWindow.on('move', setPositionFunc)
-          miniWindow.show()
-          miniWindow.focus()
-          const autoCloseMainWindow = db.get(configPaths.settings.autoCloseMainWindow) || false
-          if (windowManager.has(IWindowList.SETTING_WINDOW) && autoCloseMainWindow) {
-            windowManager.get(IWindowList.SETTING_WINDOW)!.hide()
-          }
-        }
-      },
-      {
-        label: T('START_WATCH_CLIPBOARD'),
-        click () {
-          db.set(configPaths.settings.isListeningClipboard, true)
-          ClipboardWatcher.startListening()
-          ClipboardWatcher.on('change', () => {
-            picgo.log.info('clipboard changed')
-            uploadClipboardFiles()
-          })
-          createContextMenu()
-        },
-        enabled: !isListeningClipboard
-      },
-      {
-        label: T('STOP_WATCH_CLIPBOARD'),
-        click () {
-          db.set(configPaths.settings.isListeningClipboard, false)
-          ClipboardWatcher.stopListening()
-          ClipboardWatcher.removeAllListeners()
-          createContextMenu()
-        },
-        enabled: isListeningClipboard
-      },
+      { label: T('OPEN_MAIN_WINDOW'), click: openMainWindow },
+      { label: T('OPEN_MINI_WINDOW'), click () { openMiniWindow(false) }, visible: !isMiniWindowVisible },
+      { label: T('HIDE_MINI_WINDOW'), click: hideMiniWindow, visible: isMiniWindowVisible },
+      { label: T('START_WATCH_CLIPBOARD'), click: startWatchClipboard, visible: !isListeningClipboard },
+      { label: T('STOP_WATCH_CLIPBOARD'), click: stopWatchClipboard, visible: isListeningClipboard },
      {
        label: T('ABOUT'),
        click () {
@@ -317,11 +165,7 @@ export function createContextMenu () {
          })
        }
      },
-      // @ts-ignore
-      {
-        role: 'quit',
-        label: T('QUIT')
-      }
+      { label: T('QUIT'), role: 'quit' }
    ])
  }
 }
--- a/src/main/apis/app/uploader/apis.ts
+++ b/src/main/apis/app/uploader/apis.ts
@@ -4,26 +4,18 @@ import {
 } from 'electron'
 import fs from 'fs-extra'
 import { cloneDeep } from 'lodash'
-import path from 'path'
-import { ISftpPlistConfig } from 'piclist'

 import picgo from '@core/picgo'
 import db, { GalleryDB } from '@core/datastore'

-import GuiApi from 'apis/gui'
 import uploader from 'apis/app/uploader'
 import windowManager from 'apis/app/window/windowManager'

 import { T } from '~/i18n/index'
 import { handleCopyUrl, handleUrlEncodeWithSetting } from '~/utils/common'
 import pasteTemplate from '~/utils/pasteTemplate'
-import SSHClient from '~/utils/sshClient'
-
-import ALLApi from '@/apis/allApi'
-import { getRawData } from '@/utils/common'

 import { IPasteStyle, IWindowList } from '#/types/enum'
-import { picBedsCanbeDeleted } from '#/utils/static'
 import { configPaths } from '#/utils/configPaths'

 const handleClipboardUploading = async (): Promise<false | ImgInfo[]> => {
@@ -129,62 +121,3 @@ export const uploadChoosedFiles = async (webContents: WebContents, files: IFileW
    return []
  }
 }
-
-async function deleteSFTPFile (config: ISftpPlistConfig, fileName: string) {
-  try {
-    const client = SSHClient.instance
-    await client.connect(config)
-    const uploadPath = `/${(config.uploadPath || '')}/`.replace(/\/+/g, '/')
-    const remote = path.join(uploadPath, fileName)
-    const deleteResult = await client.deleteFileSFTP(config, remote)
-    client.close()
-    return deleteResult
-  } catch (err: any) {
-    picgo.log.error(err)
-    return false
-  }
-}
-
-export const deleteChoosedFiles = async (list: ImgInfo[]): Promise<boolean[]> => {
-  const result = []
-  for (const item of list) {
-    if (item.id) {
-      try {
-        const dbStore = GalleryDB.getInstance()
-        const file = await dbStore.getById(item.id)
-        await dbStore.removeById(item.id)
-        if (await picgo.getConfig(configPaths.settings.deleteCloudFile)) {
-          if (item.type !== undefined && picBedsCanbeDeleted.includes(item.type)) {
-            const noteFunc = (value: boolean) => {
-              const notification = new Notification({
-                title: T('MANAGE_BUCKET_BATCH_DELETE_ERROR_MSG_MSG2'),
-                body: T(value ? 'GALLERY_SYNC_DELETE_NOTICE_SUCCEED' : 'GALLERY_SYNC_DELETE_NOTICE_FAILED')
-              })
-              notification.show()
-            }
-            if (item.type === 'sftpplist') {
-              const { fileName, config } = item
-              setTimeout(() => {
-                deleteSFTPFile(getRawData(config), fileName || '').then(noteFunc)
-              }, 0)
-            } else {
-              setTimeout(() => {
-                ALLApi.delete(item).then(noteFunc)
-              }, 0)
-            }
-          }
-        }
-        setTimeout(() => {
-          picgo.emit('remove', [file], GuiApi.getInstance())
-        }, 500)
-        result.push(true)
-      } catch (e) {
-        result.push(false)
-      }
-    }
-  }
-  if (windowManager.has(IWindowList.SETTING_WINDOW)) {
-    windowManager.get(IWindowList.SETTING_WINDOW)!.webContents?.send('updateGallery')
-  }
-  return result
-}
--- a/src/main/apis/app/uploader/index.ts
+++ b/src/main/apis/app/uploader/index.ts
@@ -6,7 +6,7 @@ import {
  Notification,
  WebContents
 } from 'electron'
-import fse from 'fs-extra'
+import fs from 'fs-extra'
 import util from 'util'
 import path from 'path'
 import { IPicGo } from 'piclist'
@@ -26,7 +26,7 @@ import {
  RENAME_FILE_NAME,
  TALKING_DATA_EVENT
 } from '#/events/constants'
-import { IWindowList } from '#/types/enum'
+import { ICOREBuildInEvent, IWindowList } from '#/types/enum'
 import { configPaths } from '#/utils/configPaths'
 import { CLIPBOARD_IMAGE_FOLDER } from '#/utils/static'

@@ -61,21 +61,22 @@ const handleTalkingData = (webContents: WebContents, options: IAnalyticsData) =>

 class Uploader {
  private webContents: WebContents | null = null
-  // private uploading: boolean = false
+
  constructor () {
    this.init()
  }

  init () {
-    picgo.on('notification', (message: Electron.NotificationConstructorOptions | undefined) => {
+    picgo.on(ICOREBuildInEvent.NOTIFICATION, (message: Electron.NotificationConstructorOptions | undefined) => {
      const notification = new Notification(message)
      notification.show()
    })

-    picgo.on('uploadProgress', (progress: any) => {
+    picgo.on(ICOREBuildInEvent.UPLOAD_PROGRESS, (progress: any) => {
      this.webContents?.send('uploadProgress', progress)
    })
-    picgo.on('beforeTransform', () => {
+
+    picgo.on(ICOREBuildInEvent.BEFORE_TRANSFORM, () => {
      if (db.get(configPaths.settings.uploadNotification)) {
        const notification = new Notification({
          title: T('UPLOAD_PROGRESS'),
@@ -84,6 +85,7 @@ class Uploader {
        notification.show()
      }
    })
+
    picgo.helper.beforeUploadPlugins.register('renameFn', {
      handle: async (ctx: IPicGo) => {
        const rename = db.get(configPaths.settings.rename)
@@ -150,7 +152,7 @@ class Uploader {
      return false
    } finally {
      if (filePath) {
-        fse.remove(filePath)
+        fs.remove(filePath)
      }
    }
  }
--- a/src/main/apis/app/window/windowList.ts
+++ b/src/main/apis/app/window/windowList.ts
@@ -12,7 +12,6 @@ import {
 import bus from '@core/bus'
 import { CREATE_APP_MENU } from '@core/bus/constants'
 import db from '@core/datastore'
-import picgo from '@core/picgo'

 import { T } from '~/i18n'

@@ -25,16 +24,14 @@ const windowList = new Map<IWindowList, IWindowListItem>()
 const handleWindowParams = (windowURL: string) => windowURL

 const getDefaultWindowSizes = (): { width: number, height: number } => {
-  const mainWindowWidth = picgo.getConfig<any>(configPaths.settings.mainWindowWidth)
-  const mainWindowHeight = picgo.getConfig<any>(configPaths.settings.mainWindowHeight)
+  const [mainWindowWidth, mainWindowHeight] = db.get([configPaths.settings.mainWindowWidth, configPaths.settings.mainWindowHeight])
  return {
    width: mainWindowWidth || 1200,
    height: mainWindowHeight || 800
  }
 }

-const defaultWindowWidth = getDefaultWindowSizes().width
-const defaultWindowHeight = getDefaultWindowSizes().height
+const { width: defaultWindowWidth, height: defaultWindowHeight } = getDefaultWindowSizes()

 const trayWindowOptions = {
  height: 350,
--- a/src/main/apis/app/window/windowManager.ts
+++ b/src/main/apis/app/window/windowManager.ts
@@ -6,6 +6,7 @@ import { IWindowList } from '#/types/enum'
 class WindowManager implements IWindowManager {
  #windowMap: Map<IWindowList | string, BrowserWindow> = new Map()
  #windowIdMap: Map<number, IWindowList | string> = new Map()
+
  create (name: IWindowList) {
    const windowConfig: IWindowListItem = windowList.get(name)!
    if (windowConfig.isValid) {