0.15.1: 修复返回空字符串的bug && 优化客户端hover说明 && 随键入自动搜索

Author: Vanilla-Beauty

app/search-files-app/package-lock.json

@@ -7,7 +7,7 @@
     "@testing-library/react": "^13.4.0",
     "bootstrap": "^5.3.3",
     "react": "^18.3.1",
-    "react-bootstrap": "^2.10.4",
+    "react-bootstrap": "^2.10.5",
     "react-dom": "^18.3.1",
     "react-scripts": "5.0.1",
     "web-vitals": "^2.1.4"

app/search-files-app/package.json

@@ -135,8 +135,8 @@ fn main() {
                 .max_file_size(50_000 /* bytes */)
                 .target(tauri_plugin_log::Target::new(
                     tauri_plugin_log::TargetKind::Folder {
-                        path: PathBuf::from("."),
-                        file_name: Some("search_file_app".to_string()),
+                        path: PathBuf::from("./log"),
+                        file_name: Some("./search_file_app".to_string()),
                     },
                 ))
                 .rotation_strategy(tauri_plugin_log::RotationStrategy::KeepAll)

app/search-files-app/src-tauri/src/main.rs

@@ -44,7 +44,7 @@
   },
   "productName": "search-files-app",
   "mainBinaryName": "search-files-app",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "identifier": "com.file.efl.toni",
   "plugins": {
     "cli": {

app/search-files-app/src-tauri/tauri.conf.json

@@ -5,11 +5,9 @@ import ResultItem from './ResultItem.js';
 
 const ResultsList = ({ results, addMessage }) => {
     // 移除了模态相关的状态和处理函数
-
+    console.log("results: ", results);
     return (
         <>
-            {/* 移除了展示模态按钮 */}
-
             <ListGroup style={{ maxHeight: '400px', overflowY: 'auto' }}>
                 {results.map((result, index) => (
                     <ResultItem key={index} result={result} addMessage={addMessage} />

app/search-files-app/src/elements/ResultsList.js

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef } from 'react';
-import { Form, Button, Container, Row, Col } from 'react-bootstrap';
+import { Form, Button, Container, Row, Col, Tooltip, OverlayTrigger } from 'react-bootstrap';
 import ResultsList from './ResultsList.js';
 import NotificationToast from './NotificationToast.js';
 import HelpBar from './Help.js';
@@ -26,10 +26,15 @@ const SearchForm = () => {
 
     useEffect(() => {
         setResults([]);
-
         focusInput();
     }, []);
 
+    useEffect(() => {
+        if (entry && !isSmart) {
+            handleSearch();
+        }
+    }, [entry, isFuzzy, isRegex, isSmart]);
+
     const handleSearch = async () => {
         setResults([]);
         const invoke = window.__TAURI__.core.invoke;
@@ -56,7 +61,6 @@ const SearchForm = () => {
         }
     };
 
-
     const addMessage = (msg) => {
         setMessage(msg);
         setShowToast(true);
@@ -79,38 +83,39 @@ const SearchForm = () => {
                                 onChange={(e) => setEntry(e.target.value)}
                                 ref={inputRef} // 绑定引用
                                 placeholder="Enter your search query"
-                                onKeyDown={(e) => {
-                                    if (e.key === 'Enter') {
-                                        e.preventDefault(); // 阻止默认行为，避免清空输入框
-                                        console.log('Enter pressed');
-                                        handleSearch();
-                                    }
-                                }}
                             />
                         </Form.Group>
                         <br />
                         <div className="d-flex align-items-center gap-3">
-                            <Form.Check
-                                type="checkbox"
-                                label="Fuzzy"
-                                checked={isFuzzy}
-                                onChange={(e) => setIsFuzzy(e.target.checked)}
-                            />
-                            <Form.Check
-                                type="checkbox"
-                                label="Regex"
-                                checked={isRegex}
-                                onChange={(e) => setIsRegex(e.target.checked)}
-                            />
-                            <Form.Check
-                                type="checkbox"
-                                label="Smart Mode"
-                                checked={isSmart}
-                                onChange={(e) => setIsSmart(e.target.checked)}
-                            />
+                            <OverlayTrigger placement="bottom" overlay={<Tooltip>Fuzzy search enables partial matches.</Tooltip>}>
+                                <Form.Check
+                                    type="checkbox"
+                                    label="Fuzzy"
+                                    checked={isFuzzy}
+                                    onChange={(e) => setIsFuzzy(e.target.checked)}
+                                />
+                            </OverlayTrigger>
+
+                            <OverlayTrigger placement="bottom" overlay={<Tooltip>Regex search enables regex matches and it will add .* in both ends</Tooltip>}>
+                                <Form.Check
+                                    type="checkbox"
+                                    label="Regex"
+                                    checked={isRegex}
+                                    onChange={(e) => setIsRegex(e.target.checked)}
+                                />
+                            </OverlayTrigger>
+
+                            <OverlayTrigger placement="bottom" overlay={<Tooltip>Smart search search entries in hot dirs which are not cached. It costs more resoureces so it will not raise auto search unless you press the button</Tooltip>}>
+                                <Form.Check
+                                    type="checkbox"
+                                    label="Smart Mode"
+                                    checked={isSmart}
+                                    onChange={(e) => setIsSmart(e.target.checked)}
+                                />
+                            </OverlayTrigger>
+
                             <HelpBar></HelpBar>
-                            <ConfigBar></ConfigBar
-                            >
+                            <ConfigBar></ConfigBar>
                             <Button variant="primary" type="button" className="ms-auto"
                                 onClick={handleSearch}>
                                 Search

app/search-files-app/src/elements/SearchForm.js

@@ -115,7 +115,7 @@ impl TrieNode {
 
         // 如果当前节点的名称与目标名称相匹配，将当前节点的路径加入结果
 
-        if pattern_match(&self.entry_name, entry_name, is_fuzzy) {
+        if !self.entry_name.is_empty() && pattern_match(&self.entry_name, entry_name, is_fuzzy) {
             results.push(self.full_path.clone());
         }
 

src/cache/trie.rs

@@ -14,6 +14,9 @@ use crate::{
 
 pub fn api_search(entry: String, is_fuzzy: bool) -> Vec<(String, bool)> {
     debug!("search: entry({}), is_fuzzy({})", entry, is_fuzzy);
+    if entry.is_empty() {
+        return Vec::new();
+    }
     let guard = CACHER.lock().unwrap(); // 使用 mut 解锁后可以释放锁
     let res = guard.search_entry(&entry, is_fuzzy);
 
@@ -48,6 +51,13 @@ pub fn api_search(entry: String, is_fuzzy: bool) -> Vec<(String, bool)> {
 }
 
 pub fn api_hot_search(entry: String, is_fuzzy: bool, is_regex: bool) -> Vec<(String, bool)> {
+    debug!(
+        "hot_search: entry({}), is_fuzzy({}), is_regex({})",
+        entry, is_fuzzy, is_regex
+    );
+    if entry.is_empty() {
+        return Vec::new();
+    }
     let res = search_files_from_hot_dirs(&entry, is_fuzzy, is_regex);
 
     let mut cache_guard = CACHER.lock().unwrap();
@@ -70,7 +80,9 @@ pub fn api_hot_search(entry: String, is_fuzzy: bool, is_regex: bool) -> Vec<(Str
 
 pub fn api_regex_search(path: String) -> Vec<(String, bool)> {
     debug!("regex_search: entry({})", path);
-
+    if path.is_empty() {
+        return Vec::new();
+    }
     let guard = CACHER.lock().unwrap(); // 使用 mut 解锁后可以释放锁
     let res = guard.search_path_regex(&path);
 
@@ -119,3 +131,23 @@ pub fn api_unstar_path(path_data: String) -> bool {
         Err(_) => false,
     }
 }
+
+#[allow(unused)]
+mod tests {
+    use super::*;
+    use crate::{cache::cache::init_trie, db::SqliteDatabase};
+    use std::sync::{Arc, Mutex};
+
+    #[test]
+    fn test_search() {
+        let raw_db = SqliteDatabase::new(&PathBuf::from(
+            "C:\\Users\\toni\\AppData\\Local\\search-files-app\\sqlite3.db",
+        ))
+        .unwrap();
+        let db = Arc::new(Mutex::new(raw_db));
+        init_trie((db));
+
+        let res = api_search("小论文".to_string(), false);
+        println!("{:?}", res)
+    }
+}

src/server/api.rs

@@ -13,16 +13,21 @@ use std::os::windows::ffi::OsStringExt;
 #[cfg(target_os = "windows")]
 use winapi::um::fileapi::GetLogicalDriveStringsW;
 
-/// 模糊匹配
+/// 匹配
 pub fn pattern_match(entry: &str, pattern: &str, is_fuzzy: bool) -> bool {
     let entry_l = entry.to_lowercase();
     let pattern_l = pattern.to_lowercase();
+
+    // 只取前缀部分进行匹配
+    let entry_prefix: String = entry_l.chars().take(pattern_l.chars().count()).collect();
+    let pattern_prefix: String = pattern_l.chars().take(entry_l.chars().count()).collect();
+
     if is_fuzzy {
         // 设定一个模糊匹配的阈值，比如距离小于等于2
         let threshold = 2;
-        levenshtein(&entry_l, &pattern_l) <= threshold
+        levenshtein(&entry_prefix, &pattern_prefix) <= threshold
     } else {
-        entry_l == pattern_l
+        entry_prefix == pattern_prefix
     }
 }