🎨 改进结构

This commit is contained in:
柚子
2025-03-04 16:21:59 +08:00
parent a8fc79feaf
commit 919a62ee60
6 changed files with 15 additions and 13 deletions

View File

@@ -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; use super::category::get_all_apps;
#[tauri::command] #[tauri::command]

View File

@@ -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::models::app::AppItem;
use crate::utils::UA; use crate::utils::UA;
use super::server::get_json_server_url; use super::server::get_json_server_url;

View File

@@ -1,6 +1,7 @@
use crate::handlers::server::get_img_server_url; use crate::handlers::server::get_img_server_url;
use crate::models::home::{HomeLink, HomeList, HomeListApp}; 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; use super::server::get_json_server_url;
#[tauri::command] #[tauri::command]

View File

@@ -6,9 +6,9 @@ use std::sync::Arc;
use std::net::TcpListener; use std::net::TcpListener;
use crate::models::download::{DownloadTask, DownloadTaskResponse, InstallStatus, InstallTask, ResponseStatus}; use crate::models::download::{DownloadTask, DownloadTaskResponse, InstallStatus, InstallTask, ResponseStatus};
use crate::handlers::server::get_json_server_url; 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 { pub struct DownloadManager {
download_queue: Mutex<HashMap<String, DownloadTask>>, download_queue: Mutex<HashMap<String, DownloadTask>>,
@@ -16,7 +16,7 @@ pub struct DownloadManager {
aria2_started: Arc<AtomicBool>, aria2_started: Arc<AtomicBool>,
aria2_port: Arc<Mutex<u16>>, aria2_port: Arc<Mutex<u16>>,
aria2_pid: Arc<Mutex<Option<u32>>>, aria2_pid: Arc<Mutex<Option<u32>>>,
installing: Arc<AtomicBool>, // 新增:标记是否有正在安装的任务 installing: Arc<AtomicBool>,
} }
impl DownloadManager { impl DownloadManager {

View File

@@ -1,3 +1,5 @@
use crate::handlers::server::get_img_server_url;
// 格式化文件大小 // 格式化文件大小
pub fn format_size(size: u64) -> String { pub fn format_size(size: u64) -> String {
const KB: u64 = 1024; const KB: u64 = 1024;
@@ -19,3 +21,7 @@ pub fn format_size(size: u64) -> String {
pub fn format_speed(speed: u64) -> String { pub fn format_speed(speed: u64) -> String {
format!("{}/s", format_size(speed)) format!("{}/s", format_size(speed))
} }
pub fn format_icon_url(category: &str, pkgname: &str) -> String {
format!("{}{}/{}/icon.png", get_img_server_url(), category, pkgname)
}

View File

@@ -1,5 +1,3 @@
use crate::handlers::server::get_img_server_url;
pub mod search; pub mod search;
pub mod download_manager; pub mod download_manager;
pub mod aria2; pub mod aria2;
@@ -11,7 +9,3 @@ pub const UA: &str = concat!("Spark-Store/", env!("CARGO_PKG_VERSION"));
pub fn get_user_agent() -> String { pub fn get_user_agent() -> String {
UA.into() UA.into()
} }
pub fn format_icon_url(category: &str, pkgname: &str) -> String {
format!("{}{}/{}/icon.png", get_img_server_url(), category, pkgname)
}