From ab7c9b571921d3d82fad754ba5d89e14aa13e2a9 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Thu, 25 Aug 2022 15:29:46 -0700 Subject: [PATCH 1/3] chore: bumping versions for v2022.8.10 release --- README.md | 6 +++--- VERSION.json | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 751348cb8..d92b69054 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,13 @@

Download now: - + macOS | - + Windows | - + Linux (AppImage)
diff --git a/VERSION.json b/VERSION.json index e5245bacc..7b68e675c 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,23 +1,23 @@ { - "version": "22.8.9", - "notes": "See full release notes here: https://github.com/a5huynh/spyglass/releases/tag/v2022.8.9", - "pub_date": "2022-08-18T03:27:47Z", + "version": "22.8.10", + "notes": "See full release notes here: https://github.com/a5huynh/spyglass/releases/tag/v2022.8.10", + "pub_date": "2022-08-25T22:28:13Z", "platforms": { "darwin-x86_64": { - "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSRk9WYXdDUXphYmtUVjlmVzRKeldDdjZpS3BxM1VyMllKTU4vM2ZrSXRQdUNlN0dLRTFna0MwL0Z4TmJRUDl5SEF1OC9GeDQ0VUtzVzYyWWJKMDBXU2VwMnVtdTJZTmc4PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNjYwNzgyNzAzCWZpbGU6U3B5Z2xhc3MuYXBwLnRhci5negowZVl5OGRQWFNjMEF5YXF4WlZ4NXNvRlFQdURxMUZ4Uk9EWm9oWmhsVU0xdC9Ic0ZORmpJZHVaeGlBRENMcFloa1hsY3NIaHNWQzUvcXBtNlZoaURDQT09Cg==", - "url": "https://github.com/a5huynh/spyglass/releases/download/v2022.8.9/Spyglass.app.tar.gz" + "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSRk9WYXdDUXphYmo3ek1pQU44MVNNdktXV0x5UUt4SkdxQ0krbE1TbkFPUVVZSU9RcDBFd1VqQUlDcGdPNFpMWGtObVpZV3hHNWJuYVZwVDNCUVNXbU5qc3YrR0FSaXdRPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNjYxNDY1NDc5CWZpbGU6U3B5Z2xhc3MuYXBwLnRhci5negoxcTVtaHZFbzk4VmlRTW43OGk2WkNpcjFvbGllMTNDS0hsTzNoOVUwWlVjVldwNFFFVS95UGE3K3YzZ0xaVlRGV3psekFMdEJVUTJVVWl2NExXdlVCdz09Cg==", + "url": "https://github.com/a5huynh/spyglass/releases/download/v2022.8.10/Spyglass.app.tar.gz" }, "darwin-aarch64": { - "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSRk9WYXdDUXphYmtUVjlmVzRKeldDdjZpS3BxM1VyMllKTU4vM2ZrSXRQdUNlN0dLRTFna0MwL0Z4TmJRUDl5SEF1OC9GeDQ0VUtzVzYyWWJKMDBXU2VwMnVtdTJZTmc4PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNjYwNzgyNzAzCWZpbGU6U3B5Z2xhc3MuYXBwLnRhci5negowZVl5OGRQWFNjMEF5YXF4WlZ4NXNvRlFQdURxMUZ4Uk9EWm9oWmhsVU0xdC9Ic0ZORmpJZHVaeGlBRENMcFloa1hsY3NIaHNWQzUvcXBtNlZoaURDQT09Cg==", - "url": "https://github.com/a5huynh/spyglass/releases/download/v2022.8.9/Spyglass.app.tar.gz" + "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSRk9WYXdDUXphYmo3ek1pQU44MVNNdktXV0x5UUt4SkdxQ0krbE1TbkFPUVVZSU9RcDBFd1VqQUlDcGdPNFpMWGtObVpZV3hHNWJuYVZwVDNCUVNXbU5qc3YrR0FSaXdRPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNjYxNDY1NDc5CWZpbGU6U3B5Z2xhc3MuYXBwLnRhci5negoxcTVtaHZFbzk4VmlRTW43OGk2WkNpcjFvbGllMTNDS0hsTzNoOVUwWlVjVldwNFFFVS95UGE3K3YzZ0xaVlRGV3psekFMdEJVUTJVVWl2NExXdlVCdz09Cg==", + "url": "https://github.com/a5huynh/spyglass/releases/download/v2022.8.10/Spyglass.app.tar.gz" }, "linux-x86_64": { - "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSRk9WYXdDUXphYnB6VFpkU3ZxZXNLN1MrR2V5ZjNvU0orc0dOMnU5TVprOWxjdHo1UVZIeU02RWc4UW0zRkNQTVYyakhVN09QaUxuVXg1Z2xZWXNUVWJVQ0MxaWdmZWdBPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNjYwNzgxOTMxCWZpbGU6c3B5Z2xhc3NfMjIuOC45X2FtZDY0LkFwcEltYWdlLnRhci5negpTN2FxQTYzZmhDS2FOMWxjOUlCeHNSV2h6S2dIZHNYbm5obk1meUZyZXhHc1BTamFkaW00UUtmNUMxTTlqaGhGbEtsaEhyNnZaZnZlVXFTMndsd3NDdz09Cg==", - "url": "https://github.com/a5huynh/spyglass/releases/download/v2022.8.9/spyglass_22.8.9_amd64.AppImage.tar.gz" + "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSRk9WYXdDUXphYm5EWFFtWkRnNTF6Rmk5SllSQzdPOFhVRlVCWGtSa2NESUhZdkhKYnNObit3dnZUaUZSOFZkNlI1WUhIeU5Mc3Q2MjB0Y0xaUlBsc2xVRmZXTWp4ZGdnPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNjYxNDYzODAxCWZpbGU6c3B5Z2xhc3NfMjIuOC4xMF9hbWQ2NC5BcHBJbWFnZS50YXIuZ3oKMzRKS0YrRU4rMGpaMndNbUViTGJWZFZxV1cvd3ZtQWxwWVFSUzMwNU5lY21HbWZacWRjNkRFclpFS2w4d2FnRHlUVXZRSXk5dDVtalFhQVA4SVdXQkE9PQo=", + "url": "https://github.com/a5huynh/spyglass/releases/download/v2022.8.10/spyglass_22.8.10_amd64.AppImage.tar.gz" }, "windows-x86_64": { - "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSRk9WYXdDUXphYnZ4VGNLSUJpcE5USHRocm5Zd0UrN0Znb0YxcmtrVkpiVVB4QmlSbi9ENkkvUlNzYWdIYmZKSDZLVnRXQlJNZEJFRUJuQkQvL3Roa3U0T2xBOVJGSWdJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNjYwNzgzMzAxCWZpbGU6U3B5Z2xhc3NfMjIuOC45X3g2NF9lbi1VUy5tc2kuemlwClV6UnhtWGplbnFCNWNEWVg1R2VEa2FUdGdTUlhyWUpDbWxmRE1abUk5VmVmeTBPL3VaTzhaRERtbi9VQmovM0hJYml5UjVjN0lJY0E0b1YyNUMzQ0R3PT0K", - "url": "https://github.com/a5huynh/spyglass/releases/download/v2022.8.9/Spyglass_22.8.9_x64_en-US.msi.zip" + "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSRk9WYXdDUXphYm4rQVlES1lEZnhEbFYzMlRyOFFyc2NNaW9oUG11NWREcldUcENzMENrQW5qVXBJbzlWMy9pQ1pvdjNLUklPd2ZJWWR1N1dNVXA0cUZLRVA4VDFYTkFVPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNjYxNDY0ODU2CWZpbGU6U3B5Z2xhc3NfMjIuOC4xMF94NjRfZW4tVVMubXNpLnppcApCY0J2QWlTekFKcE1yUjkvNE1UQTNYY0piODVuT1BLeHoxbHhmUHdSZjA1M3cybDVqQ1M2UlVoV1Z6Q3FxY0dPdTBySG9OeE0wWkJOMnVSTnYreVRBQT09Cg==", + "url": "https://github.com/a5huynh/spyglass/releases/download/v2022.8.10/Spyglass_22.8.10_x64_en-US.msi.zip" } } } \ No newline at end of file From 9f10e0f9bb633348b9af77f70c4ca577397b35a4 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Thu, 25 Aug 2022 20:41:26 -0700 Subject: [PATCH 2/3] hotfix: fixing issue w/ wizard stalling tauri when opened in on_page_load (#177) --- crates/tauri/src/main.rs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/crates/tauri/src/main.rs b/crates/tauri/src/main.rs index f43d97898..3f3f9726a 100644 --- a/crates/tauri/src/main.rs +++ b/crates/tauri/src/main.rs @@ -152,7 +152,7 @@ fn main() -> Result<(), Box> { let rpc = tauri::async_runtime::block_on(rpc::RpcClient::new()); app.manage(Arc::new(Mutex::new(rpc))); // Load user settings - app.manage(config); + app.manage(config.clone()); app.manage(Arc::new(PauseState::new(false))); // Center window horizontally in the current screen @@ -168,6 +168,14 @@ fn main() -> Result<(), Box> { } }); + if !config.user_settings.run_wizard { + window::show_wizard_window(&window.app_handle()); + // Only run the wizard once. + let mut updated = config.user_settings.clone(); + updated.run_wizard = true; + let _ = config.save_user_settings(&updated); + } + Ok(()) }) .on_window_event(|event| { @@ -248,15 +256,6 @@ fn main() -> Result<(), Box> { } Err(e) => window::alert(&window_clone, "Error registering global shortcut", &format!("{}", e)) } - - if !config.user_settings.run_wizard { - window::show_wizard_window(&window.app_handle()); - // Only run the wizard once. - let mut updated = config.user_settings.clone(); - updated.run_wizard = true; - let _ = config.save_user_settings(&updated); - } - }) .run(ctx) .expect("error while running tauri application"); From c7f72392467aa3113e754a7c64e04cf1116bb4c6 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Thu, 25 Aug 2022 20:42:09 -0700 Subject: [PATCH 3/3] hotfix release v2022.8.11 --- Cargo.lock | 2 +- crates/spyglass/Cargo.toml | 2 +- crates/tauri/tauri.conf.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7bcd2508d..8c70bde15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4974,7 +4974,7 @@ dependencies = [ [[package]] name = "spyglass" -version = "22.8.10" +version = "22.8.11" dependencies = [ "addr", "anyhow", diff --git a/crates/spyglass/Cargo.toml b/crates/spyglass/Cargo.toml index c3442cf71..7ff26872b 100644 --- a/crates/spyglass/Cargo.toml +++ b/crates/spyglass/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spyglass" -version = "22.8.10" +version = "22.8.11" edition = "2021" [dependencies] diff --git a/crates/tauri/tauri.conf.json b/crates/tauri/tauri.conf.json index 72a675c95..78e1d0ade 100644 --- a/crates/tauri/tauri.conf.json +++ b/crates/tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "package": { "productName": "Spyglass", - "version": "22.8.10" + "version": "22.8.11" }, "build": { "distDir": "../client/dist",