Merge pull request #284 from SchneeHertz/development

Development

Author: SchneeHertz

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v1.6.10](https://github.com/SchneeHertz/exhentai-manga-manager/compare/v1.6.9...v1.6.10)
+
+> 28 June 2025
+
+- fix tray icon miss [`#261`](https://github.com/SchneeHertz/exhentai-manga-manager/pull/261)
+
 #### [v1.6.9](https://github.com/SchneeHertz/exhentai-manga-manager/compare/v1.6.8...v1.6.9)
 
 > 28 June 2025

index.js

@@ -14,6 +14,7 @@ const fetch = require('node-fetch')
 const { HttpsProxyAgent } = require('https-proxy-agent')
 const windowStateKeeper = require('electron-window-state')
 const express = require('express')
+const { globSync } = require('glob')
 
 const { prepareMangaModel, prepareMetadataModel } = require('./modules/database')
 const { prepareTemplate } = require('./modules/prepare_menu.js')
@@ -674,16 +675,34 @@ ipcMain.handle('open-local-book', async (event, filepath) => {
 
 ipcMain.handle('delete-local-book', async (event, filepath) => {
   if (filepath.startsWith(setting.library)) {
-    await Manga.destroy({ where: { filepath: filepath } })
     try {
-      try {
+      const stats = await fs.promises.stat(filepath)
+      if (stats.isDirectory()) {
+        const imageFiles = globSync('*.@(jpg|jpeg|png|webp|avif|gif)', {
+          cwd: filepath,
+          nocase: true,
+          absolute: true
+        })
+
+        for (const imageFile of imageFiles) {
+          try {
+            await shell.trashItem(imageFile)
+          } catch {
+            await fs.promises.rm(imageFile, { force: true })
+          }
+        }
+
+        const remainingFiles = await fs.promises.readdir(filepath)
+        if (remainingFiles.length === 0) {
+          await shell.trashItem(filepath)
+        }
+      } else {
         await shell.trashItem(filepath)
-      } catch {
-        await fs.promises.rm(filepath, { recursive: true, force: true })
       }
     } catch (e) {
       sendMessageToWebContents(`Delete ${filepath} failed because ${e}`)
     }
+    await Manga.destroy({ where: { filepath: filepath } })
   }
 })
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "exhentai-manga-manager",
   "private": true,
-  "version": "1.6.10",
+  "version": "1.6.11",
   "author": "SchneeHertz",
   "description": "Tag-based management, reading manga downloaded from ExHentai",
   "repository": {

src/components/Setting.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog v-model="dialogVisibleSetting"
-    width="54em"
+    width="55em"
     :modal="false"
     append-to-body
     top="60px"