Better update logic

src-tauri/Cargo.lock

@@ -123,17 +123,6 @@ dependencies = [
  "critical-section",
 ]
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -535,30 +524,6 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "clap"
-version = "3.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
-dependencies = [
- "atty",
- "bitflags 1.3.2",
- "clap_lex",
- "indexmap 1.9.3",
- "strsim",
- "termcolor",
- "textwrap",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
 [[package]]
 name = "cobs"
 version = "0.2.3"
@@ -1756,15 +1721,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.3"
@@ -2162,7 +2118,7 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "hermit-abi 0.3.3",
+ "hermit-abi",
  "rustix",
  "windows-sys 0.48.0",
 ]
@@ -2705,7 +2661,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.3",
+ "hermit-abi",
  "libc",
 ]
 
@@ -2883,12 +2839,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "os_str_bytes"
-version = "6.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
-
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -4523,7 +4473,6 @@ dependencies = [
  "anyhow",
  "base64 0.21.5",
  "bytes",
- "clap",
  "cocoa 0.24.1",
  "dirs-next",
  "embed_plist",
@@ -4782,21 +4731,6 @@ dependencies = [
  "utf-8",
 ]
 
-[[package]]
-name = "termcolor"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
 [[package]]
 name = "thin-slice"
 version = "0.1.1"

src-tauri/Cargo.toml

@@ -30,7 +30,6 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["raw_value"] }
 sqlx = { version = "0.7.2", features = ["sqlite", "runtime-tokio-rustls", "json", "chrono", "time"] }
 tauri = { version = "1.3", features = [
-    "cli",
     "config-toml",
     "devtools",
     "fs-read-file",

src-tauri/src/updates.rs

@@ -38,13 +38,40 @@ impl YaakUpdater {
             .await
         {
             Ok(update) => {
-                if dialog::blocking::ask(
+                let h = app_handle.clone();
+                dialog::ask(
                     None::<&Window>,
-                    "Update available",
+                    "Update Available",
-                    format!("{} is available. Would you like to download and install it now?", update.latest_version()),
+                    format!(
-                ) {
+                        "{} is available. Would you like to download and install it now?",
-                    _ = update.download_and_install().await;
+                        update.latest_version()
-                }
+                    ),
+                    |confirmed| {
+                        if !confirmed {
+                            return;
+                        }
+                        tauri::async_runtime::spawn(async move {
+                            match update.download_and_install().await {
+                                Ok(_) => {
+                                    if dialog::blocking::ask(
+                                        None::<&Window>,
+                                        "Update Installed",
+                                        format!("Would you like to restart the app?",),
+                                    ) {
+                                        h.restart();
+                                    }
+                                }
+                                Err(e) => {
+                                    dialog::message(
+                                        None::<&Window>,
+                                        "Update Failed",
+                                        format!("The update failed to install: {}", e),
+                                    );
+                                }
+                            }
+                        });
+                    },
+                );
                 Ok(())
             }
             Err(updater::Error::UpToDate) => Ok(()),

src-tauri/tauri.conf.json

@@ -8,26 +8,10 @@
   },
   "package": {
     "productName": "Yaak",
-    "version": "2023.3.0-beta.2"
+    "version": "2023.2.0-beta.0"
   },
   "tauri": {
     "windows": [],
-    "cli": {
-      "description": "Yaak CLI",
-      "longDescription": "This is the Yaak CLI, yo",
-      "beforeHelp": "u can use it to build, develop and manage your Yaak application.",
-      "afterHelp": "Have fun!",
-      "args": [],
-      "subcommands": {
-        "import": {
-          "args": [{
-            "name": "file",
-            "short": "f",
-            "takesValue": true
-          }]
-        }
-      }
-    },
     "allowlist": {
       "all": false,
       "os": {