🔨 Refactor: refactor of some codes

src/main/apis/app/window/windowList.ts

@@ -17,9 +17,7 @@ import { T } from '~/main/i18n'
 
 const windowList = new Map<IWindowList, IWindowListItem>()
 
-const handleWindowParams = (windowURL: string) => {
+const handleWindowParams = (windowURL: string) => windowURL
-  return windowURL
-}
 
 const getDefaultWindowSizes = (): { width: number, height: number } => {
   const mainWindowWidth = picgo.getConfig<any>('settings.mainWindowWidth')
@@ -33,13 +31,9 @@ const getDefaultWindowSizes = (): { width: number, height: number } => {
 const defaultWindowWidth = getDefaultWindowSizes().width
 const defaultWindowHeight = getDefaultWindowSizes().height
 
-windowList.set(IWindowList.TRAY_WINDOW, {
+const trayWindowOptions = {
-  isValid: process.platform !== 'linux',
-  multiple: false,
-  options () {
-    return {
   height: 350,
-      width: 196, // 196
+  width: 196,
   show: false,
   frame: false,
   fullscreenable: false,
@@ -53,21 +47,9 @@ windowList.set(IWindowList.TRAY_WINDOW, {
     backgroundThrottling: false,
     webSecurity: false
   }
-    }
+}
-  },
-  callback (window) {
-    window.loadURL(handleWindowParams(TRAY_WINDOW_URL))
-    window.on('blur', () => {
-      window.hide()
-    })
-  }
-})
 
-windowList.set(IWindowList.SETTING_WINDOW, {
+const settingWindowOptions = {
-  isValid: true,
-  multiple: false,
-  options () {
-    const options: IBrowserWindowOptions = {
   height: defaultWindowHeight,
   width: defaultWindowWidth,
   show: false,
@@ -86,16 +68,102 @@ windowList.set(IWindowList.SETTING_WINDOW, {
     nodeIntegrationInWorker: true,
     webSecurity: false
   }
+} as IBrowserWindowOptions
+
+if (process.platform !== 'darwin') {
+  settingWindowOptions.show = false
+  settingWindowOptions.frame = false
+  settingWindowOptions.backgroundColor = '#3f3c37'
+  settingWindowOptions.transparent = false
+  settingWindowOptions.icon = `${__static}/logo.png`
+}
+
+const miniWindowOptions = {
+  height: 64,
+  width: 64,
+  show: process.platform === 'linux',
+  frame: false,
+  fullscreenable: false,
+  skipTaskbar: true,
+  resizable: false,
+  transparent: process.platform !== 'linux',
+  icon: `${__static}/logo.png`,
+  webPreferences: {
+    backgroundThrottling: false,
+    nodeIntegration: !!process.env.ELECTRON_NODE_INTEGRATION,
+    contextIsolation: !process.env.ELECTRON_NODE_INTEGRATION,
+    nodeIntegrationInWorker: true
   }
-    if (process.platform !== 'darwin') {
+} as IBrowserWindowOptions
-      options.show = false
+
-      options.frame = false
+if (db.get('settings.miniWindowOntop')) {
-      options.backgroundColor = '#3f3c37'
+  miniWindowOptions.alwaysOnTop = true
-      options.transparent = false
+}
-      options.icon = `${__static}/logo.png`
+
+const renameWindowOptions = {
+  height: 175,
+  width: 300,
+  show: true,
+  fullscreenable: false,
+  resizable: false,
+  vibrancy: 'ultra-dark',
+  webPreferences: {
+    nodeIntegration: !!process.env.ELECTRON_NODE_INTEGRATION,
+    contextIsolation: !process.env.ELECTRON_NODE_INTEGRATION,
+    nodeIntegrationInWorker: true,
+    backgroundThrottling: false
   }
-    return options
+} as IBrowserWindowOptions
-  },
+
+if (process.platform !== 'darwin') {
+  renameWindowOptions.show = true
+  renameWindowOptions.backgroundColor = '#3f3c37'
+  renameWindowOptions.autoHideMenuBar = true
+  renameWindowOptions.transparent = false
+}
+
+const toolboxWindowOptions = {
+  height: 450,
+  width: 800,
+  show: false,
+  frame: true,
+  center: true,
+  fullscreenable: false,
+  resizable: false,
+  title: `PicList ${T('TOOLBOX')}`,
+  vibrancy: 'ultra-dark',
+  icon: `${__static}/logo.png`,
+  webPreferences: {
+    backgroundThrottling: false,
+    nodeIntegration: !!process.env.ELECTRON_NODE_INTEGRATION,
+    contextIsolation: !process.env.ELECTRON_NODE_INTEGRATION,
+    nodeIntegrationInWorker: true,
+    webSecurity: false
+  }
+} as IBrowserWindowOptions
+
+if (process.platform !== 'darwin') {
+  toolboxWindowOptions.backgroundColor = '#3f3c37'
+  toolboxWindowOptions.autoHideMenuBar = true
+  toolboxWindowOptions.transparent = false
+}
+
+windowList.set(IWindowList.TRAY_WINDOW, {
+  isValid: process.platform !== 'linux',
+  multiple: false,
+  options: () => trayWindowOptions,
+  callback (window) {
+    window.loadURL(handleWindowParams(TRAY_WINDOW_URL))
+    window.on('blur', () => {
+      window.hide()
+    })
+  }
+})
+
+windowList.set(IWindowList.SETTING_WINDOW, {
+  isValid: true,
+  multiple: false,
+  options: () => settingWindowOptions,
   callback (window, windowManager) {
     window.once('show', () => {
       remoteNoticeHandler.triggerHook(IRemoteNoticeTriggerHook.SETTING_WINDOW_OPEN)
@@ -117,30 +185,7 @@ windowList.set(IWindowList.SETTING_WINDOW, {
 windowList.set(IWindowList.MINI_WINDOW, {
   isValid: process.platform !== 'darwin',
   multiple: false,
-  options () {
+  options: () => miniWindowOptions,
-    const obj: IBrowserWindowOptions = {
-      height: 64,
-      width: 64,
-      show: process.platform === 'linux',
-      frame: false,
-      fullscreenable: false,
-      skipTaskbar: true,
-      resizable: false,
-      transparent: process.platform !== 'linux',
-      icon: `${__static}/logo.png`,
-      webPreferences: {
-        backgroundThrottling: false,
-        nodeIntegration: !!process.env.ELECTRON_NODE_INTEGRATION,
-        contextIsolation: !process.env.ELECTRON_NODE_INTEGRATION,
-        nodeIntegrationInWorker: true
-      }
-    }
-
-    if (db.get('settings.miniWindowOntop')) {
-      obj.alwaysOnTop = true
-    }
-    return obj
-  },
   callback (window) {
     window.loadURL(handleWindowParams(MINI_WINDOW_URL))
   }
@@ -149,29 +194,7 @@ windowList.set(IWindowList.MINI_WINDOW, {
 windowList.set(IWindowList.RENAME_WINDOW, {
   isValid: true,
   multiple: true,
-  options () {
+  options: () => renameWindowOptions,
-    const options: IBrowserWindowOptions = {
-      height: 175,
-      width: 300,
-      show: true,
-      fullscreenable: false,
-      resizable: false,
-      vibrancy: 'ultra-dark',
-      webPreferences: {
-        nodeIntegration: !!process.env.ELECTRON_NODE_INTEGRATION,
-        contextIsolation: !process.env.ELECTRON_NODE_INTEGRATION,
-        nodeIntegrationInWorker: true,
-        backgroundThrottling: false
-      }
-    }
-    if (process.platform !== 'darwin') {
-      options.show = true
-      options.backgroundColor = '#3f3c37'
-      options.autoHideMenuBar = true
-      options.transparent = false
-    }
-    return options
-  },
   async callback (window, windowManager) {
     window.loadURL(handleWindowParams(RENAME_WINDOW_URL))
     const currentWindow = windowManager.getAvailableWindow()
@@ -194,33 +217,7 @@ windowList.set(IWindowList.RENAME_WINDOW, {
 windowList.set(IWindowList.TOOLBOX_WINDOW, {
   isValid: true,
   multiple: false,
-  options () {
+  options: () => toolboxWindowOptions,
-    const options: IBrowserWindowOptions = {
-      height: 450,
-      width: 800,
-      show: false,
-      frame: true,
-      center: true,
-      fullscreenable: false,
-      resizable: false,
-      title: `PicList ${T('TOOLBOX')}`,
-      vibrancy: 'ultra-dark',
-      icon: `${__static}/logo.png`,
-      webPreferences: {
-        backgroundThrottling: false,
-        nodeIntegration: !!process.env.ELECTRON_NODE_INTEGRATION,
-        contextIsolation: !process.env.ELECTRON_NODE_INTEGRATION,
-        nodeIntegrationInWorker: true,
-        webSecurity: false
-      }
-    }
-    if (process.platform !== 'darwin') {
-      options.backgroundColor = '#3f3c37'
-      options.autoHideMenuBar = true
-      options.transparent = false
-    }
-    return options
-  },
   async callback (window, windowManager) {
     window.loadURL(TOOLBOX_WINDOW_URL)
     const currentWindow = windowManager.getAvailableWindow()

src/main/apis/core/utils/localLogger.ts

@@ -2,26 +2,29 @@ import fs from 'fs-extra'
 import dayjs from 'dayjs'
 import util from 'util'
 
-const checkLogFileIsLarge = (logPath: string): {
+const MB = 1024 * 1024
+const DEFAULT_LOG_FILE_SIZE_LIMIT = 10 * MB
+
+interface CheckLogFileResult {
   isLarge: boolean
   logFileSize?: number
   logFileSizeLimit?: number
-} => {
+}
+
+const checkLogFileIsLarge = (logPath: string): CheckLogFileResult => {
   try {
     if (fs.existsSync(logPath)) {
       const logFileSize = fs.statSync(logPath).size
-      const logFileSizeLimit = 10 * 1024 * 1024 // 10 MB default
       return {
-        isLarge: logFileSize > logFileSizeLimit,
+        isLarge: logFileSize > DEFAULT_LOG_FILE_SIZE_LIMIT,
         logFileSize,
-        logFileSizeLimit
+        logFileSizeLimit: DEFAULT_LOG_FILE_SIZE_LIMIT
       }
     }
     return {
       isLarge: false
     }
   } catch (e) {
-    // why throw error???
     console.log(e)
     return {
       isLarge: true
@@ -36,14 +39,14 @@ const recreateLogFile = (logPath: string): void => {
       fs.createFileSync(logPath)
     }
   } catch (e) {
-    // do nothing
+    console.log(e)
   }
 }
 
 /**
  * for local log before piclist inited
  */
-const getLogger = (logPath: string, logtype: string) => {
+const getLogger = (logPath: string, logType: string) => {
   let hasUncathcedError = false
   try {
     if (!fs.existsSync(logPath)) {
@@ -64,7 +67,7 @@ const getLogger = (logPath: string, logtype: string) => {
       return
     }
     try {
-      let log = `${dayjs().format('YYYY-MM-DD HH:mm:ss')} [${logtype} ${type.toUpperCase()}] `
+      let log = `${dayjs().format('YYYY-MM-DD HH:mm:ss')} [${logType} ${type.toUpperCase()}] `
       msg.forEach((item: ILogArgvTypeWithError) => {
         if (typeof item === 'object' && type === 'error') {
           log += `\n------Error Stack Begin------\n${util.format(item.stack)}\n-------Error Stack End------- `