use ShellExecuteExW

Co-authored-by: amrbashir <amrbashir@users.noreply.github.com>

.changes/fix-sql-blocking.md

@@ -0,0 +1,5 @@
+---
+sql: patch
+---
+
+Replace `Mutex` with `RwLock` to enable concurrent SQL execution.

.changes/fs-writeTextFile-utf8-path.md

@@ -0,0 +1,5 @@
+---
+"fs-js": "patch"
+---
+
+Fix `writeTextFile` converting UTF-8 characters (for example `äöü`) in the given path into replacement character (`�`)

Cargo.lock

@@ -218,7 +218,7 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 
 [[package]]
 name = "api"
-version = "2.0.3"
+version = "2.0.4"
 dependencies = [
  "log",
  "serde",
@@ -6825,7 +6825,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-dialog"
-version = "2.0.2"
+version = "2.0.3"
 dependencies = [
  "log",
  "raw-window-handle",
@@ -6841,7 +6841,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-fs"
-version = "2.0.2"
+version = "2.0.3"
 dependencies = [
  "anyhow",
  "dunce",
@@ -6901,7 +6901,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-http"
-version = "2.0.2"
+version = "2.0.3"
 dependencies = [
  "data-url",
  "http",
@@ -7005,7 +7005,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-persisted-scope"
-version = "2.0.2"
+version = "2.0.3"
 dependencies = [
  "aho-corasick",
  "bincode",
@@ -7042,6 +7042,7 @@ dependencies = [
 name = "tauri-plugin-shell"
 version = "2.0.2"
 dependencies = [
+ "dunce",
  "encoding_rs",
  "log",
  "open",
@@ -7055,6 +7056,7 @@ dependencies = [
  "tauri-plugin",
  "thiserror",
  "tokio",
+ "windows 0.54.0",
 ]
 
 [[package]]
@@ -8344,6 +8346,16 @@ dependencies = [
  "windows_x86_64_msvc 0.36.1",
 ]
 
+[[package]]
+name = "windows"
+version = "0.54.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
+dependencies = [
+ "windows-core 0.54.0",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows"
 version = "0.56.0"
@@ -8373,6 +8385,16 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.54.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
+dependencies = [
+ "windows-result 0.1.2",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.56.0"

examples/api/src-tauri/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## \[2.0.4]
+
+### Dependencies
+
+- Upgraded to `fs@2.0.3`
+- Upgraded to `dialog@2.0.3`
+- Upgraded to `http@2.0.3`
+
 ## \[2.0.3]
 
 ### Dependencies

examples/api/src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "api"
 publish = false
-version = "2.0.3"
+version = "2.0.4"
 description = "An example Tauri Application showcasing the api"
 edition = "2021"
 rust-version = { workspace = true }
@@ -20,14 +20,14 @@ serde = { workspace = true }
 tiny_http = "0.12"
 log = { workspace = true }
 tauri-plugin-log = { path = "../../../plugins/log", version = "2.0.1" }
-tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.0.2", features = [
+tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.0.3", features = [
   "watch",
 ] }
 tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.0.1" }
-tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.0.2" }
+tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.0.3" }
 tauri-plugin-http = { path = "../../../plugins/http", features = [
   "multipart",
-], version = "2.0.2" }
+], version = "2.0.3" }
 tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.0.1", features = [
   "windows7-compat",
 ] }

plugins/dialog/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.3]
+
+### Dependencies
+
+- Upgraded to `fs@2.0.3`
+
 ## \[2.0.1]
 
 - [`2302c2db`](https://github.com/tauri-apps/plugins-workspace/commit/2302c2db1c49673e61dcbda8cdb01b2c57e9ba6f) ([#1910](https://github.com/tauri-apps/plugins-workspace/pull/1910) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Fix `ask` and `confirm` not using system button texts
@@ -293,5 +299,5 @@
   pull/371)) First v2 alpha release!
   lpha release!
   pull/371)) First v2 alpha release!
-lease!
+  lease!
   pull/371)) First v2 alpha release!

plugins/dialog/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-dialog"
-version = "2.0.2"
+version = "2.0.3"
 description = "Native system dialogs for opening and saving files along with message dialogs on your Tauri application."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -34,7 +34,7 @@ tauri = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
-tauri-plugin-fs = { path = "../fs", version = "2.0.2" }
+tauri-plugin-fs = { path = "../fs", version = "2.0.3" }
 
 [target.'cfg(target_os = "ios")'.dependencies]
 tauri = { workspace = true, features = ["wry"] }

plugins/fs/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## \[2.0.3]
+
+- [`14cee64c`](https://github.com/tauri-apps/plugins-workspace/commit/14cee64c82a72655ae6a4ac0892736a2959dbda5) ([#1958](https://github.com/tauri-apps/plugins-workspace/pull/1958) by [@bWanShiTong](https://github.com/tauri-apps/plugins-workspace/../../bWanShiTong)) Fix compilation on targets with pointer width of `16` or `32`
+
 ## \[2.0.1]
 
 - [`ae802456`](https://github.com/tauri-apps/plugins-workspace/commit/ae8024565f074f313084777c8b10d1b5e3bbe220) ([#1950](https://github.com/tauri-apps/plugins-workspace/pull/1950) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Improve performance of the `FileHandle.read` and `writeTextFile` APIs.

plugins/fs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-fs"
-version = "2.0.2"
+version = "2.0.3"
 description = "Access the file system."
 authors = { workspace = true }
 license = { workspace = true }

plugins/fs/guest-js/index.ts

@@ -1072,7 +1072,7 @@ async function writeTextFile(
 
   await invoke('plugin:fs|write_text_file', encoder.encode(data), {
     headers: {
-      path: path instanceof URL ? path.toString() : path,
+      path: encodeURIComponent(path instanceof URL ? path.toString() : path),
       options: JSON.stringify(options)
     }
   })

plugins/fs/src/commands.rs

@@ -316,12 +316,14 @@ pub async fn read<R: Runtime>(
         let nread = nread.to_be_bytes();
         let mut out = [0; 8];
         out[6..].copy_from_slice(&nread);
+        out
     };
     #[cfg(target_pointer_width = "32")]
     let nread = {
         let nread = nread.to_be_bytes();
         let mut out = [0; 8];
         out[4..].copy_from_slice(&nread);
+        out
     };
     #[cfg(target_pointer_width = "64")]
     let nread = nread.to_be_bytes();

plugins/http/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.3]
+
+### Dependencies
+
+- Upgraded to `fs@2.0.3`
+
 ## \[2.0.1]
 
 - [`cfd48b3b`](https://github.com/tauri-apps/plugins-workspace/commit/cfd48b3b2ec0fccfc162197518694ed59ceda22c) ([#1941](https://github.com/tauri-apps/plugins-workspace/pull/1941) by [@Nipsuli](https://github.com/tauri-apps/plugins-workspace/../../Nipsuli)) Allow skipping sending `Origin` header in HTTP requests by setting `Origin` header to an empty string when calling `fetch`.
@@ -291,6 +297,6 @@
   ha release!
   !
   371\)) First v2 alpha release!
-lease!
+  lease!
   !
   371\)) First v2 alpha release!

plugins/http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-http"
-version = "2.0.2"
+version = "2.0.3"
 description = "Access an HTTP client written in Rust."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -34,7 +34,7 @@ serde_json = { workspace = true }
 tauri = { workspace = true }
 thiserror = { workspace = true }
 tokio = { version = "1", features = ["sync", "macros"] }
-tauri-plugin-fs = { path = "../fs", version = "2.0.2" }
+tauri-plugin-fs = { path = "../fs", version = "2.0.3" }
 urlpattern = "0.3"
 regex = "1"
 http = "1"

plugins/persisted-scope/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.3]
+
+### Dependencies
+
+- Upgraded to `fs@2.0.3`
+
 ## \[2.0.2]
 
 ### Dependencies

plugins/persisted-scope/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-persisted-scope"
-version = "2.0.2"
+version = "2.0.3"
 description = "Save filesystem and asset scopes and restore them when the app is reopened."
 authors = { workspace = true }
 license = { workspace = true }
@@ -27,7 +27,7 @@ log = { workspace = true }
 thiserror = { workspace = true }
 aho-corasick = "1"
 bincode = "1"
-tauri-plugin-fs = { path = "../fs", version = "2.0.2" }
+tauri-plugin-fs = { path = "../fs", version = "2.0.3" }
 
 [features]
 protocol-asset = ["tauri/protocol-asset"]

plugins/shell/Cargo.toml

@@ -37,6 +37,17 @@ regex = "1"
 open = { version = "5", features = ["shellexecute-on-windows"] }
 encoding_rs = "0.8"
 os_pipe = "1"
+dunce = { workspace = true }
+
+[target."cfg(windows)".dependencies.windows]
+version = "0.54"
+features = [
+    "Win32_Foundation",
+    "Win32_UI_Shell_Common",
+    "Win32_UI_WindowsAndMessaging",
+    "Win32_System_Com",
+    "Win32_System_Registry",
+]
 
 [target.'cfg(target_os = "ios")'.dependencies]
 tauri = { workspace = true, features = ["wry"] }

plugins/shell/src/error.rs

@@ -30,6 +30,15 @@ pub enum Error {
     /// JSON error.
     #[error(transparent)]
     Json(#[from] serde_json::Error),
+    /// API not supported on the current platform
+    #[error("API not supported on the current platform")]
+    UnsupportedPlatform,
+    #[error(transparent)]
+    #[cfg(windows)]
+    Win32Error(#[from] windows::core::Error),
+    /// Path doesn't have a parent.
+    #[error("Path doesn't have a parent: {0}")]
+    NoParent(PathBuf),
     /// Utf8 error.
     #[error(transparent)]
     Utf8(#[from] std::string::FromUtf8Error),

plugins/shell/src/lib.rs

@@ -85,6 +85,10 @@ impl<R: Runtime> Shell<R> {
             .run_mobile_plugin("open", path.into())
             .map_err(Into::into)
     }
+
+    pub fn show_item_in_directory<P: AsRef<Path>>(&self, p: P) -> Result<()> {
+        open::show_item_in_directory(p)
+    }
 }
 
 pub trait ShellExt<R: Runtime> {

plugins/shell/src/open/linux.rs

@@ -0,0 +1,3 @@
+use std::path::Path;
+
+pub fn show_item_in_directory(file: &Path) -> crate::Result<()> {}

plugins/shell/src/open/mod.rs

@@ -9,6 +9,22 @@ use serde::{Deserialize, Deserializer};
 use crate::scope::OpenScope;
 use std::str::FromStr;
 
+#[cfg(windows)]
+#[path = "windows.rs"]
+mod platform;
+#[cfg(target_os = "macos")]
+#[path = "macos.rs"]
+mod platform;
+#[cfg(any(
+    target_os = "linux",
+    target_os = "dragonfly",
+    target_os = "freebsd",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
+#[path = "linux.rs"]
+mod platform;
+
 /// Program to use on the [`open()`] call.
 pub enum Program {
     /// Use the `open` program.
@@ -120,3 +136,30 @@ impl Program {
 pub fn open<P: AsRef<str>>(scope: &OpenScope, path: P, with: Option<Program>) -> crate::Result<()> {
     scope.open(path.as_ref(), with).map_err(Into::into)
 }
+
+pub fn show_item_in_directory<P: AsRef<std::path::Path>>(p: P) -> crate::Result<()> {
+    let p = p.as_ref().canonicalize()?;
+    let p = dunce::simplified(&p);
+
+    #[cfg(any(
+        windows,
+        target_os = "macos",
+        target_os = "linux",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    ))]
+    return platform::show_item_in_directory(p);
+
+    #[cfg(not(any(
+        windows,
+        target_os = "macos",
+        target_os = "linux",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    )))]
+    Err(crate::Error::UnsupportedPlatform)
+}

plugins/shell/src/open/windows.rs

@@ -0,0 +1,59 @@
+use std::path::Path;
+
+use windows::{
+    core::{w, HSTRING, PCWSTR},
+    Win32::{
+        Foundation::ERROR_FILE_NOT_FOUND,
+        System::Com::CoInitialize,
+        UI::{
+            Shell::{
+                ILCreateFromPathW, ILFree, SHOpenFolderAndSelectItems, ShellExecuteExW,
+                SHELLEXECUTEINFOW,
+            },
+            WindowsAndMessaging::SW_SHOWNORMAL,
+        },
+    },
+};
+
+pub fn show_item_in_directory(file: &Path) -> crate::Result<()> {
+    let _ = unsafe { CoInitialize(None) };
+
+    let dir = file
+        .parent()
+        .ok_or_else(|| crate::Error::NoParent(file.to_path_buf()))?;
+
+    let dir = HSTRING::from(dir);
+    let dir_item = unsafe { ILCreateFromPathW(PCWSTR::from_raw(dir.as_ptr())) };
+
+    let file_h = HSTRING::from(file);
+    let file_item = unsafe { ILCreateFromPathW(PCWSTR::from_raw(file_h.as_ptr())) };
+
+    unsafe {
+        if let Err(e) = SHOpenFolderAndSelectItems(dir_item, Some(&[file_item]), 0) {
+            if e.code().0 == ERROR_FILE_NOT_FOUND.0 as i32 {
+                let is_dir = std::fs::metadata(file).map(|f| f.is_dir()).unwrap_or(false);
+                let mut info = SHELLEXECUTEINFOW {
+                    cbSize: std::mem::size_of::<SHELLEXECUTEINFOW>() as _,
+                    nShow: SW_SHOWNORMAL.0,
+                    lpVerb: if is_dir {
+                        w!("explore")
+                    } else {
+                        PCWSTR::null()
+                    },
+                    lpClass: if is_dir { w!("folder") } else { PCWSTR::null() },
+                    lpFile: PCWSTR(file_h.as_ptr()),
+                    ..std::mem::zeroed()
+                };
+
+                ShellExecuteExW(&mut info)?;
+            }
+        }
+    }
+
+    unsafe {
+        ILFree(Some(dir_item));
+        ILFree(Some(file_item));
+    }
+
+    Ok(())
+}

plugins/sql/src/commands.rs

@@ -23,7 +23,7 @@ pub(crate) async fn load<R: Runtime>(
         pool.migrate(&migrator).await?;
     }
 
-    db_instances.0.lock().await.insert(db.clone(), pool);
+    db_instances.0.write().await.insert(db.clone(), pool);
 
     Ok(db)
 }
@@ -36,7 +36,7 @@ pub(crate) async fn close(
     db_instances: State<'_, DbInstances>,
     db: Option<String>,
 ) -> Result<bool, crate::Error> {
-    let mut instances = db_instances.0.lock().await;
+    let instances = db_instances.0.read().await;
 
     let pools = if let Some(db) = db {
         vec![db]
@@ -45,9 +45,7 @@ pub(crate) async fn close(
     };
 
     for pool in pools {
-        let db = instances
+        let db = instances.get(&pool).ok_or(Error::DatabaseNotLoaded(pool))?;
-            .get_mut(&pool)
-            .ok_or(Error::DatabaseNotLoaded(pool))?;
         db.close().await;
     }
 
@@ -62,9 +60,9 @@ pub(crate) async fn execute(
     query: String,
     values: Vec<JsonValue>,
 ) -> Result<(u64, LastInsertId), crate::Error> {
-    let mut instances = db_instances.0.lock().await;
+    let instances = db_instances.0.read().await;
 
-    let db = instances.get_mut(&db).ok_or(Error::DatabaseNotLoaded(db))?;
+    let db = instances.get(&db).ok_or(Error::DatabaseNotLoaded(db))?;
     db.execute(query, values).await
 }
 
@@ -75,8 +73,8 @@ pub(crate) async fn select(
     query: String,
     values: Vec<JsonValue>,
 ) -> Result<Vec<IndexMap<String, JsonValue>>, crate::Error> {
-    let mut instances = db_instances.0.lock().await;
+    let instances = db_instances.0.read().await;
 
-    let db = instances.get_mut(&db).ok_or(Error::DatabaseNotLoaded(db))?;
+    let db = instances.get(&db).ok_or(Error::DatabaseNotLoaded(db))?;
     db.select(query, values).await
 }

plugins/sql/src/lib.rs

@@ -29,12 +29,12 @@ use tauri::{
     plugin::{Builder as PluginBuilder, TauriPlugin},
     Manager, RunEvent, Runtime,
 };
-use tokio::sync::Mutex;
+use tokio::sync::{Mutex, RwLock};
 
 use std::collections::HashMap;
 
 #[derive(Default)]
-pub struct DbInstances(pub Mutex<HashMap<String, DbPool>>);
+pub struct DbInstances(pub RwLock<HashMap<String, DbPool>>);
 
 #[derive(Serialize)]
 #[serde(untagged)]
@@ -140,7 +140,7 @@ impl Builder {
 
                 tauri::async_runtime::block_on(async move {
                     let instances = DbInstances::default();
-                    let mut lock = instances.0.lock().await;
+                    let mut lock = instances.0.write().await;
 
                     for db in config.preload {
                         let pool = DbPool::connect(&db, app).await?;
@@ -168,7 +168,7 @@ impl Builder {
                 if let RunEvent::Exit = event {
                     tauri::async_runtime::block_on(async move {
                         let instances = &*app.state::<DbInstances>();
-                        let instances = instances.0.lock().await;
+                        let instances = instances.0.read().await;
                         for value in instances.values() {
                             value.close().await;
                         }