From 8b21e8407cab8f16f32733b49909503e206366c2 Mon Sep 17 00:00:00 2001
From: Kuingsmile <ma_shiqing@163.com>
Date: Sat, 25 May 2024 21:06:27 +0800
Subject: [PATCH] :bug: Fix(custom): remove listener before unmount

---
 src/main/lifeCycle/index.ts     | 4 ++--
 src/main/manage/datastore/db.ts | 3 +--
 src/main/manage/manageApi.ts    | 2 +-
 src/renderer/pages/TrayPage.vue | 6 +++---
 src/renderer/utils/db.ts        | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/lifeCycle/index.ts b/src/main/lifeCycle/index.ts
index f5789f6..0ce5304 100644
--- a/src/main/lifeCycle/index.ts
+++ b/src/main/lifeCycle/index.ts
@@ -180,8 +180,8 @@ class LifeCycle {
         shortKeyHandler.init()
       })
       server.startup()
-      startFileServer()
       webServer.start()
+      startFileServer()
       if (process.env.NODE_ENV !== 'development') {
         handleStartUpFiles(process.argv, process.cwd())
       }
@@ -229,7 +229,7 @@ class LifeCycle {
   }
 
   #onRunning () {
-    app.on('second-instance', (event, commandLine, workingDirectory) => {
+    app.on('second-instance', (_, commandLine, workingDirectory) => {
       logger.info('detect second instance')
       const result = handleStartUpFiles(commandLine, workingDirectory)
       if (!result) {
diff --git a/src/main/manage/datastore/db.ts b/src/main/manage/datastore/db.ts
index 5bd2519..8a23cde 100644
--- a/src/main/manage/datastore/db.ts
+++ b/src/main/manage/datastore/db.ts
@@ -11,8 +11,7 @@ class ManageDB {
     this.#db = new JSONStore(this.#ctx.configPath)
     let initParams: IStringKeyMap = {
       picBed: {},
-      settings: {},
-      currentPicBed: 'placeholder'
+      settings: {}
     }
     for (let key in initParams) {
       if (!this.#db.has(key)) {
diff --git a/src/main/manage/manageApi.ts b/src/main/manage/manageApi.ts
index f6fcf7b..7380029 100644
--- a/src/main/manage/manageApi.ts
+++ b/src/main/manage/manageApi.ts
@@ -31,7 +31,7 @@ export class ManageApi extends EventEmitter implements ManageApiType {
 
   constructor (currentPicBed: string = '') {
     super()
-    this.currentPicBed = currentPicBed || (this.getConfig('currentPicBed') ?? 'placeholder')
+    this.currentPicBed = currentPicBed || 'placeholder'
     this.configPath = managePathChecker()
     this.initConfigPath()
     this.logger = new ManageLogger(this)
diff --git a/src/renderer/pages/TrayPage.vue b/src/renderer/pages/TrayPage.vue
index c2e14ca..eb705da 100644
--- a/src/renderer/pages/TrayPage.vue
+++ b/src/renderer/pages/TrayPage.vue
@@ -192,14 +192,14 @@ function uploadClipboardFiles () {
 onBeforeMount(() => {
   disableDragFile()
   getData()
-  ipcRenderer.on('dragFiles', async (event: Event, _files: string[]) => {
+  ipcRenderer.on('dragFiles', async (_: Event, _files: string[]) => {
     for (let i = 0; i < _files.length; i++) {
       const item = _files[i]
       await $$db.insert(item)
     }
     files.value = (await $$db.get<ImgInfo>({ orderBy: 'desc', limit: 5 })).data
   })
-  ipcRenderer.on('clipboardFiles', (event: Event, files: ImgInfo[]) => {
+  ipcRenderer.on('clipboardFiles', (_: Event, files: ImgInfo[]) => {
     clipboardFiles.value = files
   })
   ipcRenderer.on('uploadFiles', async () => {
@@ -214,7 +214,7 @@ onBeforeMount(() => {
 onBeforeUnmount(() => {
   ipcRenderer.removeAllListeners('dragFiles')
   ipcRenderer.removeAllListeners('clipboardFiles')
-  ipcRenderer.removeAllListeners('uploadClipboardFiles')
+  ipcRenderer.removeAllListeners('uploadFiles')
   ipcRenderer.removeAllListeners('updateFiles')
 })
 </script>
diff --git a/src/renderer/utils/db.ts b/src/renderer/utils/db.ts
index fd7181e..b262e72 100644
--- a/src/renderer/utils/db.ts
+++ b/src/renderer/utils/db.ts
@@ -57,7 +57,7 @@ export class GalleryDB implements IGalleryDB {
   #msgHandler<T> (method: string, ...args: any[]): Promise<T> {
     return new Promise((resolve) => {
       const callbackId = uuid()
-      const callback = (event: IpcRendererEvent, data: T, returnCallbackId: string) => {
+      const callback = (_: IpcRendererEvent, data: T, returnCallbackId: string) => {
         if (returnCallbackId === callbackId) {
           resolve(data)
           ipcRenderer.removeListener(method, callback)