Merge pull request #285 from alley-rs/dev

Author: github-actions[bot]

src-tauri/capabilities/default.json

@@ -6,11 +6,11 @@
   "permissions": [
     "core:default",
     "core:window:allow-start-dragging",
+    "core:webview:allow-clear-all-browsing-data",
     "shell:allow-open",
     "clipboard-manager:allow-write-text",
     "dialog:allow-open",
     "process:default",
     "dialog:allow-ask"
   ]
 }
-

src-tauri/src/cache.rs

@@ -0,0 +1,77 @@
+use std::{
+    path::Path,
+    sync::{
+        atomic::{AtomicU64, Ordering},
+        Arc,
+    },
+    thread,
+};
+
+use crate::LsarResult;
+
+fn format_size(size: u64) -> String {
+    const KB: u64 = 1024;
+    const MB: u64 = KB * 1024;
+    const GB: u64 = MB * 1024;
+
+    if size < KB {
+        format!("{} B", size)
+    } else if size < MB {
+        format!("{:.2} KB", size as f64 / KB as f64)
+    } else if size < GB {
+        format!("{:.2} MB", size as f64 / MB as f64)
+    } else {
+        format!("{:.2} GB", size as f64 / GB as f64)
+    }
+}
+
+#[tauri::command]
+pub fn calc_cache_size() -> LsarResult<String> {
+    let path = dirs::cache_dir()
+        .ok_or(std::io::Error::new(
+            std::io::ErrorKind::NotFound,
+            "cache dir not found",
+        ))?
+        .join("lsar");
+
+    let total = Arc::new(AtomicU64::new(0));
+    walk_parallel(&path, Arc::clone(&total))?;
+    Ok(format_size(total.load(Ordering::Relaxed)))
+}
+
+fn walk_parallel(path: &Path, total: Arc<AtomicU64>) -> std::io::Result<()> {
+    if path.is_dir() {
+        let entries: Vec<_> = std::fs::read_dir(path)?.filter_map(|e| e.ok()).collect();
+
+        // 子目录数量足够多时才开新线程，避免线程爆炸
+        let (dirs, files): (Vec<_>, Vec<_>) = entries.into_iter().partition(|e| e.path().is_dir());
+
+        // 文件直接累加（无锁原子操作）
+        for f in &files {
+            if let Ok(meta) = f.path().metadata() {
+                total.fetch_add(meta.len(), Ordering::Relaxed);
+            }
+        }
+
+        // 子目录：每个起一个线程（可换成线程池限制并发）
+        let handles: Vec<_> = dirs
+            .into_iter()
+            .map(|d| {
+                let t = Arc::clone(&total);
+                let p = d.path();
+                thread::spawn(move || {
+                    let _ = walk_parallel(&p, t);
+                })
+            })
+            .collect();
+
+        for h in handles {
+            let _ = h.join();
+        }
+    } else {
+        if let Ok(meta) = path.metadata() {
+            total.fetch_add(meta.len(), Ordering::Relaxed);
+        }
+    }
+    Ok(())
+}

src-tauri/src/main.rs

@@ -1,6 +1,7 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
+mod cache;
 mod config;
 mod data;
 mod error;
@@ -26,6 +27,7 @@ use std::env;
 
 use tauri::{AppHandle, Manager};
 
+use crate::cache::calc_cache_size;
 use crate::config::{read_config_file, write_config_file};
 use crate::data::db::{delete_a_history_by_id, get_all_history, insert_a_history};
 use crate::error::LsarResult;
@@ -118,6 +120,7 @@ fn main() {
             parse_bilibili,
             parse_yy,
             get_player_paths,
+            calc_cache_size,
             #[cfg(windows)]
             set_titlebar_color_mode
         ])

src/commands/cache.ts

@@ -0,0 +1,5 @@
+import { invoke } from "@tauri-apps/api/core";
+
+export const calcCacheSize = (): Promise<string> => {
+  return invoke<string>("calc_cache_size");
+};

src/components/settings/components/BiliCookie/index.tsx

@@ -14,7 +14,7 @@ const BiliCookie = (props: BiliCookieProps) => {
       tips="不看 B 站直播无需配置此项。获取方法请自行搜索，互联网上教程很多。"
     >
       <LazyTextArea
-        rows={props.cookie ? 15 : 3}
+        rows={props.cookie ? 10 : 3}
         value={props.cookie}
         onChange={props.onChange}
       />

src/components/settings/components/Cache/index.css.ts

@@ -0,0 +1,7 @@
+import { style } from "@vanilla-extract/css";
+
+export const content = style({
+  display: "flex",
+  justifyContent: "space-between",
+  alignItems: "center",
+});

src/components/settings/components/Cache/index.tsx

@@ -0,0 +1,55 @@
+import { createResource, createSignal } from "solid-js";
+
+import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+
+import { calcCacheSize } from "~/commands/cache";
+
+import { LazyButton, LazyCaption1 } from "~/lazy";
+import SettingItem from "../SettingItem";
+
+import * as styles from "./index.css";
+
+const appWindow = getCurrentWebviewWindow();
+
+const Cache = () => {
+  const [cacheSize, { refetch }] = createResource(calcCacheSize);
+  const [clearing, setClearing] = createSignal(false);
+
+  const clearCache = async () => {
+    setClearing(true);
+    try {
+      await appWindow.clearAllBrowsingData();
+
+      const id = setTimeout(() => {
+        refetch();
+        clearTimeout(id);
+        setClearing(false);
+      }, 1000);
+    } catch {
+      setClearing(false);
+    }
+  };
+
+  return (
+    <SettingItem
+      label="缓存"
+      tips="每次启动应用后都会自动产生缓存，如果缓存过大可以手动清除。"
+    >
+      <div class={styles.content}>
+        <LazyCaption1>{cacheSize()}</LazyCaption1>
+
+        <LazyButton
+          size="small"
+          appearance="primary"
+          disabled={!cacheSize()}
+          isLoading={clearing()}
+          onClick={clearCache}
+        >
+          清除
+        </LazyButton>
+      </div>
+    </SettingItem>
+  );
+};
+
+export default Cache;

src/components/settings/components/SettingItem/index.css.ts

@@ -4,8 +4,6 @@ import type { FieldProps } from "fluent-solid";
 
 import { LazyField } from "~/lazy";
 
-import * as styles from "./index.css";
-
 interface SettingItemProps {
   label: string;
   children: JSX.Element;
@@ -22,7 +20,8 @@ const SettingItem = (props: SettingItemProps) => {
   return (
     <LazyField
       orientation={merged.orientation}
-      label={{ children: props.label, class: styles.label }}
+      // label={{ children: props.label, class: styles.label }}
+      label={props.label}
       validationMessage={merged.tips}
     >
       {props.children}

src/components/settings/components/SettingItem/index.tsx

@@ -9,6 +9,7 @@ import { Drawer } from "../drawer/Drawer";
 import DarkMode from "./components/DarkMode";
 import PlayerPath from "./components/PlayerPath";
 import BiliCookie from "./components/BiliCookie";
+import Cache from "./components/Cache";
 
 import { useToast } from "fluent-solid";
 import { useConfigContext } from "~/contexts/ConfigContext";
@@ -127,6 +128,8 @@ const Settings = () => {
           }
         />
 
+        <Cache />
+
         <div class={styles.buttons}>
           <LazyButton onClick={onCancel} disabled={!lsarConfig()?.player.path}>
             取消