* feat: replace all tokio::spawn with unified AsyncHandler::spawn - 🚀 Core Improvements: * Replace all tokio::spawn calls with AsyncHandler::spawn for unified Tauri async task management * Prioritize converting sync functions to async functions to reduce spawn usage * Use .await directly in async contexts instead of spawn - 🔧 Major Changes: * core/hotkey.rs: Use AsyncHandler::spawn for hotkey callback functions * module/lightweight.rs: Async lightweight mode switching * feat/window.rs: Convert window operation functions to async, use .await internally * feat/proxy.rs, feat/clash.rs: Async proxy and mode switching functions * lib.rs: Window focus handling with AsyncHandler::spawn * core/tray/mod.rs: Complete async tray event handling - ✨ Technical Advantages: * Unified task tracking and debugging capabilities (via tokio-trace feature) * Better error handling and task management * Consistency with Tauri runtime * Reduced async boundaries for better performance - 🧪 Verification: * Compilation successful with 0 errors, 0 warnings * Maintains complete original functionality * Optimized async execution flow * feat: complete tokio fs migration and replace tokio::spawn with AsyncHandler 🚀 Major achievements: - Migrate 8 core modules from std::fs to tokio::fs - Create 6 Send-safe wrapper functions using spawn_blocking pattern - Replace all tokio::spawn calls with AsyncHandler::spawn for unified async task management - Solve all 19 Send trait compilation errors through innovative spawn_blocking architecture 🔧 Core changes: - config/profiles.rs: Add profiles_*_safe functions to handle Send trait constraints - cmd/profile.rs: Update all Tauri commands to use Send-safe operations - config/prfitem.rs: Replace append_item calls with profiles_append_item_safe - utils/help.rs: Convert YAML operations to async (read_yaml, save_yaml) - Multiple modules: Replace tokio::task::spawn_blocking with AsyncHandler::spawn_blocking ✅ Technical innovations: - spawn_blocking wrapper pattern resolves parking_lot RwLock Send trait conflicts - Maintain parking_lot performance while achieving Tauri async command compatibility - Preserve backwards compatibility with gradual migration strategy 🎯 Results: - Zero compilation errors - Zero warnings - All async file operations working correctly - Complete Send trait compliance for Tauri commands * feat: refactor app handle and command functions to use async/await for improved performance * feat: update async handling in profiles and logging functions for improved error handling and performance * fix: update TRACE_MINI_SIZE constant to improve task logging threshold * fix(windows): convert service management functions to async for improved performance * fix: convert service management functions to async for improved responsiveness * fix(ubuntu): convert install and reinstall service functions to async for improved performance * fix(linux): convert uninstall_service function to async for improved performance * fix: convert uninstall_service call to async for improved performance * fix: convert file and directory creation calls to async for improved performance * fix: convert hotkey functions to async for improved responsiveness * chore: update UPDATELOG.md for v2.4.1 with major improvements and performance optimizations
92 lines
2.7 KiB
Rust
92 lines
2.7 KiB
Rust
use crate::{
|
|
config::{Config, IVerge},
|
|
core::backup,
|
|
logging_error,
|
|
utils::{dirs::app_home_dir, logging::Type},
|
|
};
|
|
use anyhow::Result;
|
|
use reqwest_dav::list_cmd::ListFile;
|
|
use std::fs;
|
|
|
|
/// Create a backup and upload to WebDAV
|
|
pub async fn create_backup_and_upload_webdav() -> Result<()> {
|
|
let (file_name, temp_file_path) = backup::create_backup().map_err(|err| {
|
|
log::error!(target: "app", "Failed to create backup: {err:#?}");
|
|
err
|
|
})?;
|
|
|
|
if let Err(err) = backup::WebDavClient::global()
|
|
.upload(temp_file_path.clone(), file_name)
|
|
.await
|
|
{
|
|
log::error!(target: "app", "Failed to upload to WebDAV: {err:#?}");
|
|
return Err(err);
|
|
}
|
|
|
|
if let Err(err) = std::fs::remove_file(&temp_file_path) {
|
|
log::warn!(target: "app", "Failed to remove temp file: {err:#?}");
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// List WebDAV backups
|
|
pub async fn list_wevdav_backup() -> Result<Vec<ListFile>> {
|
|
backup::WebDavClient::global().list().await.map_err(|err| {
|
|
log::error!(target: "app", "Failed to list WebDAV backup files: {err:#?}");
|
|
err
|
|
})
|
|
}
|
|
|
|
/// Delete WebDAV backup
|
|
pub async fn delete_webdav_backup(filename: String) -> Result<()> {
|
|
backup::WebDavClient::global()
|
|
.delete(filename)
|
|
.await
|
|
.map_err(|err| {
|
|
log::error!(target: "app", "Failed to delete WebDAV backup file: {err:#?}");
|
|
err
|
|
})
|
|
}
|
|
|
|
/// Restore WebDAV backup
|
|
pub async fn restore_webdav_backup(filename: String) -> Result<()> {
|
|
let verge = Config::verge().await;
|
|
let verge_data = verge.latest_ref().clone();
|
|
let webdav_url = verge_data.webdav_url.clone();
|
|
let webdav_username = verge_data.webdav_username.clone();
|
|
let webdav_password = verge_data.webdav_password.clone();
|
|
|
|
let backup_storage_path = app_home_dir()
|
|
.map_err(|e| anyhow::anyhow!("Failed to get app home dir: {e}"))?
|
|
.join(&filename);
|
|
backup::WebDavClient::global()
|
|
.download(filename, backup_storage_path.clone())
|
|
.await
|
|
.map_err(|err| {
|
|
log::error!(target: "app", "Failed to download WebDAV backup file: {err:#?}");
|
|
err
|
|
})?;
|
|
|
|
// extract zip file
|
|
let mut zip = zip::ZipArchive::new(fs::File::open(backup_storage_path.clone())?)?;
|
|
zip.extract(app_home_dir()?)?;
|
|
logging_error!(
|
|
Type::Backup,
|
|
true,
|
|
super::patch_verge(
|
|
IVerge {
|
|
webdav_url,
|
|
webdav_username,
|
|
webdav_password,
|
|
..IVerge::default()
|
|
},
|
|
false
|
|
)
|
|
.await
|
|
);
|
|
// 最后删除临时文件
|
|
fs::remove_file(backup_storage_path)?;
|
|
Ok(())
|
|
}
|