From 7f5f0b7c4954ca543b731f9449657e8477f98929 Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Wed, 25 Jan 2023 08:39:42 -0800
Subject: [PATCH 1/2] Add ability to focus on the main window when a profile
 added via deep link (I used global variable(mutex) between threads, so it's
 not the best way to do it, should be done better)

---
 src-tauri/src/main.rs       | 19 +++++++++++++++++--
 src-tauri/src/utils/help.rs | 20 ++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 6420400..ff943e8 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -10,18 +10,29 @@ mod enhance;
 mod feat;
 mod utils;
 mod deep_link;
+use std::sync::{Arc, Mutex};
 
 use crate::utils::{init, resolve, server, help};
 use crate::core::handle::Handle;
-use tauri::{api, SystemTray};
+use tauri::{api, SystemTray, Manager};
+use once_cell::sync::Lazy;
+use std::thread;
+use help::focus_to_main_window_if_needed;
+
+// This is not the best way to do it...
+static mut NEED_WINDOW_BE_FOCUS:Lazy<Arc<Mutex<bool>>> = Lazy::new(|| Arc::new(Mutex::new(false)));
 
 #[tokio::main]
 async fn main() -> std::io::Result<()> {
-    
+
     // Deep linking
     deep_link::prepare("app.clashverge");
     // Define handler
     let handler = | deep_link | async move {
+        // Set need to be focus to true, it's handled in other thread
+        unsafe{
+            *crate::NEED_WINDOW_BE_FOCUS.lock().unwrap() = true;
+        }
         // Convert deep link to something that import_profile can use
         let profile_url_and_name = help::convert_deeplink_to_url_for_import_profile(&deep_link);
         // If deep link is invalid, we pop up a message to user
@@ -126,6 +137,10 @@ async fn main() -> std::io::Result<()> {
     let app = builder
         .build(tauri::generate_context!())
         .expect("error while running tauri application");
+    
+    // Focus thread
+    let app_handle = app.app_handle();
+    thread::spawn(move ||{focus_to_main_window_if_needed(&app_handle)});
 
     app.run(|app_handle, e| match e {
         tauri::RunEvent::ExitRequested { api, .. } => {
diff --git a/src-tauri/src/utils/help.rs b/src-tauri/src/utils/help.rs
index 798e072..35fdb45 100644
--- a/src-tauri/src/utils/help.rs
+++ b/src-tauri/src/utils/help.rs
@@ -3,6 +3,9 @@ use nanoid::nanoid;
 use serde::{de::DeserializeOwned, Serialize};
 use serde_yaml::{Mapping, Value};
 use std::{fs, path::PathBuf, process::Command, str::FromStr};
+use tauri::{AppHandle, Manager};
+use std::thread;
+use std::time::Duration;
 
 /// read data from yaml as struct T
 pub fn read_yaml<T: DeserializeOwned>(path: &PathBuf) -> Result<T> {
@@ -149,6 +152,23 @@ pub fn convert_deeplink_to_url_for_import_profile(deep_link:&String) -> Result<S
     let import_profile_url = import_profile_url_raw[1].replacen('&', "?", 1);
     Ok(import_profile_url)
 }
+
+// Focus to the main window, and back the NEED_WINDOW_BE_FOCUS to false, and wait for NEED_WINDOW_BE_FOCUS be true to do its job
+pub fn focus_to_main_window_if_needed(app_handle:&AppHandle){
+    loop{
+        unsafe{
+            if *crate::NEED_WINDOW_BE_FOCUS.lock().unwrap() == true{
+                if let Some(window) = app_handle.get_window("main"){
+                    let _ = window.show();
+                    let _ = window.set_focus();
+                    *crate::NEED_WINDOW_BE_FOCUS.lock().unwrap() = false;
+                }
+            }
+        }
+        thread::sleep(Duration::from_millis(700))
+    }
+}
+
 #[macro_export]
 macro_rules! error {
     ($result: expr) => {

From 39ec07394fda62c41c9b196ce9f59d83aa1ea89b Mon Sep 17 00:00:00 2001
From: iam54r1n4 <iam54r1n40@gmail.com>
Date: Wed, 25 Jan 2023 18:47:34 -0800
Subject: [PATCH 2/2] Now program window will show even when it's in background

---
 src-tauri/src/utils/help.rs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src-tauri/src/utils/help.rs b/src-tauri/src/utils/help.rs
index 35fdb45..4fb7699 100644
--- a/src-tauri/src/utils/help.rs
+++ b/src-tauri/src/utils/help.rs
@@ -2,10 +2,10 @@ use anyhow::{anyhow, bail, Context, Result};
 use nanoid::nanoid;
 use serde::{de::DeserializeOwned, Serialize};
 use serde_yaml::{Mapping, Value};
-use std::{fs, path::PathBuf, process::Command, str::FromStr};
-use tauri::{AppHandle, Manager};
-use std::thread;
+use std::{fs, path::PathBuf, process::Command, str::FromStr, thread};
+use tauri::{AppHandle};
 use std::time::Duration;
+use crate::utils::resolve;
 
 /// read data from yaml as struct T
 pub fn read_yaml<T: DeserializeOwned>(path: &PathBuf) -> Result<T> {
@@ -158,14 +158,12 @@ pub fn focus_to_main_window_if_needed(app_handle:&AppHandle){
     loop{
         unsafe{
             if *crate::NEED_WINDOW_BE_FOCUS.lock().unwrap() == true{
-                if let Some(window) = app_handle.get_window("main"){
-                    let _ = window.show();
-                    let _ = window.set_focus();
-                    *crate::NEED_WINDOW_BE_FOCUS.lock().unwrap() = false;
-                }
+                // Show main window is exist, otherwise create main window and show it
+                resolve::create_window(app_handle);
+                *crate::NEED_WINDOW_BE_FOCUS.lock().unwrap() = false;
+                thread::sleep(Duration::from_millis(600))
             }
         }
-        thread::sleep(Duration::from_millis(700))
     }
 }