refactor: unify and simplify the call of app_handle(2)

src-tauri/src/utils/dirs.rs

@@ -44,39 +44,31 @@ pub fn app_home_dir() -> Result<PathBuf> {
             .ok_or(anyhow::anyhow!("failed to get the portable app dir"))?;
         return Ok(PathBuf::from(app_dir).join(".config").join(APP_ID));
     }
-    let handle = handle::Handle::global();
-    let app_handle = handle.app_handle.lock().clone();
+    let app_handle = handle::Handle::global().app_handle().unwrap();
 
-    if let Some(app_handle) = app_handle.as_ref() {
-        match app_handle.path().data_dir() {
-            Ok(dir) => {
-                return Ok(dir.join(APP_ID));
-            }
-            Err(e) => {
-                log::error!("Failed to get the app home directory: {}", e);
-                return Err(anyhow::anyhow!("Failed to get the app homedirectory"));
-            }
+    match app_handle.path().data_dir() {
+        Ok(dir) => {
+            return Ok(dir.join(APP_ID));
+        }
+        Err(e) => {
+            log::error!("Failed to get the app home directory: {}", e);
+            return Err(anyhow::anyhow!("Failed to get the app homedirectory"));
         }
     }
-    Err(anyhow::anyhow!("failed to get the app home dir"))
 }
 
 /// get the resources dir
 pub fn app_resources_dir() -> Result<PathBuf> {
-    let handle = handle::Handle::global();
-    let app_handle = handle.app_handle.lock().clone();
-    if let Some(app_handle) = app_handle.as_ref() {
-        match app_handle.path().resource_dir() {
-            Ok(dir) => {
-                return Ok(dir.join("resources"));
-            }
-            Err(e) => {
-                log::error!("Failed to get the resource directory: {}", e);
-                return Err(anyhow::anyhow!("Failed to get the resource directory"));
-            }
-        };
+    let app_handle = handle::Handle::global().app_handle().unwrap();
+    match app_handle.path().resource_dir() {
+        Ok(dir) => {
+            return Ok(dir.join("resources"));
+        }
+        Err(e) => {
+            log::error!("Failed to get the resource directory: {}", e);
+            return Err(anyhow::anyhow!("Failed to get the resource directory"));
+        }
     };
-    Err(anyhow::anyhow!("failed to get the resource dir"))
 }
 
 /// profiles dir

src-tauri/src/utils/init.rs

@@ -11,7 +11,6 @@ use log4rs::encode::pattern::PatternEncoder;
 use std::fs::{self, DirEntry};
 use std::path::PathBuf;
 use std::str::FromStr;
-use tauri::AppHandle;
 use tauri_plugin_shell::ShellExt;
 
 /// initialize this instance's log file
@@ -299,7 +298,7 @@ pub fn init_scheme() -> Result<()> {
 }
 
 pub async fn startup_script() -> Result<()> {
-    let app_handle: AppHandle = handle::Handle::global().app_handle().unwrap();
+    let app_handle = handle::Handle::global().app_handle().unwrap();
 
     let script_path = {
         let verge = Config::verge();

src-tauri/src/utils/resolve.rs

@@ -7,7 +7,7 @@ use once_cell::sync::OnceCell;
 use percent_encoding::percent_decode_str;
 use serde_yaml::Mapping;
 use std::net::TcpListener;
-use tauri::{App, AppHandle, Manager};
+use tauri::{App, Manager};
 
 use url::Url;
 //#[cfg(not(target_os = "linux"))]
@@ -39,6 +39,7 @@ pub async fn resolve_setup(app: &mut App) {
     #[cfg(target_os = "macos")]
     app.set_activation_policy(tauri::ActivationPolicy::Accessory);
     let version = app.package_info().version.to_string();
+
     handle::Handle::global().init(app.app_handle());
     VERSION.get_or_init(|| version.clone());
     log_err!(init::init_config());
@@ -111,7 +112,7 @@ pub fn resolve_reset() {
 
 /// create main window
 pub fn create_window() {
-    let app_handle: AppHandle = handle::Handle::global().app_handle().unwrap();
+    let app_handle = handle::Handle::global().app_handle().unwrap();
 
     if let Some(window) = handle::Handle::global().get_window() {
         trace_err!(window.unminimize(), "set win unminimize");
@@ -211,7 +212,7 @@ pub fn create_window() {
 
 /// save window size and position
 pub fn save_window_size_position(save_to_file: bool) -> Result<()> {
-    let app_handle: AppHandle = handle::Handle::global().app_handle().unwrap();
+    let app_handle = handle::Handle::global().app_handle().unwrap();
     let verge = Config::verge();
     let mut verge = verge.latest();
 
@@ -239,7 +240,7 @@ pub fn save_window_size_position(save_to_file: bool) -> Result<()> {
 pub async fn resolve_scheme(param: String) -> Result<()> {
     log::info!("received deep link: {}", param);
 
-    let app_handle: AppHandle = handle::Handle::global().app_handle().unwrap();
+    let app_handle = handle::Handle::global().app_handle().unwrap();
 
     let param_str = if param.starts_with("[") && param.len() > 4 {
         param