From 730621e5a1e570887265ac8930157d579168696f Mon Sep 17 00:00:00 2001 From: zhom <2717306+zhom@users.noreply.github.com> Date: Fri, 8 Aug 2025 15:39:20 +0400 Subject: [PATCH] rename service to manager --- src-tauri/src/auto_updater.rs | 6 ++--- src-tauri/src/browser_runner.rs | 24 +++++++++---------- ..._service.rs => browser_version_manager.rs} | 18 +++++++------- src-tauri/src/download.rs | 4 ++-- src-tauri/src/lib.rs | 2 +- src-tauri/src/settings_manager.rs | 2 +- src-tauri/src/version_updater.rs | 6 ++--- 7 files changed, 31 insertions(+), 31 deletions(-) rename src-tauri/src/{browser_version_service.rs => browser_version_manager.rs} (98%) diff --git a/src-tauri/src/auto_updater.rs b/src-tauri/src/auto_updater.rs index 8a594d3..0bb381e 100644 --- a/src-tauri/src/auto_updater.rs +++ b/src-tauri/src/auto_updater.rs @@ -1,5 +1,5 @@ use crate::api_client::is_browser_version_nightly; -use crate::browser_version_service::{BrowserVersionInfo, BrowserVersionService}; +use crate::browser_version_manager::{BrowserVersionInfo, BrowserVersionManager}; use crate::profile::BrowserProfile; use crate::settings_manager::SettingsManager; use serde::{Deserialize, Serialize}; @@ -29,14 +29,14 @@ pub struct AutoUpdateState { } pub struct AutoUpdater { - version_service: &'static BrowserVersionService, + version_service: &'static BrowserVersionManager, settings_manager: &'static SettingsManager, } impl AutoUpdater { fn new() -> Self { Self { - version_service: BrowserVersionService::instance(), + version_service: BrowserVersionManager::instance(), settings_manager: SettingsManager::instance(), } } diff --git a/src-tauri/src/browser_runner.rs b/src-tauri/src/browser_runner.rs index b8bef20..ceb11a7 100644 --- a/src-tauri/src/browser_runner.rs +++ b/src-tauri/src/browser_runner.rs @@ -11,8 +11,8 @@ use sysinfo::System; use tauri::Emitter; use crate::browser::{create_browser, BrowserType, ProxySettings}; -use crate::browser_version_service::{ - BrowserVersionInfo, BrowserVersionService, BrowserVersionsResult, +use crate::browser_version_manager::{ + BrowserVersionInfo, BrowserVersionManager, BrowserVersionsResult, }; use crate::camoufox::CamoufoxConfig; use crate::download::DownloadProgress; @@ -1129,7 +1129,7 @@ impl BrowserRunner { } // Check if browser is supported on current platform before attempting download - let version_service = BrowserVersionService::instance(); + let version_service = BrowserVersionManager::instance(); if !version_service .is_browser_supported(&browser_str) @@ -1582,13 +1582,13 @@ pub fn delete_profile(_app_handle: tauri::AppHandle, profile_name: String) -> Re #[tauri::command] pub fn get_supported_browsers() -> Result, String> { - let service = BrowserVersionService::instance(); + let service = BrowserVersionManager::instance(); Ok(service.get_supported_browsers()) } #[tauri::command] pub fn is_browser_supported_on_platform(browser_str: String) -> Result { - let service = BrowserVersionService::instance(); + let service = BrowserVersionManager::instance(); service .is_browser_supported(&browser_str) .map_err(|e| format!("Failed to check browser support: {e}")) @@ -1598,14 +1598,14 @@ pub fn is_browser_supported_on_platform(browser_str: String) -> Result Result, String> { - let service = BrowserVersionService::instance(); + let service = BrowserVersionManager::instance(); // Get cached versions immediately if available if let Some(cached_versions) = service.get_cached_browser_versions_detailed(&browser_str) { // Check if we should update cache in background if service.should_update_cache(&browser_str) { // Start background update but return cached data immediately - let service_clone = BrowserVersionService::instance(); + let service_clone = BrowserVersionManager::instance(); let browser_str_clone = browser_str.clone(); tokio::spawn(async move { if let Err(e) = service_clone @@ -1630,14 +1630,14 @@ pub async fn fetch_browser_versions_cached_first( pub async fn fetch_browser_versions_with_count_cached_first( browser_str: String, ) -> Result { - let service = BrowserVersionService::instance(); + let service = BrowserVersionManager::instance(); // Get cached versions immediately if available if let Some(cached_versions) = service.get_cached_browser_versions(&browser_str) { // Check if we should update cache in background if service.should_update_cache(&browser_str) { // Start background update but return cached data immediately - let service_clone = BrowserVersionService::instance(); + let service_clone = BrowserVersionManager::instance(); let browser_str_clone = browser_str.clone(); tokio::spawn(async move { if let Err(e) = service_clone @@ -1745,7 +1745,7 @@ pub async fn update_camoufox_config( pub async fn fetch_browser_versions_with_count( browser_str: String, ) -> Result { - let service = BrowserVersionService::instance(); + let service = BrowserVersionManager::instance(); service .fetch_browser_versions_with_count(&browser_str, false) .await @@ -1761,8 +1761,8 @@ pub fn get_downloaded_browser_versions(browser_str: String) -> Result Result { - let service = BrowserVersionService::instance(); +) -> Result { + let service = BrowserVersionManager::instance(); service .get_browser_release_types(&browser_str) .await diff --git a/src-tauri/src/browser_version_service.rs b/src-tauri/src/browser_version_manager.rs similarity index 98% rename from src-tauri/src/browser_version_service.rs rename to src-tauri/src/browser_version_manager.rs index 465f0e5..238044b 100644 --- a/src-tauri/src/browser_version_service.rs +++ b/src-tauri/src/browser_version_manager.rs @@ -30,18 +30,18 @@ pub struct DownloadInfo { pub is_archive: bool, // true for .dmg, .zip, etc. } -pub struct BrowserVersionService { +pub struct BrowserVersionManager { api_client: &'static ApiClient, } -impl BrowserVersionService { +impl BrowserVersionManager { fn new() -> Self { Self { api_client: ApiClient::instance(), } } - pub fn instance() -> &'static BrowserVersionService { + pub fn instance() -> &'static BrowserVersionManager { &BROWSER_VERSION_SERVICE } @@ -982,13 +982,13 @@ mod tests { ) } - fn create_test_service(_api_client: ApiClient) -> &'static BrowserVersionService { - BrowserVersionService::instance() + fn create_test_service(_api_client: ApiClient) -> &'static BrowserVersionManager { + BrowserVersionManager::instance() } #[tokio::test] - async fn test_browser_version_service_creation() { - let _ = BrowserVersionService::instance(); + async fn test_browser_version_manager_creation() { + let _ = BrowserVersionManager::instance(); // Test passes if we can create the service without panicking } @@ -1014,7 +1014,7 @@ mod tests { #[test] fn test_get_download_info() { - let service = BrowserVersionService::instance(); + let service = BrowserVersionManager::instance(); // Test Firefox - platform-specific expectations let firefox_info = service.get_download_info("firefox", "139.0").unwrap(); @@ -1219,5 +1219,5 @@ mod tests { // Global singleton instance lazy_static::lazy_static! { - static ref BROWSER_VERSION_SERVICE: BrowserVersionService = BrowserVersionService::new(); + static ref BROWSER_VERSION_SERVICE: BrowserVersionManager = BrowserVersionManager::new(); } diff --git a/src-tauri/src/download.rs b/src-tauri/src/download.rs index 8ccadf8..0419ea6 100644 --- a/src-tauri/src/download.rs +++ b/src-tauri/src/download.rs @@ -7,7 +7,7 @@ use tauri::Emitter; use crate::api_client::ApiClient; use crate::browser::BrowserType; -use crate::browser_version_service::DownloadInfo; +use crate::browser_version_manager::DownloadInfo; #[derive(Debug, Serialize, Deserialize, Clone)] pub struct DownloadProgress { @@ -493,7 +493,7 @@ mod tests { use super::*; use crate::api_client::ApiClient; use crate::browser::BrowserType; - use crate::browser_version_service::DownloadInfo; + use crate::browser_version_manager::DownloadInfo; use tempfile::TempDir; use wiremock::matchers::{method, path}; diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 4cf605d..b4159fe 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -12,7 +12,7 @@ mod app_auto_updater; mod auto_updater; mod browser; mod browser_runner; -mod browser_version_service; +mod browser_version_manager; mod camoufox; mod default_browser; mod download; diff --git a/src-tauri/src/settings_manager.rs b/src-tauri/src/settings_manager.rs index 3fca7c2..d66b0b3 100644 --- a/src-tauri/src/settings_manager.rs +++ b/src-tauri/src/settings_manager.rs @@ -207,7 +207,7 @@ pub async fn clear_all_version_cache_and_refetch( // Disable all browsers during the update process let auto_updater = crate::auto_updater::AutoUpdater::instance(); let supported_browsers = - crate::browser_version_service::BrowserVersionService::instance().get_supported_browsers(); + crate::browser_version_manager::BrowserVersionManager::instance().get_supported_browsers(); // Load current state and disable all browsers let mut state = auto_updater diff --git a/src-tauri/src/version_updater.rs b/src-tauri/src/version_updater.rs index 76b3fec..bf37f27 100644 --- a/src-tauri/src/version_updater.rs +++ b/src-tauri/src/version_updater.rs @@ -10,7 +10,7 @@ use tokio::sync::Mutex; use tokio::time::interval; use crate::auto_updater::AutoUpdater; -use crate::browser_version_service::BrowserVersionService; +use crate::browser_version_manager::BrowserVersionManager; #[derive(Debug, Serialize, Deserialize, Clone)] pub struct VersionUpdateProgress { @@ -47,7 +47,7 @@ impl Default for BackgroundUpdateState { } pub struct VersionUpdater { - version_service: &'static BrowserVersionService, + version_service: &'static BrowserVersionManager, auto_updater: &'static AutoUpdater, app_handle: Option, } @@ -55,7 +55,7 @@ pub struct VersionUpdater { impl VersionUpdater { pub fn new() -> Self { Self { - version_service: BrowserVersionService::instance(), + version_service: BrowserVersionManager::instance(), auto_updater: AutoUpdater::instance(), app_handle: None, }