Merge pull request #139 from SchneeHertz/development

Development

Author: SchneeHertz

fileLoader/archive.js

@@ -71,6 +71,11 @@ let getImageListFromArchive = async (filepath, VIEWER_PATH)=>{
   return list
 }
 
+let deleteImageFromArchive = async (filename, filepath) => {
+  await spawnPromise(_7z, ['d', filepath, filename, '-p123456'])
+  return true
+}
+
 let spawnPromise = (commmand, argument)=>{
   return new Promise((resolve, reject)=>{
     const spawned = spawn(commmand, argument)
@@ -94,5 +99,6 @@ let spawnPromise = (commmand, argument)=>{
 module.exports = {
   getArchivelist,
   solveBookTypeArchive,
-  getImageListFromArchive
+  getImageListFromArchive,
+  deleteImageFromArchive
 }

fileLoader/folder.js

@@ -1,8 +1,8 @@
 const path = require('path')
 const { globIterate, globSync } = require('glob')
 const { nanoid } = require('nanoid')
-const _ = require('lodash')
 const { readdir, stat } = require('fs/promises')
+const { shell } = require('electron')
 
 const dirSize = async dir => {
   const files = await readdir( dir, { withFileTypes: true } )
@@ -60,8 +60,15 @@ let getImageListFromFolder = async (folderpath, VIEWER_PATH)=>{
   return list
 }
 
+let deleteImageFromFolder = async (filename, folderpath) => {
+  let filepath = path.join(folderpath, filename)
+  await shell.trashItem(filepath)
+  return true
+}
+
 module.exports = {
   getFolderlist,
   solveBookTypeFolder,
-  getImageListFromFolder
+  getImageListFromFolder,
+  deleteImageFromFolder
 }

fileLoader/index.js

@@ -3,8 +3,8 @@ const path = require('node:path')
 const { nanoid } = require('nanoid')
 const { createHash } = require('crypto')
 const sharp = require('sharp')
-const { getFolderlist, solveBookTypeFolder, getImageListFromFolder } = require('./folder.js')
-const { getArchivelist, solveBookTypeArchive, getImageListFromArchive } = require('./archive.js')
+const { getFolderlist, solveBookTypeFolder, getImageListFromFolder, deleteImageFromFolder } = require('./folder.js')
+const { getArchivelist, solveBookTypeArchive, getImageListFromArchive, deleteImageFromArchive } = require('./archive.js')
 const { getZipFilelist, solveBookTypeZip } = require('./zip.js')
 const { TEMP_PATH, COVER_PATH, VIEWER_PATH } = require('../modules/init_folder_setting.js')
 
@@ -63,8 +63,21 @@ const getImageListByBook = async (filepath, type) => {
   }
 }
 
+const deleteImageFromBook = async (filename, filepath, type) => {
+  switch (type) {
+    case 'folder':
+      return await deleteImageFromFolder(filename, filepath)
+    case 'zip':
+    case 'archive':
+      return await deleteImageFromArchive(filename, filepath)
+    default:
+      return await deleteImageFromArchive(filename, filepath)
+  }
+}
+
 module.exports = {
   getBookFilelist,
   geneCover,
-  getImageListByBook
+  getImageListByBook,
+  deleteImageFromBook
 }

index.js

@@ -16,7 +16,7 @@ const windowStateKeeper = require('electron-window-state')
 
 const { prepareMangaModel, prepareMetadataModel } = require('./modules/database')
 const { prepareTemplate } = require('./modules/prepare_menu.js')
-const { getBookFilelist, geneCover, getImageListByBook } = require('./fileLoader/index.js')
+const { getBookFilelist, geneCover, getImageListByBook, deleteImageFromBook } = require('./fileLoader/index.js')
 const { STORE_PATH, TEMP_PATH, COVER_PATH, VIEWER_PATH, prepareSetting, preparePath } = require('./modules/init_folder_setting.js')
 
 
@@ -458,13 +458,13 @@ ipcMain.handle('get-folder-tree', async (event, bookList) => {
       if (_.isEmpty(node)) {
         preRoot.push({
           label: trueLabel,
-          folderPath: [...initFolder, trueLabel]
+          folderPath: [...initFolder, trueLabel].slice(1).join(path.sep),
         })
       } else {
         preRoot.push({
           label: trueLabel,
-          folderPath: [...initFolder, trueLabel],
-          children: resolveTree([], node, [...initFolder, trueLabel])
+          folderPath: [...initFolder, trueLabel].slice(1).join(path.sep),
+          children: resolveTree([], node, [...initFolder, trueLabel]),
         })
       }
     })
@@ -562,9 +562,11 @@ ipcMain.handle('load-manga-image-list', async (event, book) => {
               break
           }
         }
+        let filename = path.basename(list[index - 1])
         mainWindow.webContents.send('manga-image', {
           id: `${bookId}_${index}`,
           index,
+          filename,
           filepath: imageFilepath,
           width, height
         })
@@ -583,6 +585,7 @@ ipcMain.handle('load-manga-image-list', async (event, book) => {
           mainWindow.webContents.send('manga-thumbnail-image', {
             id: `${bookId}_${index}`,
             index,
+            filename,
             filepath: imageFilepath,
             thumbnailPath,
           })
@@ -598,6 +601,9 @@ ipcMain.handle('release-sendimagelock', () => {
   sendImageLock = false
 })
 
+ipcMain.handle('delete-image', async (event, filename, filepath, type) => {
+  return await deleteImageFromBook(filename, filepath, type)
+})
 
 // setting
 ipcMain.handle('select-folder', async (event, type) => {
@@ -743,6 +749,8 @@ ipcMain.handle('import-sqlite', async (event, bookList) => {
   }
 })
 
+// tools
+
 ipcMain.handle('set-progress-bar', async (event, progress) => {
   setProgressBar(progress)
 })
@@ -775,4 +783,8 @@ ipcMain.handle('update-window-title', async (event, title) => {
 
 ipcMain.handle('switch-fullscreen', async (event, arg) => {
   mainWindow.setFullScreen(!mainWindow.isFullScreen())
+})
+
+ipcMain.on('get-path-sep', async (event, arg) => {
+  event.returnValue = path.sep
 })