fix: 修复了everything依赖项导致的arm编译失败的问题，添加了更多的条件编译内容

Author: ghost-him

src-tauri/Cargo.toml

@@ -109,7 +109,6 @@ bincode = "2.0.1"
 arboard = "3.6.1"
 zip = "6.0.0"
 whoami = "1.6.1"
-everything-rs = "0.1.10"
 blake3 = "1.8.2"
 
 [features]
@@ -124,3 +123,6 @@ ai = [
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-single-instance = { version = "2", features = ["deep-link"] }
+
+[target.'cfg(target_arch = "x86_64")'.dependencies]
+everything-rs = "0.1.10"

src-tauri/src/modules/everything/config.rs

@@ -1,3 +1,4 @@
+#[cfg(target_arch = "x86_64")]
 use everything_rs::EverythingSort;
 use parking_lot::RwLock;
 use serde::{Deserialize, Serialize};
@@ -36,7 +37,7 @@ impl EverythingConfigInner {
     }
 
     pub(crate) fn default_sort_method() -> EverythingSortKind {
-        EverythingSortKind::NameAscending
+        EverythingSortKind("NameAscending".to_string())
     }
 
     pub(crate) fn default_result_limit() -> usize {
@@ -58,7 +59,7 @@ impl EverythingConfigInner {
     pub fn to_partial(&self) -> PartialEverythingConfig {
         PartialEverythingConfig {
             sort_threshold: Some(self.sort_threshold),
-            sort_method: Some(self.sort_method),
+            sort_method: Some(self.sort_method.clone()),
             result_limit: Some(self.result_limit),
         }
     }
@@ -93,81 +94,48 @@ impl EverythingConfig {
     }
 
     pub fn get_sort_method(&self) -> EverythingSortKind {
-        self.inner.read().sort_method
+        self.inner.read().sort_method.clone()
     }
 
     pub fn get_result_limit(&self) -> usize {
         self.inner.read().result_limit
     }
 }
 
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-pub enum EverythingSortKind {
-    NameAscending,
-    NameDescending,
-    PathAscending,
-    PathDescending,
-    SizeAscending,
-    SizeDescending,
-    ExtensionAscending,
-    ExtensionDescending,
-    TypeNameAscending,
-    TypeNameDescending,
-    DateCreatedAscending,
-    DateCreatedDescending,
-    DateModifiedAscending,
-    DateModifiedDescending,
-    AttributesAscending,
-    AttributesDescending,
-    FileListFilenameAscending,
-    FileListFilenameDescending,
-    RunCountAscending,
-    RunCountDescending,
-    DateRecentlyChangedAscending,
-    DateRecentlyChangedDescending,
-    DateAccessedAscending,
-    DateAccessedDescending,
-    DateRunAscending,
-    DateRunDescending,
-}
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct EverythingSortKind(String);
 
+#[cfg(target_arch = "x86_64")]
 impl From<EverythingSortKind> for EverythingSort {
     fn from(kind: EverythingSortKind) -> Self {
-        match kind {
-            EverythingSortKind::NameAscending => EverythingSort::NameAscending,
-            EverythingSortKind::NameDescending => EverythingSort::NameDescending,
-            EverythingSortKind::PathAscending => EverythingSort::PathAscending,
-            EverythingSortKind::PathDescending => EverythingSort::PathDescending,
-            EverythingSortKind::SizeAscending => EverythingSort::SizeAscending,
-            EverythingSortKind::SizeDescending => EverythingSort::SizeDescending,
-            EverythingSortKind::ExtensionAscending => EverythingSort::ExtensionAscending,
-            EverythingSortKind::ExtensionDescending => EverythingSort::ExtensionDescending,
-            EverythingSortKind::TypeNameAscending => EverythingSort::TypeNameAscending,
-            EverythingSortKind::TypeNameDescending => EverythingSort::TypeNameDescending,
-            EverythingSortKind::DateCreatedAscending => EverythingSort::DateCreatedAscending,
-            EverythingSortKind::DateCreatedDescending => EverythingSort::DateCreatedDescending,
-            EverythingSortKind::DateModifiedAscending => EverythingSort::DateModifiedAscending,
-            EverythingSortKind::DateModifiedDescending => EverythingSort::DateModifiedDescending,
-            EverythingSortKind::AttributesAscending => EverythingSort::AttributesAscending,
-            EverythingSortKind::AttributesDescending => EverythingSort::AttributesDescending,
-            EverythingSortKind::FileListFilenameAscending => {
-                EverythingSort::FileListFilenameAscending
-            }
-            EverythingSortKind::FileListFilenameDescending => {
-                EverythingSort::FileListFilenameDescending
-            }
-            EverythingSortKind::RunCountAscending => EverythingSort::RunCountAscending,
-            EverythingSortKind::RunCountDescending => EverythingSort::RunCountDescending,
-            EverythingSortKind::DateRecentlyChangedAscending => {
-                EverythingSort::DateRecentlyChangedAscending
-            }
-            EverythingSortKind::DateRecentlyChangedDescending => {
-                EverythingSort::DateRecentlyChangedDescending
-            }
-            EverythingSortKind::DateAccessedAscending => EverythingSort::DateAccessedAscending,
-            EverythingSortKind::DateAccessedDescending => EverythingSort::DateAccessedDescending,
-            EverythingSortKind::DateRunAscending => EverythingSort::DateRunAscending,
-            EverythingSortKind::DateRunDescending => EverythingSort::DateRunDescending,
+        match kind.0.as_str() {
+            "NameAscending" => EverythingSort::NameAscending,
+            "NameDescending" => EverythingSort::NameDescending,
+            "PathAscending" => EverythingSort::PathAscending,
+            "PathDescending" => EverythingSort::PathDescending,
+            "SizeAscending" => EverythingSort::SizeAscending,
+            "SizeDescending" => EverythingSort::SizeDescending,
+            "ExtensionAscending" => EverythingSort::ExtensionAscending,
+            "ExtensionDescending" => EverythingSort::ExtensionDescending,
+            "TypeNameAscending" => EverythingSort::TypeNameAscending,
+            "TypeNameDescending" => EverythingSort::TypeNameDescending,
+            "DateCreatedAscending" => EverythingSort::DateCreatedAscending,
+            "DateCreatedDescending" => EverythingSort::DateCreatedDescending,
+            "DateModifiedAscending" => EverythingSort::DateModifiedAscending,
+            "DateModifiedDescending" => EverythingSort::DateModifiedDescending,
+            "AttributesAscending" => EverythingSort::AttributesAscending,
+            "AttributesDescending" => EverythingSort::AttributesDescending,
+            "FileListFilenameAscending" => EverythingSort::FileListFilenameAscending,
+            "FileListFilenameDescending" => EverythingSort::FileListFilenameDescending,
+            "RunCountAscending" => EverythingSort::RunCountAscending,
+            "RunCountDescending" => EverythingSort::RunCountDescending,
+            "DateRecentlyChangedAscending" => EverythingSort::DateRecentlyChangedAscending,
+            "DateRecentlyChangedDescending" => EverythingSort::DateRecentlyChangedDescending,
+            "DateAccessedAscending" => EverythingSort::DateAccessedAscending,
+            "DateAccessedDescending" => EverythingSort::DateAccessedDescending,
+            "DateRunAscending" => EverythingSort::DateRunAscending,
+            "DateRunDescending" => EverythingSort::DateRunDescending,
+            _ => EverythingSort::NameAscending, // 默认值
         }
     }
 }

src-tauri/src/modules/everything/mod.rs

@@ -1,5 +1,7 @@
+use crate::modules::everything::config::EverythingSortKind;
 use crate::utils::defer::defer;
-use everything_rs::{Everything, EverythingRequestFlags, EverythingSort};
+#[cfg(target_arch = "x86_64")]
+use everything_rs::{Everything, EverythingRequestFlags};
 use parking_lot::RwLock;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
@@ -22,7 +24,7 @@ pub struct EverythingManagerInner {
     // 排序阈值
     pub sort_threshold: usize,
     // 排序方式
-    pub sort_method: EverythingSort,
+    pub sort_method: EverythingSortKind,
     // 结果限制
     pub result_limit: usize,
 }
@@ -38,14 +40,14 @@ impl EverythingManagerInner {
         Self {
             is_searching: AtomicBool::new(false),
             sort_threshold: EverythingConfig::default().get_sort_threshold(),
-            sort_method: EverythingConfig::default().get_sort_method().into(),
+            sort_method: EverythingConfig::default().get_sort_method().clone(),
             result_limit: EverythingConfig::default().get_result_limit(),
         }
     }
 
     pub fn load_from_config(&mut self, config: Arc<EverythingConfig>) {
         self.sort_threshold = config.get_sort_threshold();
-        self.sort_method = config.get_sort_method().into();
+        self.sort_method = config.get_sort_method().clone();
         self.result_limit = config.get_result_limit();
     }
 
@@ -68,27 +70,35 @@ impl EverythingManagerInner {
             return Ok(Vec::new());
         }
 
-        let everything = Everything::new();
-        everything.set_search(query);
-        // FullPathAndFileName 已经包含完整路径和文件名（包括扩展名）
-        everything.set_request_flags(EverythingRequestFlags::FullPathAndFileName);
-        everything.set_max_results(self.result_limit as u32);
+        // 这里允许使用无更改的mut，因为对于arm64架构来说，everything.rs并不支持
+        #[allow(unused_mut)]
+        let mut results = Vec::new();
 
-        // Use sort_threshold from config
-        if query.len() >= self.sort_threshold {
-            everything.set_sort(self.sort_method);
+        #[cfg(target_arch = "x86_64")]
+        {
+            // 如果启用了everything集成，则使用everything进行搜索，否则就对results无处理
+            let everything = Everything::new();
+            everything.set_search(query);
+            // FullPathAndFileName 已经包含完整路径和文件名（包括扩展名）
+            everything.set_request_flags(EverythingRequestFlags::FullPathAndFileName);
+            everything.set_max_results(self.result_limit as u32);
+
+            // Use sort_threshold from config
+            if query.len() >= self.sort_threshold {
+                everything.set_sort(self.sort_method.clone().into());
+            }
+
+            everything
+                .query()
+                .map_err(|e| format!("Everything query failed: {:?}", e))?;
+
+            for path in everything.full_path_iter().flatten() {
+                let hash = blake3::hash(path.as_bytes());
+                let id: u64 = u64::from_le_bytes(hash.as_bytes()[0..8].try_into().unwrap());
+                results.push(EverythingSearchResult { id, path });
+            }
         }
 
-        everything
-            .query()
-            .map_err(|e| format!("Everything query failed: {:?}", e))?;
-
-        let mut results = Vec::new();
-        for path in everything.full_path_iter().flatten() {
-            let hash = blake3::hash(path.as_bytes());
-            let id: u64 = u64::from_le_bytes(hash.as_bytes()[0..8].try_into().unwrap());
-            results.push(EverythingSearchResult { id, path });
-        }
         Ok(results)
     }