Merge pull request #37 from nuthx/dev-2.0.2

Dev 2.0.2

Author: nuthx

icons/icon.ico

@@ -1,7 +1,7 @@
 {
   "name": "subtitle-renamer",
   "private": true,
-  "version": "2.0.1",
+  "version": "2.0.2",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -26,7 +26,8 @@
     "react-dom": "^19.2.3",
     "react-router-dom": "^7.11.0",
     "sonner": "^2.0.7",
-    "tailwind-merge": "^3.4.0"
+    "tailwind-merge": "^3.4.0",
+    "zustand": "^5.0.9"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.2",
@@ -37,7 +38,7 @@
     "eslint": "^9.39.2",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
-    "globals": "^16.5.0",
+    "globals": "^17.0.0",
     "tailwind-scrollbar": "^4.0.2",
     "tailwindcss": "^4.1.18",
     "vite": "^7.3.0"

package.json

@@ -2,6 +2,7 @@ mod extract;
 #[cfg(target_os = "macos")]
 mod menu;
 mod theme;
+mod trash;
 
 use tauri::{generate_context, generate_handler, AppHandle, Builder, Manager, Window};
 use tauri_plugin_store::StoreExt;
@@ -23,7 +24,7 @@ fn extract_archive(app: AppHandle, archive_path: String) -> Result<Vec<String>,
 
 #[tauri::command]
 fn move_to_trash(paths: Vec<String>) -> Result<(), String> {
-    trash::delete_all(&paths).map_err(|e| e.to_string())
+    trash::move_to_trash_inner(paths)
 }
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
@@ -59,11 +60,9 @@ pub fn run() {
             // 在 Windows 下依次尝试应用云母、亚克力、模糊材质
             #[cfg(target_os = "windows")]
             {
-                if apply_mica(&window, None).is_err() {
-                    if apply_acrylic(&window, None).is_err() {
-                        let _ = apply_blur(&window, None);
-                    }
-                }
+                let _ = apply_mica(&window, None)
+                    .or_else(|_| apply_acrylic(&window, None))
+                    .or_else(|_| apply_blur(&window, None));
             }
 
             // 应用 macOS 模糊材质
@@ -78,6 +77,9 @@ pub fn run() {
                 let _ = app.set_menu(menu);
             }
 
+            // 初始化完成后再显示窗口
+            let _ = window.show();
+
             Ok(())
         })
         .run(generate_context!())

pnpm-lock.yaml

@@ -0,0 +1,27 @@
+use std::fs::remove_file;
+use trash::delete;
+
+pub fn move_to_trash_inner(paths: Vec<String>) -> Result<(), String> {
+    // 先尝试批量删除到回收站
+    if trash::delete_all(&paths).is_ok() {
+        return Ok(());
+    }
+
+    // 已知使用 SMB 挂载的内容无法移动到回收站
+    // 使用循环依次尝试放入回收站或者直接删除文件
+    let errors: Vec<String> = paths
+        .iter()
+        .filter_map(|path| {
+            delete(path)
+                .or_else(|_| remove_file(path))
+                .err()
+                .map(|e| format!("{}: {}", path, e))
+        })
+        .collect();
+
+    if errors.is_empty() {
+        Ok(())
+    } else {
+        Err(errors.join(", "))
+    }
+}

src/src/lib.rs

@@ -18,6 +18,7 @@
         "height": 680,
         "minWidth": 1000,
         "minHeight": 640,
+        "visible": false,
         "dragDropEnabled": true,
         "transparent": true,
         "titleBarStyle": "Overlay",

src/src/trash.rs

@@ -11,15 +11,16 @@ import { DropArea } from "@/components/drop"
 import { Table } from "@/components/table"
 import { Button } from "@/components/button"
 import { FileVideoIcon, FileTextIcon, FileArchiveIcon } from "@phosphor-icons/react"
+import { useSubtitleStore } from "@/store/subtitle"
 
 const colKeys = ["video", "sc", "tc"]
 
 export function SubtitleRename() {
   const [cell, setCell] = useState(null)
-  const [fileList, setFileList] = useState({}) // 拖入时生成，便于排序，右键菜单也会操作此对象
   const [fileData, setFileData] = useState([]) // 展平为带路径的数组，用于重命名
   const [tableData, setTableData] = useState([]) // 上面数组的基础上移除了路径，只保留文件名
-  const [archiveList, setArchiveList] = useState([]) // 拖入的压缩包路径
+
+  const { fileList, archiveList, setFileList, setArchiveList, clearAll } = useSubtitleStore()
 
   const tableColumns = [
     { key: "video", title: "视频文件" },
@@ -66,8 +67,8 @@ export function SubtitleRename() {
       if (addedCount === 0) {
         throw new Error(`${filterText}，耗时 ${elapsedTime(startTime)}`)
       } else {
-        setFileList(files)
-        setArchiveList(archives)
+        setFileList(() => files)
+        setArchiveList(() => archives)
         return { message: `添加了 ${addedCount} 个文件${filterText && `，${filterText}`}，耗时 ${elapsedTime(startTime)}` }
       }
     })()
@@ -77,7 +78,7 @@ export function SubtitleRename() {
       success: { title: (data) => data.message },
       error: { type: "warning", title: (err) => err.message }
     })
-  }, [fileList, archiveList])
+  }, [fileList, archiveList, setFileList, setArchiveList])
 
   // 更改字幕类型
   const handleChangeType = useCallback(() => {
@@ -89,7 +90,7 @@ export function SubtitleRename() {
       [sourceKey]: (prev[sourceKey] || []).filter((_, i) => i !== cell.row),
       [targetKey]: [...(prev[targetKey] || []), value].sort(sortFiles)
     }))
-  }, [cell, fileList])
+  }, [cell, fileList, setFileList])
 
   // 内容移动
   const handleMove = useCallback((offset) => {
@@ -100,7 +101,7 @@ export function SubtitleRename() {
       [key]: prev[key].map((v, i) => i === cell.row ? prev[key][targetRow] : i === targetRow ? prev[key][cell.row] : v
       )
     }))
-  }, [cell])
+  }, [cell, setFileList])
 
   // 删除单个内容
   const handleDeleteItem = useCallback(() => {
@@ -109,7 +110,7 @@ export function SubtitleRename() {
       ...prev,
       [key]: prev[key].filter((_, i) => i !== cell.row)
     }))
-  }, [cell])
+  }, [cell, setFileList])
 
   // 删除整行
   const handleDeleteRow = useCallback(() => {
@@ -118,18 +119,12 @@ export function SubtitleRename() {
         Object.entries(prev).map(([key, arr]) => [key, arr.filter((_, i) => i !== cell.row)])
       )
     )
-  }, [cell])
-
-  // 清空列表
-  const handleClearList = () => {
-    setFileList({})
-    setArchiveList([])
-  }
+  }, [cell, setFileList])
 
   // 重命名字幕
   const handleRename = async () => {
     const success = await renameSubtitles(fileData, archiveList)
-    if (success) handleClearList()
+    if (success) clearAll()
   }
 
   return (
@@ -175,7 +170,7 @@ export function SubtitleRename() {
       </PageBlock>
 
       <PageBlock className="items-center justify-end gap-3 p-4" last>
-        <Button className="w-26" onClick={() => handleClearList()}>清空列表</Button>
+        <Button className="w-26" onClick={() => clearAll()}>清空列表</Button>
         <Button variant="primary" className="w-26" onClick={handleRename}>重命名</Button>
       </PageBlock>
     </Page>

src/tauri.conf.json

@@ -0,0 +1,18 @@
+import { create } from "zustand"
+
+export const useSubtitleStore = create((set) => ({
+  fileList: {},
+  archiveList: [],
+
+  setFileList: (updater) => set((state) => ({
+    fileList: updater(state.fileList)
+  })),
+  setArchiveList: (updater) => set((state) => ({
+    archiveList: updater(state.archiveList)
+  })),
+
+  clearAll: () => set({
+    fileList: {},
+    archiveList: []
+  })
+}))

ui/pages/subtitle.jsx

@@ -61,15 +61,12 @@ export async function renameSubtitles(fileData, archiveList) {
     }
 
     for (const path of filePaths) {
-      // 重命名字幕
-      if (moveSub === "copy") {
-        await copyFile(path.old, path.new)
-        // 若在同一目录复制，需要删除目录下的原文件
-        if (await dirname(path.old) === await dirname(path.new)) {
-          pathsToTrash.push(path.old)
-        }
-      } else {
-        await rename(path.old, path.new)
+      // 使用复制操作来重命名
+      await copyFile(path.old, path.new)
+
+      // 非复制模式，或复制模式但字幕在同文件夹时，删除旧字幕
+      if (moveSub !== "copy" || dirname(path.old) === dirname(path.new)) {
+        pathsToTrash.push(path.old)
       }
 
       // 检测编码，非 UTF-8 则转换