From 6bf130c6a1155bbad329727279ecc86014b1740c Mon Sep 17 00:00:00 2001 From: swyx Date: Sun, 4 Sep 2022 02:44:19 -0400 Subject: [PATCH 1/2] add fixes --- package.json | 2 + src-tauri/src/main.rs | 7 +- src/App.svelte | 10 +- yarn.lock | 1794 ++++++++++++++++++++++------------------- 4 files changed, 992 insertions(+), 821 deletions(-) diff --git a/package.json b/package.json index 6439515..89862c3 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "dev": "vite", "build": "vite build", "preview": "vite preview", + "tauri": "tauri", "check": "svelte-check --tsconfig ./tsconfig.json" }, "devDependencies": { @@ -26,6 +27,7 @@ }, "dependencies": { "@tauri-apps/api": "^1.0.2", + "@tauri-apps/cli": "^1.0.5", "tauri-settings": "^0.1.2" } } diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 4354f7f..05678f7 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -14,6 +14,9 @@ fn main() { .add_native_item(MenuItem::Copy) .add_native_item(MenuItem::Paste) .add_native_item(MenuItem::Cut) + .add_native_item(MenuItem::SelectAll) + .add_native_item(MenuItem::Undo) + .add_native_item(MenuItem::Redo) .add_item(CustomMenuItem::new("hide", "Hide")) .add_submenu(submenu); @@ -38,9 +41,9 @@ fn main() { } #[tauri::command] -async fn stable_diffusion_command(command: String) -> String { +async fn stable_diffusion_command(directory: String, command: String) -> String { // let stable_diffusion_directory = Path::new("/Users/zagreus/code/ml/stable-diffusion"); - let stable_diffusion_directory = "/Users/zagreus/code/ml/stable-diffusion"; + let stable_diffusion_directory = directory; // "/Users/zagreus/code/ml/stable-diffusion"; let virtual_env_cmd = "venv/bin/activate"; println!("Stable Diffusion directory: {}", stable_diffusion_directory); diff --git a/src/App.svelte b/src/App.svelte index 25b65b2..c2f5aa9 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -19,7 +19,7 @@ --ddim_steps 100 (1m) 2m on M1 Pro */ let stableDiffusionDirectoryInput: HTMLInputElement; - let stableDiffusionDirectory: string = ""; + $: stableDiffusionDirectory = ""; let stableDiffusionOutputDirectory: string = ""; let stableDiffusionCommand: string = ""; let stableDiffusionCommandHtml: string = ""; @@ -92,6 +92,7 @@ // Invoke the Stable Diffusion command await invoke("stable_diffusion_command", { + directory: stableDiffusionDirectory, command: stableDiffusionCommand, }) .then((res) => { @@ -126,7 +127,7 @@ }); -
+
100 + {@debug stableDiffusionDirectory} + {@debug prompt} + {@debug generating} + +