chore: rename clash-meta to mihomo

libnyanpasu · Dec 12, 2023 · 072b3f6 · 072b3f6
1 parent 6215531
commit 072b3f6
Show file tree

Hide file tree

Showing 10 changed files with 79 additions and 17 deletions.
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/tauri/Cargo.toml b/backend/tauri/Cargo.toml
@@ -37,7 +37,7 @@ parking_lot = "0.12.0"
 tokio = { version = "1", features = ["full"] }
 serde = { version = "1.0", features = ["derive"] }
 reqwest = { version = "0.11", features = ["json", "rustls-tls"] }
-tauri = { version = "1.5.3", features = [
+tauri = { version = "1.5.3", features = [ "os-all",
   "global-shortcut-all",
   "notification-all",
   "process-all",

diff --git a/backend/tauri/src/config/verge.rs b/backend/tauri/src/config/verge.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
 pub enum ClashCore {
-    #[serde(rename = "clash-premium", alias = "clash")]
+    #[serde(rename = "clash", alias = "clash-premium")]
     ClashPremium,
     #[serde(rename = "clash-rs")]
     ClashRs,
@@ -27,7 +27,7 @@ impl Default for ClashCore {
 impl From<ClashCore> for String {
     fn from(core: ClashCore) -> Self {
         match core {
-            ClashCore::ClashPremium => "clash-premium".into(),
+            ClashCore::ClashPremium => "clash".into(),
             ClashCore::ClashRs => "clash-rs".into(),
             ClashCore::Mihomo => "mihomo".into(),
             ClashCore::MihomoAlpha => "mihomo-alpha".into(),
@@ -38,7 +38,7 @@ impl From<ClashCore> for String {
 impl std::fmt::Display for ClashCore {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            ClashCore::ClashPremium => write!(f, "clash-premium"),
+            ClashCore::ClashPremium => write!(f, "clash"),
             ClashCore::ClashRs => write!(f, "clash-rs"),
             ClashCore::Mihomo => write!(f, "mihomo"),
             ClashCore::MihomoAlpha => write!(f, "mihomo-alpha"),

diff --git a/backend/tauri/src/core/core.rs b/backend/tauri/src/core/core.rs
@@ -57,18 +57,18 @@ impl CoreManager {
         let config_path = dirs::path_to_str(&config_path)?;
 
         let clash_core = { Config::verge().latest().clash_core.clone() };
-        let clash_core = clash_core.unwrap_or(ClashCore::ClashPremium);
+        let clash_core = clash_core.unwrap_or(ClashCore::ClashPremium).to_string();
 
         let app_dir = dirs::app_home_dir()?;
         let app_dir = dirs::path_to_str(&app_dir)?;
-
+        log::debug!(target: "app", "check config in `{clash_core}`");
         let output = Command::new_sidecar(clash_core)?
             .args(["-t", "-d", app_dir, "-f", config_path])
             .output()?;
 
         if !output.status.success() {
             let error = clash_api::parse_check_output(output.stdout.clone());
-            let error = match error.len() > 0 {
+            let error = match !error.is_empty() {
                 true => error,
                 false => output.stdout.clone(),
             };

diff --git a/backend/tauri/src/utils/resolve.rs b/backend/tauri/src/utils/resolve.rs
@@ -281,6 +281,7 @@ pub fn save_window_state(app_handle: &AppHandle, save_to_file: bool) -> Result<(
 // TODO: use enum instead
 pub fn resolve_core_version(core_type: &ClashCore) -> Result<String> {
     let core = core_type.clone().to_string();
+    log::debug!(target: "app", "check config in `{core}`");
     let cmd = match core_type {
         ClashCore::ClashPremium | ClashCore::Mihomo | ClashCore::MihomoAlpha => {
             Command::new_sidecar(core)?.args(["-v"])

diff --git a/backend/tauri/tauri.conf.json b/backend/tauri/tauri.conf.json
@@ -25,18 +25,22 @@
         "icons/icon-new.icns",
         "icons/icon.ico"
       ],
-      "resources": ["resources"],
+      "resources": [
+        "resources"
+      ],
       "externalBin": [
         "sidecar/clash",
-        "sidecar/clash-meta",
+        "sidecar/mihomo",
         "sidecar/clash-rs"
       ],
       "copyright": "© 2022 zzzgydi All Rights Reserved",
       "category": "DeveloperTool",
       "shortDescription": "Clash Nyanpasu! (∠・ω< )⌒☆",
       "longDescription": "Clash Nyanpasu! (∠・ω< )⌒☆",
       "deb": {
-        "depends": ["openssl"]
+        "depends": [
+          "openssl"
+        ]
       },
       "macOS": {
         "frameworks": [],
@@ -50,7 +54,11 @@
         "digestAlgorithm": "sha256",
         "timestampUrl": "",
         "wix": {
-          "language": ["zh-CN", "en-US", "ru-RU"]
+          "language": [
+            "zh-CN",
+            "en-US",
+            "ru-RU"
+          ]
         }
       }
     },
@@ -79,6 +87,9 @@
       },
       "notification": {
         "all": true
+      },
+      "os": {
+        "all": true
       }
     },
     "windows": [],

diff --git a/scripts/check.ts b/scripts/check.ts
@@ -196,8 +196,8 @@ function clashMeta(): BinInfo {
   const tmpFile = `${name}-${META_VERSION}.${urlExt}`;
 
   return {
-    name: "clash-meta",
-    targetFile: `clash-meta-${SIDECAR_HOST}${isWin ? ".exe" : ""}`,
+    name: "mihomo",
+    targetFile: `mihomo-${SIDECAR_HOST}${isWin ? ".exe" : ""}`,
     exeFile,
     tmpFile,
     downloadURL,
@@ -418,7 +418,7 @@ const resolveEnableLoopback = () =>
 const tasks = [
   { name: "clash", func: () => resolveClash(), retry: 5 },
   {
-    name: "clash-meta",
+    name: "mihomo",
     func: () => getLatestVersion().then(() => resolveSidecar(clashMeta())),
     retry: 5,
   },

diff --git a/scripts/portable.ts b/scripts/portable.ts
@@ -20,7 +20,7 @@ async function resolvePortable() {
 
   zip.addLocalFile(path.join(releaseDir, "Clash Nyanpasu.exe"));
   zip.addLocalFile(path.join(releaseDir, "clash.exe"));
-  zip.addLocalFile(path.join(releaseDir, "clash-meta.exe"));
+  zip.addLocalFile(path.join(releaseDir, "mihomo.exe"));
   zip.addLocalFile(path.join(releaseDir, "clash-rs.exe"));
   zip.addLocalFolder(path.join(releaseDir, "resources"), "resources");
 

diff --git a/src/components/layout/layout-traffic.tsx b/src/components/layout/layout-traffic.tsx
@@ -47,7 +47,7 @@ export const LayoutTraffic = () => {
   }, [clashInfo, pageVisible]);
 
   /* --------- meta memory information --------- */
-  const isMetaCore = verge?.clash_core === "clash-meta";
+  const isMetaCore = verge?.clash_core === "mihomo";
   const displayMemory = isMetaCore && (verge?.enable_memory_usage ?? true);
 
   const memoryWs = useWebsocket(

diff --git a/src/services/types.d.ts b/src/services/types.d.ts
@@ -155,7 +155,7 @@ interface IProfilesConfig {
 interface IVergeConfig {
   app_log_level?: "trace" | "debug" | "info" | "warn" | "error" | string;
   language?: string;
-  clash_core?: string;
+  clash_core?: "mihomo" | "mihomo-alpha" | "clash-rs" | "clash";
   theme_mode?: "light" | "dark" | "system";
   theme_blur?: boolean;
   traffic_graph?: boolean;