fix(#1027,#1029): 修复记录回收站列表读取错误的问题，清空或删除记录会同步删除对应的文件

Author: codexu

src-tauri/src/app_setup.rs

@@ -1,12 +1,15 @@
 use tauri::App;
 #[cfg(target_os = "windows")]
 use tauri::Manager;
+use crate::screenshot::cleanup_temp_screenshot_dir;
 use crate::window;
 use crate::tray::create_tray;
 
 pub fn setup_app(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
     let app_handle = app.handle();
 
+    cleanup_temp_screenshot_dir(&app_handle);
+
     // 在 Windows 上明确禁用窗口装饰
     #[cfg(target_os = "windows")]
     {

src-tauri/src/main.rs

@@ -14,7 +14,7 @@ mod skills;
 mod tray;
 mod ai;
 
-use screenshot::{screenshot};
+use screenshot::{cleanup_temp_screenshot_dir, screenshot};
 use fuzzy_search::{fuzzy_search, fuzzy_search_parallel};
 use keywords::{rank_keywords};
 use backup::{export_app_data, import_app_data, import_app_data_from_file};
@@ -82,10 +82,13 @@ fn main() {
 
         .build(tauri::generate_context!())
         .expect("error while running tauri application")
-        .run(|_app_handle, event| match event {
+        .run(|app_handle, event| match event {
             #[cfg(target_os = "macos")]
             tauri::RunEvent::Reopen { has_visible_windows, .. } => {
-                window::handle_macos_reopen(&_app_handle, has_visible_windows);
+                window::handle_macos_reopen(&app_handle, has_visible_windows);
+            }
+            tauri::RunEvent::Exit => {
+                cleanup_temp_screenshot_dir(&app_handle);
             }
             _ => {}
         });

src-tauri/src/screenshot.rs

@@ -28,6 +28,17 @@ fn normalized(s: &str) -> String {
     .replace("|", "-")
 }
 
+pub fn cleanup_temp_screenshot_dir(app: &AppHandle) {
+    if let Ok(temp_screenshot_folder) = app
+        .path()
+        .resolve("temp_screenshot", BaseDirectory::AppData)
+    {
+        if std::fs::metadata(&temp_screenshot_folder).is_ok() {
+            let _ = std::fs::remove_dir_all(&temp_screenshot_folder);
+        }
+    }
+}
+
 #[allow(dead_code)]
 #[tauri::command]
 pub fn screenshot(app: AppHandle) -> Vec<ScreenshotImage> {
@@ -43,9 +54,7 @@ pub fn screenshot(app: AppHandle) -> Vec<ScreenshotImage> {
         .path()
         .resolve("temp_screenshot", BaseDirectory::AppData)
         .unwrap();
-    if std::fs::metadata(&temp_screenshot_folder).is_ok() {
-        std::fs::remove_dir_all(&temp_screenshot_folder).unwrap();
-    }
+    cleanup_temp_screenshot_dir(&app);
     std::fs::create_dir(&temp_screenshot_folder).unwrap();
 
     let mut files: Vec<ScreenshotImage> = Vec::new();

src/app/core/main/mark/index.tsx

@@ -10,12 +10,12 @@ import useMarkStore from "@/stores/mark"
 import { Button } from "@/components/ui/button"
 import { clearTrash } from "@/db/marks"
 import { confirm } from '@tauri-apps/plugin-dialog';
-import { filterMarks } from "./mark-filters.mjs";
+import { filterMarks, getTrashRecordFilters } from "./mark-filters";
 
 export function NoteSidebar() {
   const t = useTranslations();
   const { trashState, marks, setMarks, recordFilters, initRecordViewMode } = useMarkStore()
-  const visibleTrashMarks = React.useMemo(() => filterMarks(marks, recordFilters), [marks, recordFilters])
+  const visibleTrashMarks = React.useMemo(() => filterMarks(marks, getTrashRecordFilters()), [marks])
 
   useEffect(() => {
     initRecordViewMode()

src/app/core/main/mark/mark-filters.spec.mjs

@@ -1,12 +1,23 @@
+import type { Mark } from '@/db/marks'
+
+type RecordTimePreset = 'all' | 'today' | 'last7Days' | 'last30Days'
+
+type RecordFiltersLike = {
+  search: string
+  selectedTypes: Mark['type'][]
+  timePreset: RecordTimePreset
+  tagId: number | 'all'
+}
+
 const DAY_IN_MS = 24 * 60 * 60 * 1000
-const VALID_TYPES = new Set(['scan', 'text', 'image', 'link', 'file', 'recording', 'todo'])
-const VALID_TIME_PRESETS = new Set(['all', 'today', 'last7Days', 'last30Days'])
+const VALID_TYPES = new Set<Mark['type']>(['scan', 'text', 'image', 'link', 'file', 'recording', 'todo'])
+const VALID_TIME_PRESETS = new Set<RecordTimePreset>(['all', 'today', 'last7Days', 'last30Days'])
 
-function normalizeText(value) {
+function normalizeText(value?: string | null): string {
   return (value || '').trim().toLowerCase()
 }
 
-function matchesTimePreset(createdAt, timePreset, now) {
+function matchesTimePreset(createdAt: number, timePreset: RecordTimePreset, now: string | Date): boolean {
   if (timePreset === 'all') {
     return true
   }
@@ -38,7 +49,7 @@ function matchesTimePreset(createdAt, timePreset, now) {
   return true
 }
 
-function matchesSearch(mark, search) {
+function matchesSearch(mark: Pick<Mark, 'content' | 'desc' | 'url'>, search: string): boolean {
   if (!search) {
     return true
   }
@@ -50,14 +61,16 @@ function matchesSearch(mark, search) {
   return haystack.includes(search)
 }
 
-export function normalizeRecordFilters(filters) {
+export function normalizeRecordFilters(filters?: Partial<RecordFiltersLike>): RecordFiltersLike {
   const search = typeof filters?.search === 'string' ? filters.search : ''
   const selectedTypes = Array.isArray(filters?.selectedTypes)
-    ? filters.selectedTypes.filter((type) => VALID_TYPES.has(type))
+    ? filters.selectedTypes.filter((type): type is Mark['type'] => VALID_TYPES.has(type))
     : []
-  const timePreset = VALID_TIME_PRESETS.has(filters?.timePreset) ? filters.timePreset : 'all'
+  const timePreset: RecordTimePreset = filters?.timePreset && VALID_TIME_PRESETS.has(filters.timePreset) ? filters.timePreset : 'all'
   const parsedTagId = typeof filters?.tagId === 'string' ? Number(filters.tagId) : filters?.tagId
-  const tagId = Number.isInteger(parsedTagId) && parsedTagId > 0 ? parsedTagId : 'all'
+  const tagId: RecordFiltersLike['tagId'] = typeof parsedTagId === 'number' && Number.isInteger(parsedTagId) && parsedTagId > 0
+    ? parsedTagId
+    : 'all'
 
   return {
     search,
@@ -67,7 +80,16 @@ export function normalizeRecordFilters(filters) {
   }
 }
 
-export function buildRecordFilterSummary(filters) {
+export function getTrashRecordFilters(): RecordFiltersLike {
+  return {
+    search: '',
+    selectedTypes: [],
+    timePreset: 'all',
+    tagId: 'all',
+  }
+}
+
+export function buildRecordFilterSummary(filters?: Partial<RecordFiltersLike>) {
   const normalized = normalizeRecordFilters(filters)
 
   return {
@@ -84,7 +106,10 @@ export function buildRecordFilterSummary(filters) {
   }
 }
 
-export function filterMarks(marks, filters) {
+export function filterMarks(
+  marks: Mark[],
+  filters?: Partial<RecordFiltersLike> & { now?: string | Date }
+) {
   const normalizedFilters = normalizeRecordFilters(filters)
   const search = normalizeText(normalizedFilters.search)
   const selectedTypes = new Set(normalizedFilters.selectedTypes)

src/app/core/main/mark/mark-filters.mjs src/app/core/main/mark/mark-filters.tssrc/app/core/main/mark/mark-filters.mjs renamed to src/app/core/main/mark/mark-filters.ts

@@ -7,7 +7,7 @@ import { Badge } from "@/components/ui/badge";
 import useMarkStore from "@/stores/mark";
 import { MarkLoading } from "./mark-loading";
 import MarkEmpty from "./mark-empty";
-import { buildRecordFilterSummary, filterMarks } from "./mark-filters.mjs";
+import { buildRecordFilterSummary, filterMarks, getTrashRecordFilters } from "./mark-filters";
 import { MarkListDefaultView } from "./mark-list-default-view";
 import { MarkListCompactView } from "./mark-list-compact-view";
 import { MarkListCardView } from "./mark-list-card-view";
@@ -17,17 +17,22 @@ export const MarkList = React.memo(function MarkList() {
   const {
     marks,
     queues,
+    trashState,
     recordFilters,
     recordViewMode,
     hasActiveRecordFilters,
     setVisibleMarkIds,
   } = useMarkStore()
 
+  const effectiveFilters = React.useMemo(() => (
+    trashState ? getTrashRecordFilters() : recordFilters
+  ), [trashState, recordFilters])
+
   const filteredMarks = React.useMemo(() => (
-    filterMarks(marks, recordFilters)
-  ), [marks, recordFilters])
+    filterMarks(marks, effectiveFilters)
+  ), [marks, effectiveFilters])
 
-  const filterSummary = React.useMemo(() => buildRecordFilterSummary(recordFilters), [recordFilters])
+  const filterSummary = React.useMemo(() => buildRecordFilterSummary(effectiveFilters), [effectiveFilters])
 
   React.useEffect(() => {
     setVisibleMarkIds(filteredMarks.map((mark: Mark) => mark.id))
@@ -50,7 +55,7 @@ export const MarkList = React.memo(function MarkList() {
     <div className="flex-1 overflow-y-auto">
       <div className="px-0">
         <div>
-          {hasActiveRecordFilters() ? (
+          {!trashState && hasActiveRecordFilters() ? (
             <div className="border-b bg-muted/20 px-3 py-2">
               <div className="flex flex-wrap items-center gap-2">
                 <Badge variant="secondary" className="rounded-full px-2 py-0 text-[11px]">
@@ -89,7 +94,7 @@ export const MarkList = React.memo(function MarkList() {
           {
             filteredMarks.length ? (
               view
-            ) : hasActiveRecordFilters() ? (
+            ) : !trashState && hasActiveRecordFilters() ? (
               <div className="flex flex-col justify-center items-center flex-1 w-full pt-32 text-center">
                 <p className="text-sm text-zinc-500">{t('emptyFiltered')}</p>
                 <p className="mt-1 text-xs text-zinc-400">{t('emptyFilteredHint')}</p>

src/app/core/main/mark/mark-list.tsx

@@ -24,7 +24,7 @@ import useMarkStore from "@/stores/mark"
 import useChatStore from "@/stores/chat"
 import { MarkLoading } from './mark-loading'
 import { ImageGallery } from './image-gallery'
-import { filterMarks } from './mark-filters.mjs'
+import { filterMarks } from './mark-filters'
 import { MarkListDefaultView } from './mark-list-default-view'
 import { MarkListCompactView } from './mark-list-compact-view'
 import { MarkListCardView } from './mark-list-card-view'

src/app/core/main/mark/tag-manage.tsx

@@ -14,7 +14,7 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigge
 import { Sheet, SheetContent, SheetHeader, SheetTitle } from '@/components/ui/sheet'
 import { Drawer, DrawerContent, DrawerHeader, DrawerTitle } from '@/components/ui/drawer'
 import { Trash2, MoveRight, CheckSquare, Filter, Plus, ListChecks, RotateCcw, Search, ChevronDown, XCircle } from 'lucide-react'
-import { filterMarks } from '@/app/core/main/mark/mark-filters.mjs'
+import { filterMarks, getTrashRecordFilters } from '@/app/core/main/mark/mark-filters'
 import { getMarkTypeChipClasses, MARK_TYPE_OPTIONS } from '@/app/core/main/mark/mark-type-meta'
 import useMarkStore, { RecordTimePreset } from '@/stores/mark'
 import useTagStore from '@/stores/tag'
@@ -140,10 +140,16 @@ export function MobileRecordStream() {
 
   const records = marks
   const tagMap = useMemo(() => new Map(tags.map((tag) => [tag.id, tag.name])), [tags])
-  const mobileRecordFilters = useMemo(() => ({
-    ...recordFilters,
-    tagId: 'all' as const,
-  }), [recordFilters])
+  const mobileRecordFilters = useMemo(() => {
+    if (trashState) {
+      return getTrashRecordFilters()
+    }
+
+    return {
+      ...recordFilters,
+      tagId: 'all' as const,
+    }
+  }, [trashState, recordFilters])
 
   const filteredRecords = useMemo(() => {
     return filterMarks(records, mobileRecordFilters)