EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
refactor(updates): drive the flow with craft-update's Updater
Dylan M. Taylor1be30a16073e
diff --git a/Cargo.lock b/Cargo.lockindex 175f3690a..2c400a50f 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -1033,7 +1033,7 @@ dependencies = [[[package]]name = "craft-update"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=13ceaf2f31620531f39a54f6b994d581a6082a93#13ceaf2f31620531f39a54f6b994d581a6082a93"+source = "git+https://github.com/storytold/craft-libs?rev=5b0f3c572a3b5c1e51bdb90d7ff788e0212ec1cc#5b0f3c572a3b5c1e51bdb90d7ff788e0212ec1cc"dependencies = ["chrono","dunce",@@ -2049,7 +2049,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"dependencies = ["libc",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -3423,7 +3423,7 @@ dependencies = ["once_cell","png","thiserror 2.0.21",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -3548,7 +3548,7 @@ version = "0.50.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"dependencies = [- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -4047,7 +4047,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"dependencies = ["libc",- "windows-sys 0.61.2",+ "windows-sys 0.45.0",][[package]]@@ -4715,7 +4715,7 @@ dependencies = ["errno","libc","linux-raw-sys 0.12.1",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -4772,7 +4772,7 @@ dependencies = ["security-framework","security-framework-sys","webpki-root-certs",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -5131,7 +5131,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"dependencies = ["libc",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -5447,7 +5447,7 @@ dependencies = ["getrandom 0.4.3","once_cell","rustix 1.1.5",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -5725,7 +5725,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"dependencies = ["memoffset","tempfile",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -6517,7 +6517,7 @@ version = "0.1.11"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"dependencies = [- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]diff --git a/Cargo.toml b/Cargo.tomlindex 073e744d8..ec2b469c4 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -12,7 +12,7 @@ repository = "https://github.com/storytold/effectcraft"[workspace.dependencies]craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.1.0", default-features = false, features = ["read"] }-craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "13ceaf2f31620531f39a54f6b994d581a6082a93", features = ["egui"] }+craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "5b0f3c572a3b5c1e51bdb90d7ff788e0212ec1cc", features = ["egui"] }craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "82a24b006eefa036b43c09a67fb9a3fbd17ffe63" }# internaleffectcraft-time = { path = "crates/time" }diff --git a/crates/ui-egui/src/updates_ui.rs b/crates/ui-egui/src/updates_ui.rsindex a93517c70..9ae6d547e 100644--- a/crates/ui-egui/src/updates_ui.rs+++ b/crates/ui-egui/src/updates_ui.rs@@ -70,7 +70,9 @@ pub(crate) fn tick(app: &mut EffectcraftApp, ctx: &egui::Context) {pub(crate) fn show(app: &mut EffectcraftApp, ctx: &egui::Context) {#[cfg(not(target_arch = "wasm32"))]{- match app.updates_rt.updater.show(ctx) {+ // The restart helper is scheduled before the app closes, so no update starts over unsaved work.+ let clean = !app.session.is_dirty();+ match app.updates_rt.updater.show_if(ctx, clean) {Action::OpenUrl(url) => ctx.open_url(egui::OpenUrl::new_tab(url)),Action::Close => ctx.send_viewport_cmd(egui::ViewportCommand::Close),Action::None => {}