From 6b349eda4585a14d1d63d5e717f06c6866f7044a Mon Sep 17 00:00:00 2001
From: huzibaca <masterorigin91@gmail.com>
Date: Tue, 31 Dec 2024 11:11:29 +0800
Subject: [PATCH] chore: update

---
 src-tauri/src/core/clash_api.rs       |  6 +++++
 src-tauri/src/core/tray/mod.rs        |  4 +--
 src-tauri/src/core/tray/speed_rate.rs | 35 +++++++++------------------
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/src-tauri/src/core/clash_api.rs b/src-tauri/src/core/clash_api.rs
index 5cad9130..68282599 100644
--- a/src-tauri/src/core/clash_api.rs
+++ b/src-tauri/src/core/clash_api.rs
@@ -5,6 +5,12 @@ use serde::{Deserialize, Serialize};
 use serde_yaml::Mapping;
 use std::collections::HashMap;
 
+#[derive(Debug, Clone, Default, PartialEq)]
+pub struct Rate {
+    pub up: u64,
+    pub down: u64,
+}
+
 /// PUT /configs
 /// path 是绝对路径
 pub async fn put_configs(path: &str) -> Result<()> {
diff --git a/src-tauri/src/core/tray/mod.rs b/src-tauri/src/core/tray/mod.rs
index 763979dc..55fab91f 100644
--- a/src-tauri/src/core/tray/mod.rs
+++ b/src-tauri/src/core/tray/mod.rs
@@ -1,6 +1,7 @@
 use once_cell::sync::OnceCell;
-
+#[cfg(target_os = "macos")]
 pub mod speed_rate;
+use crate::core::clash_api::Rate;
 use crate::utils::dirs;
 use crate::{
     cmds,
@@ -15,7 +16,6 @@ use futures::StreamExt;
 use parking_lot::Mutex;
 #[cfg(target_os = "macos")]
 use parking_lot::RwLock;
-use speed_rate::Rate;
 #[cfg(target_os = "macos")]
 pub use speed_rate::{SpeedRate, Traffic};
 #[cfg(target_os = "macos")]
diff --git a/src-tauri/src/core/tray/speed_rate.rs b/src-tauri/src/core/tray/speed_rate.rs
index 92896397..c9ad6fb9 100644
--- a/src-tauri/src/core/tray/speed_rate.rs
+++ b/src-tauri/src/core/tray/speed_rate.rs
@@ -1,31 +1,20 @@
-#[cfg(target_os = "macos")]
-use {
-    crate::core::clash_api::get_traffic_ws_url,
-    crate::utils::help::format_bytes_speed,
-    anyhow::Result,
-    futures::Stream,
-    image::{ImageBuffer, Rgba},
-    imageproc::drawing::draw_text_mut,
-    parking_lot::Mutex,
-    rusttype::{Font, Scale},
-    std::io::Cursor,
-    std::sync::Arc,
-    tokio_tungstenite::tungstenite::Message,
-};
+use crate::core::clash_api::{get_traffic_ws_url, Rate};
+use crate::utils::help::format_bytes_speed;
+use anyhow::Result;
+use futures::Stream;
+use image::{ImageBuffer, Rgba};
+use imageproc::drawing::draw_text_mut;
+use parking_lot::Mutex;
+use rusttype::{Font, Scale};
+use std::io::Cursor;
+use std::sync::Arc;
+use tokio_tungstenite::tungstenite::Message;
 
-#[derive(Debug, Clone, Default, PartialEq)]
-pub struct Rate {
-    pub up: u64,
-    pub down: u64,
-}
-
-#[cfg(target_os = "macos")]
 #[derive(Debug, Clone)]
 pub struct SpeedRate {
     rate: Arc<Mutex<(Rate, Rate)>>,
 }
 
-#[cfg(target_os = "macos")]
 impl SpeedRate {
     pub fn new() -> Self {
         Self {
@@ -142,14 +131,12 @@ impl SpeedRate {
     }
 }
 
-#[cfg(target_os = "macos")]
 #[derive(Debug, Clone)]
 pub struct Traffic {
     pub up: u64,
     pub down: u64,
 }
 
-#[cfg(target_os = "macos")]
 impl Traffic {
     pub async fn get_traffic_stream() -> Result<impl Stream<Item = Result<Traffic, anyhow::Error>>>
     {