add logger

src-tauri/src/lib.rs

@@ -12,6 +12,24 @@ struct AppState {
     install_tx: mpsc::Sender<String>,
 }
 
+#[derive(Clone, Serialize)]
+pub struct LogPayload {
+    pub timestamp: String,
+    pub command: String,
+    pub output: String,
+    pub status: String, // "info", "success", "error"
+}
+
+pub fn emit_log(handle: &AppHandle, command: &str, output: &str, status: &str) {
+    let now = chrono::Local::now().format("%H:%M:%S").to_string();
+    let _ = handle.emit("log-event", LogPayload {
+        timestamp: now,
+        command: command.to_string(),
+        output: output.to_string(),
+        status: status.to_string(),
+    });
+}
+
 #[tauri::command]
 fn get_essentials(app: AppHandle) -> Vec<Software> {
     let app_data_dir = app.path().app_data_dir().unwrap_or_default();
@@ -28,12 +46,12 @@ fn get_essentials(app: AppHandle) -> Vec<Software> {
                 description: Some("Microsoft PowerToys 是一组实用程序，供高级用户调整和简化其 Windows 10 和 11 体验。".to_string()),
                 version: None,
                 available_version: None,
-                icon_url: Some("https://raw.githubusercontent.com/microsoft/PowerToys/main/doc/images/icons/PowerToys icon/PNG/PowerToysAppList.targetsize-48.png".to_string()),
+                icon_url: Some("https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/logo.png".to_string()),
                 status: "idle".to_string(),
                 progress: 0.0,
             },
             Software {
-                id: "Google.Chrome.EXE".to_string(),
+                id: "Google.Chrome".to_string(),
                 name: "Google Chrome".to_string(),
                 description: Some("Google Chrome 是一款快速、安全且免费的浏览器。".to_string()),
                 version: None,
@@ -52,13 +70,13 @@ fn get_essentials(app: AppHandle) -> Vec<Software> {
 }
 
 #[tauri::command]
-async fn get_all_software() -> Vec<Software> {
-    tokio::task::spawn_blocking(move || list_all_software()).await.unwrap_or_default()
+async fn get_all_software(app: AppHandle) -> Vec<Software> {
+    tokio::task::spawn_blocking(move || list_all_software(&app)).await.unwrap_or_default()
 }
 
 #[tauri::command]
-async fn get_updates() -> Vec<Software> {
-    tokio::task::spawn_blocking(move || list_updates()).await.unwrap_or_default()
+async fn get_updates(app: AppHandle) -> Vec<Software> {
+    tokio::task::spawn_blocking(move || list_updates(&app)).await.unwrap_or_default()
 }
 
 #[tauri::command]
@@ -66,6 +84,12 @@ async fn install_software(id: String, state: State<'_, AppState>) -> Result<(),
     state.install_tx.send(id).await.map_err(|e| e.to_string())
 }
 
+#[tauri::command]
+fn get_logs_history() -> Vec<LogPayload> {
+    // 暂时返回空，后续可以考虑存储
+    vec![]
+}
+
 #[derive(Clone, Serialize)]
 struct InstallProgress {
     id: String,
@@ -78,21 +102,18 @@ pub fn run() {
         .plugin(tauri_plugin_opener::init())
         .setup(move |app| {
             let handle = app.handle().clone();
+            let (tx, mut rx) = mpsc::channel::<String>(100);
+            app.manage(AppState { install_tx: tx });
             
-            // 确保依赖项已安装 (这是一个耗时的过程，建议在异步任务中运行)
+            // 环境初始化逻辑
+            let init_handle = handle.clone();
             tauri::async_runtime::spawn(async move {
-                let _ = tokio::task::spawn_blocking(|| {
-                    let _ = ensure_winget_dependencies();
+                let _ = tokio::task::spawn_blocking(move || {
+                    let _ = ensure_winget_dependencies(&init_handle);
                 }).await;
             });
 
-            // 在 setup 闭包中初始化，此时运行时已就绪
-            let (tx, mut rx) = mpsc::channel::<String>(100);
-            
-            // 托管状态
-            app.manage(AppState { install_tx: tx });
-            
-            // 后台安装队列
+            // 安装队列
             tauri::async_runtime::spawn(async move {
                 while let Some(id) = rx.recv().await {
                     let _ = handle.emit("install-status", InstallProgress {
@@ -101,7 +122,10 @@ pub fn run() {
                         progress: 0.5,
                     });
 
+                    emit_log(&handle, &format!("winget install --id {}", id), "Starting installation...", "info");
+
                     let id_for_cmd = id.clone();
+                    let h = handle.clone();
                     let status_result = tokio::task::spawn_blocking(move || {
                         let output = Command::new("winget")
                             .args([
@@ -113,8 +137,16 @@ pub fn run() {
                             .output();
 
                         match output {
-                            Ok(out) if out.status.success() => "success",
-                            _ => "error",
+                            Ok(out) => {
+                                let msg = String::from_utf8_lossy(&out.stdout).to_string();
+                                let err = String::from_utf8_lossy(&out.stderr).to_string();
+                                emit_log(&h, &format!("Install result for {}", id_for_cmd), &format!("OUT: {}\nERR: {}", msg, err), if out.status.success() { "success" } else { "error" });
+                                if out.status.success() { "success" } else { "error" }
+                            },
+                            Err(e) => {
+                                emit_log(&h, &format!("Install error for {}", id_for_cmd), &e.to_string(), "error");
+                                "error"
+                            },
                         }
                     }).await.unwrap_or("error");
 
@@ -132,7 +164,8 @@ pub fn run() {
             get_essentials,
             get_all_software,
             get_updates,
-            install_software
+            install_software,
+            get_logs_history
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");