diff --git a/src-tauri/src/handlers/app.rs b/src-tauri/src/handlers/app.rs index 40192ea..2862ab9 100644 --- a/src-tauri/src/handlers/app.rs +++ b/src-tauri/src/handlers/app.rs @@ -1,5 +1,5 @@ -use crate::{handlers::server::get_json_server_url, models::app::{AppDetail, AppItem}, utils::{format_icon_url, UA}}; - +use crate::{handlers::server::get_json_server_url, models::app::{AppDetail, AppItem}, utils::UA}; +use crate::utils::format::format_icon_url; use super::category::get_all_apps; #[tauri::command] diff --git a/src-tauri/src/handlers/category.rs b/src-tauri/src/handlers/category.rs index f8571bc..3127bfb 100644 --- a/src-tauri/src/handlers/category.rs +++ b/src-tauri/src/handlers/category.rs @@ -1,4 +1,5 @@ -use crate::{models::category::Category, utils::format_icon_url}; +use crate::models::category::Category; +use crate::utils::format::format_icon_url; use crate::models::app::AppItem; use crate::utils::UA; use super::server::get_json_server_url; diff --git a/src-tauri/src/handlers/home.rs b/src-tauri/src/handlers/home.rs index 564cc93..272b579 100644 --- a/src-tauri/src/handlers/home.rs +++ b/src-tauri/src/handlers/home.rs @@ -1,6 +1,7 @@ use crate::handlers::server::get_img_server_url; use crate::models::home::{HomeLink, HomeList, HomeListApp}; -use crate::utils::{format_icon_url, UA}; +use crate::utils::UA; +use crate::utils::format::format_icon_url; use super::server::get_json_server_url; #[tauri::command] diff --git a/src-tauri/src/utils/download_manager.rs b/src-tauri/src/utils/download_manager.rs index 6730161..ac77bc6 100644 --- a/src-tauri/src/utils/download_manager.rs +++ b/src-tauri/src/utils/download_manager.rs @@ -6,9 +6,9 @@ use std::sync::Arc; use std::net::TcpListener; use crate::models::download::{DownloadTask, DownloadTaskResponse, InstallStatus, InstallTask, ResponseStatus}; use crate::handlers::server::get_json_server_url; -use crate::utils::{format_icon_url, UA, aria2::Aria2Client}; +use crate::utils::{UA, aria2::Aria2Client}; -use super::format::{format_size, format_speed}; +use super::format::{format_size, format_speed, format_icon_url}; pub struct DownloadManager { download_queue: Mutex>, @@ -16,7 +16,7 @@ pub struct DownloadManager { aria2_started: Arc, aria2_port: Arc>, aria2_pid: Arc>>, - installing: Arc, // 新增:标记是否有正在安装的任务 + installing: Arc, } impl DownloadManager { diff --git a/src-tauri/src/utils/format.rs b/src-tauri/src/utils/format.rs index 4aa07e7..8d26ffb 100644 --- a/src-tauri/src/utils/format.rs +++ b/src-tauri/src/utils/format.rs @@ -1,3 +1,5 @@ +use crate::handlers::server::get_img_server_url; + // 格式化文件大小 pub fn format_size(size: u64) -> String { const KB: u64 = 1024; @@ -18,4 +20,8 @@ pub fn format_size(size: u64) -> String { // 格式化下载速度 pub fn format_speed(speed: u64) -> String { format!("{}/s", format_size(speed)) +} + +pub fn format_icon_url(category: &str, pkgname: &str) -> String { + format!("{}{}/{}/icon.png", get_img_server_url(), category, pkgname) } \ No newline at end of file diff --git a/src-tauri/src/utils/mod.rs b/src-tauri/src/utils/mod.rs index b9c2960..d714d6d 100644 --- a/src-tauri/src/utils/mod.rs +++ b/src-tauri/src/utils/mod.rs @@ -1,5 +1,3 @@ -use crate::handlers::server::get_img_server_url; - pub mod search; pub mod download_manager; pub mod aria2; @@ -10,8 +8,4 @@ pub const UA: &str = concat!("Spark-Store/", env!("CARGO_PKG_VERSION")); #[tauri::command] pub fn get_user_agent() -> String { UA.into() -} - -pub fn format_icon_url(category: &str, pkgname: &str) -> String { - format!("{}{}/{}/icon.png", get_img_server_url(), category, pkgname) } \ No newline at end of file