From 420b0a254a1c4e26fb668087c003d54178123e94 Mon Sep 17 00:00:00 2001
From: Tunglies <tunglies.dev@outlook.com>
Date: Tue, 20 May 2025 22:58:05 +0800
Subject: [PATCH] feat: add formatting command to package.json and update
 pre-commit hook for cargo fmt

---
 .husky/pre-commit                                           | 6 ++++--
 package.json                                                | 1 +
 src-tauri/src_crates/crate_mihomo_api/src/lib.rs            | 3 ++-
 src-tauri/src_crates/crate_mihomo_api/src/model.rs          | 5 ++---
 .../src_crates/crate_mihomo_api/tests/test_mihomo_api.rs    | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.husky/pre-commit b/.husky/pre-commit
index 2ece9cdd..97749242 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -3,14 +3,16 @@
 #pnpm pretty-quick --staged
 
 # 运行 clippy fmt
-cargo fmt --manifest-path ./src-tauri/Cargo.toml
+cd src-tauri
+cargo fmt
 
 if [ $? -ne 0 ]; then
     echo "rustfmt failed to format the code. Please fix the issues and try again."
     exit 1
 fi
+cd ..
 
-#git add .
+git add .
 
 # 允许提交
 exit 0
diff --git a/package.json b/package.json
index 1afe89c6..b4cb7885 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "release-version": "node scripts/release_version.mjs",
     "release-alpha-version": "node scripts/release-alpha_version.mjs",
     "prepare": "husky",
+    "fmt": "cargo fmt --manifest-path ./src-tauri/Cargo.toml",
     "clippy": "cargo clippy  --manifest-path ./src-tauri/Cargo.toml"
   },
   "dependencies": {
diff --git a/src-tauri/src_crates/crate_mihomo_api/src/lib.rs b/src-tauri/src_crates/crate_mihomo_api/src/lib.rs
index 6d8745a9..e1c92bbe 100644
--- a/src-tauri/src_crates/crate_mihomo_api/src/lib.rs
+++ b/src-tauri/src_crates/crate_mihomo_api/src/lib.rs
@@ -58,7 +58,8 @@ impl MihomoManager {
         url: String,
         data: Option<serde_json::Value>,
     ) -> Result<serde_json::Value, String> {
-        let client_response = self.client
+        let client_response = self
+            .client
             .request(method.clone(), &url)
             .json(&data.unwrap_or(json!({})))
             .send()
diff --git a/src-tauri/src_crates/crate_mihomo_api/src/model.rs b/src-tauri/src_crates/crate_mihomo_api/src/model.rs
index f5ed1122..fbc4c862 100644
--- a/src-tauri/src_crates/crate_mihomo_api/src/model.rs
+++ b/src-tauri/src_crates/crate_mihomo_api/src/model.rs
@@ -1,4 +1,4 @@
-use std::sync::{Arc, Mutex}; 
+use std::sync::{Arc, Mutex};
 
 pub struct MihomoData {
     pub(crate) proxies: serde_json::Value,
@@ -24,5 +24,4 @@ impl Drop for MihomoManager {
     fn drop(&mut self) {
         println!("Dropping MihomoManager");
     }
-    
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src_crates/crate_mihomo_api/tests/test_mihomo_api.rs b/src-tauri/src_crates/crate_mihomo_api/tests/test_mihomo_api.rs
index 80137d22..9ef272ca 100644
--- a/src-tauri/src_crates/crate_mihomo_api/tests/test_mihomo_api.rs
+++ b/src-tauri/src_crates/crate_mihomo_api/tests/test_mihomo_api.rs
@@ -26,4 +26,4 @@ async fn test_refresh_providers_proxies() {
     let providers = manager.get_providers_proxies();
     assert_eq!(proxies, serde_json::Value::Null);
     assert_ne!(providers, serde_json::Value::Null);
-}
\ No newline at end of file
+}