versions in settings & bug fixes

Stability-AI · Jul 21, 2023 · 69d381a · 69d381a
1 parent d710f32
commit 69d381a
Show file tree

Hide file tree

Showing 9 changed files with 242 additions and 103 deletions.
diff --git a/packages/stablestudio-ui/src-tauri/Cargo.lock b/packages/stablestudio-ui/src-tauri/Cargo.lock
diff --git a/packages/stablestudio-ui/src-tauri/Cargo.toml b/packages/stablestudio-ui/src-tauri/Cargo.toml
@@ -17,7 +17,7 @@ tauri-build = { version = "1.4.0", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.4.1", features = [ "fs-all", "path-all", "process-command-api", "devtools"] }
+tauri = { version = "1.4.1", features = [ "os-all", "fs-all", "path-all", "process-command-api", "devtools"] }
 tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 zip = "0.6.6"
 zip-extensions = "0.6.1"

diff --git a/packages/stablestudio-ui/src-tauri/src/main.rs b/packages/stablestudio-ui/src-tauri/src/main.rs
@@ -15,6 +15,7 @@ use tauri::{RunEvent, Window, WindowBuilder, WindowUrl};
 use tauri_plugin_upload;
 
 mod server;
+mod show_path;
 
 static WINDOW: OnceLock<Window> = OnceLock::new();
 
@@ -58,7 +59,11 @@ fn main() {
             Ok(())
         })
         .plugin(tauri_plugin_upload::init())
-        .invoke_handler(tauri::generate_handler![extract_comfy, launch_comfy])
+        .invoke_handler(tauri::generate_handler![
+            extract_comfy,
+            launch_comfy,
+            show_path::show_in_folder
+        ])
         .build(context)
         .expect("error while building tauri application")
         .run(move |_app_handle, event| match event {

diff --git a/packages/stablestudio-ui/src-tauri/src/server.rs b/packages/stablestudio-ui/src-tauri/src/server.rs
@@ -76,7 +76,7 @@ impl Builder {
                                     Some("text/html".to_string()),
                                     None,
                                 ),
-                                ["api" | "prompt" | "object_info" | "view" | "history" | "queue" | "extensions", ..] => (
+                                ["api" | "prompt" | "object_info" | "view" | "history" | "queue" | "interrupt" | "extensions", ..] => (
                                     None,
                                     None,
                                     Some(

diff --git a/packages/stablestudio-ui/src-tauri/src/show_path.rs b/packages/stablestudio-ui/src-tauri/src/show_path.rs
@@ -0,0 +1,52 @@
+#[cfg(target_os = "linux")]
+use fork::{daemon, Fork};
+use std::process::Command;
+#[cfg(target_os = "linux")]
+use std::{fs::metadata, path::PathBuf}; // dep: fork = "0.1"
+
+#[tauri::command]
+pub fn show_in_folder(path: String) {
+    #[cfg(target_os = "windows")]
+    {
+        Command::new("explorer")
+            .args(["/select,", &path]) // The comma after select is not a typo
+            .spawn()
+            .unwrap();
+    }
+
+    #[cfg(target_os = "linux")]
+    {
+        if path.contains(",") {
+            // see https://gitlab.freedesktop.org/dbus/dbus/-/issues/76
+            let new_path = match metadata(&path).unwrap().is_dir() {
+                true => path,
+                false => {
+                    let mut path2 = PathBuf::from(path);
+                    path2.pop();
+                    path2.into_os_string().into_string().unwrap()
+                }
+            };
+            Command::new("xdg-open").arg(&new_path).spawn().unwrap();
+        } else {
+            if let Ok(Fork::Child) = daemon(false, false) {
+                Command::new("dbus-send")
+                    .args([
+                        "--session",
+                        "--dest=org.freedesktop.FileManager1",
+                        "--type=method_call",
+                        "/org/freedesktop/FileManager1",
+                        "org.freedesktop.FileManager1.ShowItems",
+                        format!("array:string:\"file://{path}\"").as_str(),
+                        "string:\"\"",
+                    ])
+                    .spawn()
+                    .unwrap();
+            }
+        }
+    }
+
+    #[cfg(target_os = "macos")]
+    {
+        Command::new("open").args(["-R", &path]).spawn().unwrap();
+    }
+}
diff --git a/packages/stablestudio-ui/src-tauri/tauri.conf.json b/packages/stablestudio-ui/src-tauri/tauri.conf.json
@@ -17,6 +17,9 @@
       },
       "path": {
         "all": true
+      },
+      "os": {
+        "all": true
       }
     },
     "bundle": {