Fix torrents not opening on mac unless the app is already running

Issue #305

Author: qu1ck

src-tauri/src/ipc.rs

@@ -382,6 +382,7 @@ pub struct Ipc {
     stop_signal: Option<oneshot::Sender<()>>,
     args_sem: Arc<Semaphore>,
     args_lock: Option<OwnedSemaphorePermit>,
+    pending: Vec<String>,
 }
 
 impl Ipc {
@@ -392,9 +393,19 @@ impl Ipc {
             stop_signal: Default::default(),
             args_sem: Semaphore::new(1).into(),
             args_lock: None,
+            pending: Vec::new(),
         }
     }
 
+    #[cfg(target_os = "macos")]
+    pub fn push_pending(&mut self, uris: Vec<String>) {
+        self.pending.extend(uris);
+    }
+
+    pub fn take_pending(&mut self) -> Vec<String> {
+        std::mem::take(&mut self.pending)
+    }
+
     pub async fn init(&mut self) {
         self.args_lock = self.args_sem.clone().acquire_owned().await.ok();
 

src-tauri/src/macos.rs

@@ -157,12 +157,12 @@ pub fn listen_url() {
     listen_apple_event(GURL_EVENT_CLASS, EVENT_GET_URL);
 }
 
-// Call this after app is initialised
+// Call this in app setup hook
 pub fn listen_open_documents() {
     listen_apple_event(CORE_EVENT_CLASS, EVENT_OPEN_DOCUMENTS);
 }
 
-// Call this after app is initialised
+// Call this in app setup hook
 pub fn listen_reopen_app() {
     listen_apple_event(CORE_EVENT_CLASS, EVENT_REOPEN_APP);
 }

src-tauri/src/main.rs

@@ -45,10 +45,20 @@ struct ListenerHandle(Arc<RwLock<ipc::Ipc>>);
 
 #[cfg(target_os = "macos")]
 fn handle_uris(app: &AppHandle, uris: Vec<String>) {
+    if uris.is_empty() {
+        return;
+    }
     let listener_state: State<ListenerHandle> = app.state();
     let listener_lock = listener_state.0.clone();
     let app_handle = app.clone();
     async_runtime::spawn(async move {
+        {
+            let mut listener = listener_lock.write().await;
+            if !listener.listening {
+                listener.push_pending(uris);
+                return;
+            }
+        }
         let listener = listener_lock.read().await;
         if let Err(e) = listener.send(&uris, app_handle).await {
             println!("Unable to send args to listener: {:?}", e);
@@ -65,6 +75,8 @@ fn setup(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
         })
         .expect("Unable to set apple event handler");
         macos::listen_url();
+        macos::listen_open_documents();
+        macos::listen_reopen_app();
     }
 
     let mut torrents: Vec<String> = vec![];
@@ -129,16 +141,11 @@ fn setup(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
 
         let app_clone = app.clone();
         async_runtime::spawn(async move {
-            let listener = listener_lock.read().await;
+            let mut listener = listener_lock.write().await;
+            torrents.extend(listener.take_pending());
             if let Err(e) = listener.send(&torrents, app_clone).await {
                 println!("Unable to send args to listener: {e}");
             }
-
-            #[cfg(target_os = "macos")]
-            {
-                macos::listen_open_documents();
-                macos::listen_reopen_app();
-            }
         });
 
         let app_clone = app.clone();