fix: optimize rclone mount process

Author: Kuingsmile

src-tauri/src/cmd/rclone_mount.rs

@@ -1,13 +1,12 @@
 use std::collections::HashMap;
 use std::fs;
 use std::path::Path;
-use std::time::Duration;
 
 use serde::{Deserialize, Serialize};
 use serde_json::{Value, json};
 use tauri::State;
 use tokio::task::JoinSet;
-use tokio::time::timeout;
+use tokio::time::{Duration, sleep, timeout};
 
 use crate::conf::rclone_config::{RcloneConfigFile, WebDavRemoteConfig, reveal_password};
 use crate::core::process_manager::{PROCESS_MANAGER, ProcessConfig, ProcessInfo};
@@ -153,7 +152,7 @@ pub async fn rclone_delete_remote(
 }
 
 #[tauri::command]
-pub async fn create_rclone_mount_remote_process(
+pub async fn mount_remote(
     config: MountProcessInput,
     state: State<'_, AppState>,
 ) -> Result<ProcessInfo, String> {
@@ -202,11 +201,10 @@ pub async fn create_rclone_mount_remote_process(
     };
 
     if PROCESS_MANAGER.is_registered(&config.id) {
-        let info = PROCESS_MANAGER.get_status(&config.id)?;
-        if !info.is_running {
-            return PROCESS_MANAGER.start(&config.id);
-        }
-        return Ok(info);
+        let _ = PROCESS_MANAGER.stop(&config.id);
+        sleep(Duration::from_millis(500)).await;
+        let _ = PROCESS_MANAGER.remove(&config.id);
+        sleep(Duration::from_millis(500)).await;
     }
 
     PROCESS_MANAGER.register_and_start(process_config)

src-tauri/src/core/process_manager.rs

@@ -725,7 +725,7 @@ impl ProcessManager {
     pub fn remove(&self, id: &str) -> Result<(), String> {
         let mut processes = self.processes.write();
 
-        if let Some(_) = processes.remove(id) {
+        if processes.remove(id).is_some() {
             drop(processes);
             self.persist_state();
             Ok(())

src-tauri/src/lib.rs

@@ -23,9 +23,9 @@ use cmd::os_operate::{
 };
 use cmd::rclone_core::check_rclone_available;
 use cmd::rclone_mount::{
-    check_mount_status, create_rclone_mount_remote_process, get_mount_info_list,
-    rclone_create_remote, rclone_delete_remote, rclone_list_config, rclone_list_remotes,
-    rclone_update_remote, unmount_remote,
+    check_mount_status, get_mount_info_list, mount_remote, rclone_create_remote,
+    rclone_delete_remote, rclone_list_config, rclone_list_remotes, rclone_update_remote,
+    unmount_remote,
 };
 use cmd::updater::{get_current_version, is_auto_check_enabled, set_auto_check_enabled};
 use object::structs::*;
@@ -170,7 +170,7 @@ async fn auto_mount_rclone_remotes_on_login(app_handle: &tauri::AppHandle) -> Re
             name: id.clone(),
             args,
         };
-        match create_rclone_mount_remote_process(create_remote_config, app_state.clone()).await {
+        match mount_remote(create_remote_config, app_state.clone()).await {
             Ok(_) => {
                 log::info!(
                     "Rclone remote '{}' mounted successfully on login",
@@ -231,7 +231,7 @@ pub fn run() {
             rclone_update_remote,
             rclone_delete_remote,
             // Rclone mount process management
-            create_rclone_mount_remote_process,
+            mount_remote,
             unmount_remote,
             check_mount_status,
             get_mount_info_list,

src/api/tauri.ts

@@ -34,8 +34,7 @@ export class TauriAPI {
     mounts: {
       list: (): Promise<RcloneMountInfo[]> => invoke('get_mount_info_list'),
       check: (id: string, mp: string): Promise<boolean> => invoke('check_mount_status', { id, mountPoint: mp }),
-      mount: (cfg: MountProcessInput): Promise<ProcessInfo> =>
-        invoke('create_rclone_mount_remote_process', { config: cfg }),
+      mount: (cfg: MountProcessInput): Promise<ProcessInfo> => invoke('mount_remote', { config: cfg }),
       unmount: (name: string): Promise<boolean> => invoke('unmount_remote', { name }),
     },
   }