DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
refactor(updates): hold the install back while documents are unsaved
Dylan M. Taylorc784a9db66dc
diff --git a/Cargo.lock b/Cargo.lockindex e278722b7..e68fd0d1d 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -1007,6 +1007,31 @@ dependencies = ["serde",]+[[package]]+name = "craft-update"+version = "0.1.0"+source = "git+https://github.com/storytold/craft-libs?rev=5b0f3c572a3b5c1e51bdb90d7ff788e0212ec1cc#5b0f3c572a3b5c1e51bdb90d7ff788e0212ec1cc"+dependencies = [+ "chrono",+ "dunce",+ "egui",+ "flate2",+ "getrandom 0.3.4",+ "log",+ "plist",+ "semver",+ "serde",+ "serde_json",+ "sha2",+ "tar",+ "tempfile",+ "ureq",+ "verifysign",+ "winreg",+ "winsafe",+ "zip 9.1.0",+]+[[package]]name = "craft-window"version = "0.1.0"@@ -1133,6 +1158,12 @@ dependencies = ["syn 2.0.119",]+[[package]]+name = "deranged"+version = "0.5.9"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "9e9de72ce2ad1f90dc62fa25f0f430ef85eb4b0d8fa0be4f30373bc40a21d28e"+[[package]]name = "derive_arbitrary"version = "1.4.2"@@ -1149,6 +1180,7 @@ name = "designcraft"version = "0.13.0"dependencies = ["arboard",+ "craft-update","craft-window","designcraft-engine","designcraft-ui-egui",@@ -1256,7 +1288,7 @@ dependencies = ["indd","kurbo","log",- "quick-xml",+ "quick-xml 0.41.0","same-file","serde","serde_json",@@ -1264,7 +1296,7 @@ dependencies = ["thiserror 2.0.21","unicode-segmentation","wasm-bindgen-test",- "zip",+ "zip 3.0.0",][[package]]@@ -1274,7 +1306,7 @@ dependencies = ["chrono","designcraft-color","designcraft-doc",- "zip",+ "zip 3.0.0",][[package]]@@ -1299,7 +1331,7 @@ dependencies = ["serde","serde_json","thiserror 2.0.21",- "zip",+ "zip 3.0.0",][[package]]@@ -1325,9 +1357,9 @@ dependencies = ["designcraft-geom","designcraft-images","log",- "quick-xml",+ "quick-xml 0.41.0","thiserror 2.0.21",- "zip",+ "zip 3.0.0",][[package]]@@ -1340,7 +1372,7 @@ dependencies = ["flate2","image","log",- "quick-xml",+ "quick-xml 0.41.0","resvg","tiff","zune-core",@@ -1395,10 +1427,10 @@ dependencies = ["designcraft-geom","designcraft-images","image",- "quick-xml",+ "quick-xml 0.41.0","skrifa 0.47.0","thiserror 2.0.21",- "zip",+ "zip 3.0.0",][[package]]@@ -1425,8 +1457,8 @@ name = "designcraft-textimport"version = "0.13.0"dependencies = ["designcraft-doc",- "quick-xml",- "zip",+ "quick-xml 0.41.0",+ "zip 3.0.0",][[package]]@@ -1446,6 +1478,7 @@ name = "designcraft-ui-egui"version = "0.13.0"dependencies = ["craft-ui",+ "craft-update","craft-window","designcraft-color","designcraft-compose",@@ -1465,7 +1498,7 @@ dependencies = ["toml","unicode-bidi","web-time",- "zip",+ "zip 3.0.0",][[package]]@@ -1815,7 +1848,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]]@@ -3284,7 +3317,7 @@ dependencies = ["once_cell","png","thiserror 2.0.21",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -3361,6 +3394,18 @@ dependencies = ["jni-sys 0.3.1",]+[[package]]+name = "nix"+version = "0.31.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"+dependencies = [+ "bitflags 2.13.2",+ "cfg-if",+ "cfg_aliases",+ "libc",+]+[[package]]name = "nohash-hasher"version = "0.2.0"@@ -3382,9 +3427,15 @@ 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]]+name = "num-conv"+version = "0.2.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"+[[package]]name = "num-traits"version = "0.2.19"@@ -3801,7 +3852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"dependencies = ["libc",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -4068,6 +4119,19 @@ version = "0.2.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"+[[package]]+name = "plist"+version = "1.10.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "327a4cb2ad49dc48adfdc9da89e22c64d488b508c67a044d71ba729e4521a285"+dependencies = [+ "base64 0.23.1",+ "indexmap",+ "quick-xml 0.42.0",+ "serde",+ "time",+]+[[package]]name = "png"version = "0.18.1"@@ -4140,6 +4204,12 @@ dependencies = ["zerovec",]+[[package]]+name = "powerfmt"+version = "0.2.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958"+[[package]]name = "ppv-lite86"version = "0.2.21"@@ -4268,6 +4338,15 @@ dependencies = ["memchr",]+[[package]]+name = "quick-xml"+version = "0.42.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "41b1177fdf999d2321d3fb46ff47159d9c1fb9ad66a4879f8c50a0b504615e9b"+dependencies = [+ "memchr",+]+[[package]]name = "quinn"version = "0.11.12"@@ -4322,7 +4401,7 @@ dependencies = ["once_cell","socket2","tracing",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -4740,7 +4819,7 @@ dependencies = ["errno","libc","linux-raw-sys 0.12.1",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -4750,7 +4829,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf"dependencies = ["aws-lc-rs",+ "log","once_cell",+ "ring","rustls-pki-types","rustls-webpki","subtle",@@ -4797,7 +4878,7 @@ dependencies = ["security-framework","security-framework-sys","webpki-root-certs",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -4930,6 +5011,10 @@ name = "semver"version = "1.0.28"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"+dependencies = [+ "serde",+ "serde_core",+][[package]]name = "send_wrapper"@@ -5400,7 +5485,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]]@@ -5597,7 +5682,7 @@ dependencies = ["getrandom 0.4.3","once_cell","rustix 1.1.5",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -5672,6 +5757,36 @@ dependencies = ["zune-jpeg",]+[[package]]+name = "time"+version = "0.3.55"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134"+dependencies = [+ "deranged",+ "num-conv",+ "powerfmt",+ "serde_core",+ "time-core",+ "time-macros",+]++[[package]]+name = "time-core"+version = "0.1.9"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"++[[package]]+name = "time-macros"+version = "0.2.32"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85"+dependencies = [+ "num-conv",+ "time-core",+]+[[package]]name = "tiny-skia"version = "0.12.0"@@ -5936,6 +6051,12 @@ dependencies = ["rustc-hash 2.1.3",]+[[package]]+name = "typed-path"+version = "0.13.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "9ce898823d8cd0f028662d2f349694b1af0a5cc9be83f1d213a00d3147445e1e"+[[package]]name = "typenum"version = "1.20.1"@@ -5950,7 +6071,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"dependencies = ["memoffset","tempfile",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -6040,6 +6161,35 @@ version = "0.9.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"+[[package]]+name = "ureq"+version = "3.5.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "cde93ff05758a36a851a398a772b0b79a82fbe3c186a46f2696baaeaf84c966b"+dependencies = [+ "base64 0.23.1",+ "flate2",+ "log",+ "percent-encoding",+ "rustls",+ "rustls-pki-types",+ "rustls-platform-verifier",+ "ureq-proto",+ "utf8-zero",+]++[[package]]+name = "ureq-proto"+version = "0.6.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "841583fc36089d7d59419568ae157f43a5a03a2e5a81ba87c77d1596ef46e922"+dependencies = [+ "base64 0.23.1",+ "http",+ "httparse",+ "log",+]+[[package]]name = "url"version = "2.5.8"@@ -6080,6 +6230,12 @@ dependencies = ["xmlwriter",]+[[package]]+name = "utf8-zero"+version = "0.8.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e"+[[package]]name = "utf8_iter"version = "1.0.4"@@ -6177,6 +6333,16 @@ dependencies = ["vello_common 0.2.0",]+[[package]]+name = "verifysign"+version = "1.0.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "6acfcc42a8d44f340d001193d97ef56bf33210b51ad760ae8308c97d5241ca51"+dependencies = [+ "core-foundation 0.10.1",+ "windows-sys 0.61.2",+]+[[package]]name = "version_check"version = "0.9.5"@@ -6440,7 +6606,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0"dependencies = ["proc-macro2",- "quick-xml",+ "quick-xml 0.41.0","quote",]@@ -6696,7 +6862,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]]@@ -7065,6 +7231,16 @@ dependencies = ["xml",]+[[package]]+name = "winreg"+version = "0.55.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"+dependencies = [+ "cfg-if",+ "windows-sys 0.59.0",+]+[[package]]name = "winresource"version = "0.1.31"@@ -7490,6 +7666,23 @@ dependencies = ["zopfli",]+[[package]]+name = "zip"+version = "9.1.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "2886b00003a72c4ccee3f42cfc34908d33b2508a74d827dc2a4244706475c704"+dependencies = [+ "crc32fast",+ "flate2",+ "getrandom 0.4.3",+ "indexmap",+ "memchr",+ "nix",+ "typed-path",+ "windows-sys 0.61.2",+ "zopfli",+]+[[package]]name = "zlib-rs"version = "0.6.8"diff --git a/crates/ui-egui/src/updates_ui.rs b/crates/ui-egui/src/updates_ui.rsindex 283242f0e..c1da50c6b 100644--- a/crates/ui-egui/src/updates_ui.rs+++ b/crates/ui-egui/src/updates_ui.rs@@ -74,7 +74,9 @@ pub(crate) fn tick(app: &mut DesignApp, ctx: &egui::Context) {pub(crate) fn show(app: &mut DesignApp, 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.documents().iter().any(|d| d.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 => {}