diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 0000000..2ad2672 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,6 @@ +[build] +# `target` to to prevent rebuilding from scratch on each change +[target.wasm32-unknown-unknown] +# https://docs.rs/web-sys/latest/web_sys/struct.Window.html#method.show_open_file_picker +# https://github.com/rustwasm/wasm-bindgen/issues/2339#issuecomment-1000651386 +rustflags = ["--cfg=web_sys_unstable_apis"] diff --git a/.gitignore b/.gitignore index cf67cae..2ecdede 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ frontend_dist/_api frontend_dist/index.html mzoon tauri +!.vscode diff --git a/Cargo.lock b/Cargo.lock index 54b2d6d..78eb858 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -315,18 +315,144 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" +[[package]] +name = "ashpd" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "rand 0.8.5", + "serde", + "serde_repr", + "tokio", + "url", + "zbus", +] + [[package]] name = "askama_escape" version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener", + "event-listener-strategy", + "pin-project-lite", +] + [[package]] name = "async-once-cell" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" +[[package]] +name = "async-process" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +dependencies = [ + "async-channel", + "async-io", + "async-lock", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", +] + +[[package]] +name = "async-signal" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "329972aa325176e89114919f2a80fdae4f4c040f66a370b1a1159c6c0f94e7aa" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + [[package]] name = "async-trait" version = "0.1.80" @@ -361,6 +487,12 @@ dependencies = [ "system-deps", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.3.0" @@ -431,6 +563,19 @@ dependencies = [ "generic-array", ] +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite", + "piper", +] + [[package]] name = "bool_ext" version = "0.5.3" @@ -695,6 +840,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "console_error_panic_hook" version = "0.1.7" @@ -917,6 +1071,17 @@ dependencies = [ "serde", ] +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -940,6 +1105,15 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + [[package]] name = "dirs-next" version = "2.0.0" @@ -950,6 +1124,18 @@ dependencies = [ "dirs-sys-next", ] +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -1015,7 +1201,7 @@ dependencies = [ "futures-channel", "futures-signals", "futures-util", - "gloo-events", + "gloo-events 0.1.2", "js-sys", "once_cell", "pin-project", @@ -1113,6 +1299,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + [[package]] name = "enum-ordinalize" version = "4.3.0" @@ -1133,6 +1325,27 @@ dependencies = [ "syn 2.0.61", ] +[[package]] +name = "enumflags2" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", +] + [[package]] name = "env_logger" version = "0.10.2" @@ -1170,6 +1383,27 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener", + "pin-project-lite", +] + [[package]] name = "fastrand" version = "2.1.0" @@ -1182,8 +1416,10 @@ version = "0.1.0" dependencies = [ "serde", "serde_json", + "shared", "tauri", "tauri-build", + "tauri-plugin-dialog", "tauri-plugin-window-state", "wellen", ] @@ -1263,7 +1499,10 @@ dependencies = [ name = "frontend" version = "0.1.0" dependencies = [ + "gloo-file", + "shared", "wasm-bindgen-test", + "web-sys", "wellen", "zoon", ] @@ -1344,6 +1583,19 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" version = "0.3.30" @@ -1687,6 +1939,29 @@ dependencies = [ "web-sys", ] +[[package]] +name = "gloo-events" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27c26fb45f7c385ba980f5fa87ac677e363949e065a083722697ef1b2cc91e41" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-file" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97563d71863fb2824b2e974e754a81d19c4a7ec47b09ced8a0e6656b6d54bd1f" +dependencies = [ + "futures-channel", + "gloo-events 0.2.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gobject-sys" version = "0.18.0" @@ -2505,9 +2780,9 @@ dependencies = [ [[package]] name = "muda" -version = "0.13.1" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f428b4e9db3d17e2f809dfb1ff9ddfbbf16c71790d1656d10aee320877e1392f" +checksum = "86b959f97c97044e4c96e32e1db292a7d594449546a3c6b77ae613dc3a5b5145" dependencies = [ "cocoa", "crossbeam-channel", @@ -2582,6 +2857,18 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "libc", + "memoffset", +] + [[package]] name = "nodrop" version = "0.1.14" @@ -2675,6 +2962,17 @@ dependencies = [ "objc_exception", ] +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -2708,6 +3006,22 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + [[package]] name = "overload" version = "0.1.1" @@ -2748,6 +3062,12 @@ dependencies = [ "system-deps", ] +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + [[package]] name = "parking_lot" version = "0.4.8" @@ -2971,6 +3291,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + [[package]] name = "pkg-config" version = "0.3.30" @@ -3004,6 +3335,21 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "polling" +version = "3.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -3359,6 +3705,30 @@ dependencies = [ "winreg", ] +[[package]] +name = "rfd" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" +dependencies = [ + "ashpd", + "block", + "dispatch", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "log", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle 0.6.1", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-sys 0.48.0", +] + [[package]] name = "ring" version = "0.17.8" @@ -3753,6 +4123,9 @@ dependencies = [ [[package]] name = "shared" version = "0.1.0" +dependencies = [ + "wellen", +] [[package]] name = "signal-hook-registry" @@ -4058,9 +4431,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri" -version = "2.0.0-beta.19" +version = "2.0.0-beta.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8e5bc2e4f5eb7496d1a3e5f4d272f69f1333db5f8efed28d79d7f93334fe95" +checksum = "5a258ecc5ac7ddade525f512c4962fd01cd0f5265e917b4572579c32c027bb31" dependencies = [ "anyhow", "bytes", @@ -4107,9 +4480,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-beta.15" +version = "2.0.0-beta.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aa28eebafcda490fa7097a6e3a4d07f65967614d35dd88b2aaa19dbb49241cd" +checksum = "82b964bb6d03d97e24e12f896aab463b02a3c2ff76a60f728cc37b5548eb470e" dependencies = [ "anyhow", "cargo_toml", @@ -4129,9 +4502,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-beta.15" +version = "2.0.0-beta.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727d13a28e9ec895f537d90a09acb0aa3593f703a715fe8a77f87269d3245b52" +checksum = "3529cfa977ed7c097f2a5e8da19ecffbe61982450a6c819e6165b6d0cfd3dd3a" dependencies = [ "base64 0.22.1", "brotli", @@ -4156,9 +4529,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-beta.15" +version = "2.0.0-beta.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258667612ad901d256e04ace71ac54d4b3dd8fb1e5baa24403b50991cade4365" +checksum = "36f97dd80334f29314aa5f40b5fad10cb9feffd08e5a5324fd728613841e5d33" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -4170,9 +4543,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-beta.14" +version = "2.0.0-beta.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade77c77db5206b493655d44c395ef67c84fec6bd9d4c19237efdced6b3840f8" +checksum = "7c8385fd0a4f661f5652b0d9e2d7256187d553bb174f88564d10ebcfa6a3af53" dependencies = [ "anyhow", "glob", @@ -4186,10 +4559,47 @@ dependencies = [ ] [[package]] -name = "tauri-plugin-window-state" -version = "2.0.0-beta.7" +name = "tauri-plugin-dialog" +version = "2.0.0-beta.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f723f70fef894434dfb265c9b040ea849acc6e49df0d3c66e0b9f9908214b08a" +checksum = "fed4b22c59f7b04ae2a0bed8241aa715b41973c3f042c84aa67a1f4dc0174a8d" +dependencies = [ + "dunce", + "log", + "raw-window-handle 0.6.1", + "rfd", + "serde", + "serde_json", + "tauri", + "tauri-plugin", + "tauri-plugin-fs", + "thiserror", +] + +[[package]] +name = "tauri-plugin-fs" +version = "2.0.0-beta.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa91955751f329e0aa431b87c199b7378b6f91ec0765d2ad9d4c64e017c3cda" +dependencies = [ + "anyhow", + "glob", + "schemars", + "serde", + "serde_json", + "serde_repr", + "tauri", + "tauri-plugin", + "thiserror", + "url", + "uuid", +] + +[[package]] +name = "tauri-plugin-window-state" +version = "2.0.0-beta.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74b5596f41b90668ea37562d512e1dead687d9ae5eadb49f9faa8b875a2740a3" dependencies = [ "bitflags 2.5.0", "log", @@ -4202,9 +4612,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-beta.16" +version = "2.0.0-beta.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "574f3d59cbe6c76b6d849bc35aa3a9e8061ff8f75f557dc33f38c0e43cf55a41" +checksum = "d7dc96172a43536236ab55b7da7b8461bf75810985e668589e2395cb476937cb" dependencies = [ "dpi", "gtk", @@ -4221,9 +4631,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-beta.16" +version = "2.0.0-beta.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d1f223de1d674aaa561c900ac650b3160f11520e9b191a3574f6c493fc77fa" +checksum = "5d4fd913b1f14a9b618c7f3ae35656d3aa759767fcb95b72006357c12b9d0b09" dependencies = [ "cocoa", "gtk", @@ -4245,16 +4655,15 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-beta.15" +version = "2.0.0-beta.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b4251529d92b5c611ccaa611f8a31cb41b1aa00db8bcc0a49efe5d966bfa911" +checksum = "4f24a9c20d676a3f025331cc1c3841256ba88c9f25fb7fae709d2b3089c50d90" dependencies = [ "brotli", "cargo_metadata", "ctor", "dunce", "glob", - "heck 0.5.0", "html5ever", "infer", "json-patch", @@ -4418,6 +4827,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", + "tracing", "windows-sys 0.48.0", ] @@ -4628,14 +5038,14 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.13.5" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39240037d755a1832e752d64f99078c3b0b21c09a71c12405070c75ef4e7cd3c" +checksum = "0b27516dfcfa22a9faaf192283a122bfbede38c1e59ef194e3c4db6549b419c0" dependencies = [ "cocoa", "core-graphics", "crossbeam-channel", - "dirs-next", + "dirs", "libappindicator", "muda", "objc", @@ -4668,6 +5078,17 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset", + "tempfile", + "winapi", +] + [[package]] name = "unic-char-property" version = "0.9.0" @@ -5445,9 +5866,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.39.3" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e180ac2740d6cb4d5cec0abf63eacbea90f1b7e5e3803043b13c1c84c4b7884" +checksum = "1fa597526af53f310a8e6218630c5024fdde8271f229e70d7d2fc70b52b8fb1e" dependencies = [ "base64 0.22.1", "block", @@ -5506,6 +5927,75 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "zbus" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b8e3d6ae3342792a6cc2340e4394334c7402f3d793b390d2c5494a4032b3030" +dependencies = [ + "async-broadcast", + "async-process", + "async-recursion", + "async-trait", + "derivative", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7a3e850ff1e7217a3b7a07eba90d37fe9bb9e89a310f718afcde5885ca9b6d7" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + [[package]] name = "zerocopy" version = "0.7.33" @@ -5565,3 +6055,41 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", ] + +[[package]] +name = "zvariant" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e09e8be97d44eeab994d752f341e67b3b0d80512a8b315a0671d47232ef1b65" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72a5857e2856435331636a9fbb415b09243df4521a267c5bedcd5289b4d5799e" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/Cargo.toml b/Cargo.toml index edd297b..f7fe8b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,7 @@ readme = "../README.md" publish = false [workspace.dependencies] +shared = { path = "./shared" } # wellen = { version = "0.9.9", features = ["serde1"] } # wellen = { path = "../wellen/wellen", features = ["serde1"] } wellen = { git = "https://github.com/MartinKavik/wellen", features = ["serde1"], branch = "new_pub_types" } diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..496b489 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + FastWave - Cross-Platform Wave Viewer + Copyright (C) 2024 Joy of Hardware + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + FastWave Copyright (C) 2024 Joy of Hardware + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Makefile.toml b/Makefile.toml index 2c28aed..6f1c212 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -29,10 +29,23 @@ run_task = { fork = true, parallel = true, name = [ "watch_tauri_glue", ]} +[tasks.start_browser] +description = "Run without Tauri in the browser & watch Typescript and Rust in the debug mode" +dependencies = ["store_current_process_id"] +run_task = { fork = true, parallel = true, name = [ + "mzoon_start_with_cleanup", + "watch_pixi_canvas", + "watch_tauri_glue", +]} + [tasks.bundle] description = "Compile in the release mode and create installation packages" dependencies = ["tauri_build", "show_release_paths"] +# @TODO Write task `bundle_browser` once we know whether we need only the frontend +# or also the backend side (Moon server). +# (Don't forget to add the task to the main README.md) + # @TODO: Format also Typescript and CSS [tasks.format] description = "Format code" @@ -46,10 +59,15 @@ description = "Run locally installed tauri" command = "tauri/bin/cargo-tauri" args = ["${@}"] +[tasks.mzoon_for_tauri] +description = "Run locally installed mzoon with env var FASTWAVE_PLATFORM=TAURI" +extend = "mzoon_without_env_var_fastwave_platform" +env = { FASTWAVE_PLATFORM = "TAURI" } + [tasks.mzoon] -description = "Run locally installed mzoon" -command = "mzoon/bin/mzoon" -args = ["${@}"] +description = "Run locally installed mzoon with env var FASTWAVE_PLATFORM=BROWSER" +extend = "mzoon_without_env_var_fastwave_platform" +env = { FASTWAVE_PLATFORM = "BROWSER" } # [tasks.mzoon] # description = "Run mzoon from a cloned MoonZoon repo" @@ -58,6 +76,11 @@ args = ["${@}"] ###### HELPER TASKS ###### +[tasks.mzoon_without_env_var_fastwave_platform] +description = "Run locally installed mzoo" +command = "mzoon/bin/mzoon" +args = ["${@}"] + [tasks.store_current_process_id] description = "" script_runner = "@duckscript" @@ -72,11 +95,20 @@ description = "Run `tauri dev`" extend = "tauri" args = ["dev"] +[tasks.mzoon_start] +description = "Run `mzoon start`" +extend = "mzoon" +args = ["start"] + [tasks.tauri_dev_with_cleanup] description = "Run forked `tauri dev` with cleanup" -run_task = { fork = true, cleanup_task = "cleanup_after_tauri_dev", name = ["tauri_dev"] } +run_task = { fork = true, cleanup_task = "kill_watchers", name = ["tauri_dev"] } -[tasks.cleanup_after_tauri_dev] +[tasks.mzoon_start_with_cleanup] +description = "Run forked `mzoon start` with cleanup" +run_task = { fork = true, cleanup_task = "kill_watchers", name = ["mzoon_start"] } + +[tasks.kill_watchers] description = "Kill the cargo-make/makers process and all its children / forked processes" script_runner = "@duckscript" script = ''' diff --git a/README.md b/README.md index 9827df6..d702e3e 100644 --- a/README.md +++ b/README.md @@ -4,17 +4,27 @@ ---

- fastwave_screenshot + fastwave_screenshot_firefox

+

+ fastwave_video_desktop +

-### Start: +--- + +### Install requirements: 1. Install [Rust](https://www.rust-lang.org/tools/install) 2. Install [Node.js](https://nodejs.org/) 3. `cargo install cargo-make` 4. `makers install` -5. `makers start` + +___ + +### Start: + +1. `makers start` Troubleshooting: - In case of Tauri compilation errors, install system dependencies: https://beta.tauri.app/guides/prerequisites/ @@ -29,6 +39,13 @@ Troubleshooting: --- +### Start in the browser: + +1. `makers start_browser` +2. Ctrl + Click the server URL mentioned in the terminal log + +--- + ### Steps before pushing: 1. `makers format` diff --git a/docs/screenshot_firefox.png b/docs/screenshot_firefox.png new file mode 100644 index 0000000..bdd69f8 Binary files /dev/null and b/docs/screenshot_firefox.png differ diff --git a/docs/video_desktop.gif b/docs/video_desktop.gif new file mode 100644 index 0000000..5935b8b Binary files /dev/null and b/docs/video_desktop.gif differ diff --git a/frontend/Cargo.toml b/frontend/Cargo.toml index 4c8a1a1..9d27365 100644 --- a/frontend/Cargo.toml +++ b/frontend/Cargo.toml @@ -11,6 +11,8 @@ publish.workspace = true wasm-bindgen-test = "0.3.19" [dependencies] +shared.workspace = true zoon.workspace = true wellen.workspace = true - +web-sys = { version = "*", features = ["FileSystemFileHandle"] } +gloo-file = { version = "0.3.0", features = ["futures"] } diff --git a/frontend/build.rs b/frontend/build.rs new file mode 100644 index 0000000..95b14e2 --- /dev/null +++ b/frontend/build.rs @@ -0,0 +1,23 @@ +use std::env; + +// https://doc.rust-lang.org/cargo/reference/build-scripts.html + +macro_rules! instruction { + ($($arg: tt)*) => { + println!($($arg)*) + } +} + +// https://github.com/rust-lang/cargo/issues/985 +// macro_rules! warning { +// ($($arg: tt)*) => { +// instruction!("cargo:warning={}", format!($($arg)*)) +// } +// } + +fn main() { + let default_platform = "TAURI"; + let platform = env::var("FASTWAVE_PLATFORM").unwrap_or_else(|_| default_platform.to_owned()); + instruction!("cargo:rustc-cfg=FASTWAVE_PLATFORM=\"{platform}\""); + instruction!("cargo:rerun-if-env-changed=FASTWAVE_PLATFORM"); +} diff --git a/frontend/src/controls_panel.rs b/frontend/src/controls_panel.rs index c6e6067..b92e0e1 100644 --- a/frontend/src/controls_panel.rs +++ b/frontend/src/controls_panel.rs @@ -1,24 +1,35 @@ -use crate::tauri_bridge; -use crate::HierarchyAndTimeTable; -use std::collections::VecDeque; +use crate::{platform, HierarchyAndTimeTable, Layout}; +use futures_util::join; +use std::cell::Cell; +use std::mem; +use std::ops::Not; use std::rc::Rc; use wellen::GetItem; -use zoon::{println, *}; +use zoon::*; -#[derive(Clone, Copy)] -struct VarForUI<'a> { - name: &'a str, +const SCOPE_VAR_ROW_MAX_WIDTH: u32 = 480; +const MILLER_COLUMN_MAX_HEIGHT: u32 = 500; + +type Filename = String; + +#[derive(Clone)] +struct VarForUI { + name: Rc, var_type: wellen::VarType, var_direction: wellen::VarDirection, var_ref: wellen::VarRef, signal_type: wellen::SignalType, } -#[derive(Clone, Copy)] -struct ScopeForUI<'a> { - level: u32, - name: &'a str, +#[derive(Clone)] +struct ScopeForUI { + level: usize, + name: Rc, scope_ref: wellen::ScopeRef, + has_children: bool, + expanded: Mutable, + parent_expanded: Option>, + selected_scope_in_level: Mutable>, } #[derive(Clone)] @@ -26,57 +37,98 @@ pub struct ControlsPanel { selected_scope_ref: Mutable>, hierarchy_and_time_table: Mutable>, selected_var_refs: MutableVec, + layout: Mutable, + loaded_filename: Mutable>, } impl ControlsPanel { pub fn new( hierarchy_and_time_table: Mutable>, selected_var_refs: MutableVec, + layout: Mutable, ) -> impl Element { Self { selected_scope_ref: <_>::default(), hierarchy_and_time_table, selected_var_refs, + layout, + loaded_filename: <_>::default(), } .root() } fn triggers(&self) -> Vec { - vec![Task::start_droppable( - self.hierarchy_and_time_table - .signal_ref(Option::is_none) - .for_each_sync(clone!((self => s) move |_| { - s.selected_scope_ref.set(None); - s.selected_var_refs.lock_mut().clear(); - })), - )] + vec![Task::start_droppable(clone!((self => s) async move { + let was_some = Cell::new(false); + s.hierarchy_and_time_table + .signal_ref(Option::is_some) + .dedupe() + .for_each_sync(clone!((s) move |is_some| { + if is_some { + return was_some.set(true); + } + if was_some.get() { + s.selected_scope_ref.set(None); + s.selected_var_refs.lock_mut().clear(); + s.loaded_filename.set(None); + } + })).await + }))] } fn root(&self) -> impl Element { let triggers = self.triggers(); + let layout = self.layout.clone(); + let layout_and_hierarchy_signal = map_ref! { + let layout = layout.signal(), + let hierarchy_and_time_table = self.hierarchy_and_time_table.signal_cloned() => { + (*layout, hierarchy_and_time_table.clone().map(|(hierarchy, _)| hierarchy)) + } + }; Column::new() .after_remove(move |_| drop(triggers)) - .s(Scrollbars::y_and_clip_x()) - .s(Height::fill()) + .s(Width::with_signal_self( + self.layout + .signal() + .map(|layout| matches!(layout, Layout::Columns)) + .map_true(|| Width::fill()), + )) + .s(Height::with_signal_self(layout.signal().map( + move |layout| match layout { + Layout::Tree => Height::fill(), + Layout::Columns => Height::fill().max(MILLER_COLUMN_MAX_HEIGHT), + }, + ))) + .s(Scrollbars::both()) .s(Padding::all(20)) .s(Gap::new().y(40)) .s(Align::new().top()) - .item(self.load_button()) + .item( + Row::new() + .s(Gap::both(15)) + .s(Align::new().left()) + .item(self.load_button()) + .item(self.layout_switcher()), + ) .item_signal( self.hierarchy_and_time_table .signal_cloned() .map_some(clone!((self => s) move |(hierarchy, _)| s.scopes_panel(hierarchy))), ) - .item_signal( - self.hierarchy_and_time_table - .signal_cloned() - .map_some(clone!((self => s) move |(hierarchy, _)| s.vars_panel(hierarchy))), - ) + .item_signal(layout_and_hierarchy_signal.map( + clone!((self => s) move |(layout, hierarchy)| { + hierarchy.and_then(clone!((s) move |hierarchy| { + matches!(layout, Layout::Tree).then(move || s.vars_panel(hierarchy)) + })) + }), + )) } + #[cfg(FASTWAVE_PLATFORM = "TAURI")] fn load_button(&self) -> impl Element { let (hovered, hovered_signal) = Mutable::new_and_signal(false); let hierarchy_and_time_table = self.hierarchy_and_time_table.clone(); + let loaded_filename = self.loaded_filename.clone(); Button::new() .s(Padding::new().x(20).y(10)) .s(Background::new().color_signal( @@ -84,39 +136,13 @@ impl ControlsPanel { )) .s(Align::new().left()) .s(RoundedCorners::all(15)) - .label( - El::new().s(Font::new().no_wrap()).child_signal( - hierarchy_and_time_table - .signal_ref(Option::is_some) - .map_bool(|| "Unload simple.vcd", || "Load simple.vcd"), + .label(El::new().s(Font::new().no_wrap()).child_signal( + loaded_filename.signal_cloned().map_option( + |filename| format!("Unload {filename}"), + || format!("Load file.."), ), - ) + )) .on_hovered_change(move |is_hovered| hovered.set_neq(is_hovered)) - // @TODO REMOVE - .after_insert(clone!((hierarchy_and_time_table) move |_| { - if crate::SIMULATE_CLICKS { - let mut hierarchy_and_time_table_lock = hierarchy_and_time_table.lock_mut(); - if hierarchy_and_time_table_lock.is_some() { - *hierarchy_and_time_table_lock = None; - return; - } - drop(hierarchy_and_time_table_lock); - let hierarchy_and_time_table = hierarchy_and_time_table.clone(); - Task::start(async move { - tauri_bridge::load_waveform().await; - let hierarchy = tauri_bridge::get_hierarchy().await; - for variable in hierarchy.iter_vars() { - println!("{variable:?}"); - } - for scope in hierarchy.iter_scopes() { - println!("{scope:?}"); - } - let time_table = tauri_bridge::get_time_table().await; - println!("{time_table:?}"); - hierarchy_and_time_table.set(Some((Rc::new(hierarchy), Rc::new(time_table)))) - }) - } - })) .on_press(move || { let mut hierarchy_and_time_table_lock = hierarchy_and_time_table.lock_mut(); if hierarchy_and_time_table_lock.is_some() { @@ -125,101 +151,398 @@ impl ControlsPanel { } drop(hierarchy_and_time_table_lock); let hierarchy_and_time_table = hierarchy_and_time_table.clone(); + let loaded_filename = loaded_filename.clone(); Task::start(async move { - tauri_bridge::load_waveform().await; - let hierarchy = tauri_bridge::get_hierarchy().await; - for variable in hierarchy.iter_vars() { - println!("{variable:?}"); + if let Some(filename) = platform::pick_and_load_waveform(None).await { + loaded_filename.set_neq(Some(filename)); + let (hierarchy, time_table) = + join!(platform::get_hierarchy(), platform::get_time_table()); + hierarchy_and_time_table + .set(Some((Rc::new(hierarchy), Rc::new(time_table)))) } - for scope in hierarchy.iter_scopes() { - println!("{scope:?}"); - } - let time_table = tauri_bridge::get_time_table().await; - println!("{time_table:?}"); - hierarchy_and_time_table.set(Some((Rc::new(hierarchy), Rc::new(time_table)))) + }) + }) + } + + #[cfg(FASTWAVE_PLATFORM = "BROWSER")] + fn load_button(&self) -> impl Element { + let (hovered, hovered_signal) = Mutable::new_and_signal(false); + let hierarchy_and_time_table = self.hierarchy_and_time_table.clone(); + let loaded_filename = self.loaded_filename.clone(); + let file_input_id = "file_input"; + Row::new() + .item( + Label::new() + .s(Padding::new().x(20).y(10)) + .s(Background::new().color_signal( + hovered_signal.map_bool(|| color!("MediumSlateBlue"), || color!("SlateBlue")), + )) + .s(Align::new().left()) + .s(RoundedCorners::all(15)) + .s(Cursor::new(CursorIcon::Pointer)) + .label(El::new().s(Font::new().no_wrap()).child_signal( + loaded_filename.signal_cloned().map_option( + |filename| format!("Unload {filename}"), + || format!("Load file.."), + ), + )) + .on_hovered_change(move |is_hovered| hovered.set_neq(is_hovered)) + .for_input(file_input_id) + .on_click_event_with_options(EventOptions::new().preventable(), clone!((hierarchy_and_time_table) move |event| { + let mut hierarchy_and_time_table_lock = hierarchy_and_time_table.lock_mut(); + if hierarchy_and_time_table_lock.is_some() { + *hierarchy_and_time_table_lock = None; + if let RawMouseEvent::Click(raw_event) = event.raw_event { + // @TODO Move to MoonZoon as a new API + raw_event.prevent_default(); + } + return; + } + })) + ) + .item( + // @TODO https://github.com/MoonZoon/MoonZoon/issues/39 + // + https://developer.mozilla.org/en-US/docs/Web/API/File_API/Using_files_from_web_applications#using_hidden_file_input_elements_using_the_click_method + TextInput::new() + .id(file_input_id) + .update_raw_el(|raw_el| { + let dom_element = raw_el.dom_element(); + raw_el + .style("display", "none") + .attr("type", "file") + .event_handler(move |_: events::Input| { + let Some(file_list) = dom_element.files().map(gloo_file::FileList::from) else { + zoon::println!("file list is `None`"); + return; + }; + let Some(file) = file_list.first().cloned() else { + zoon::println!("file list is empty"); + return; + }; + let hierarchy_and_time_table = hierarchy_and_time_table.clone(); + let loaded_filename = loaded_filename.clone(); + Task::start(async move { + if let Some(filename) = platform::pick_and_load_waveform(Some(file)).await { + loaded_filename.set_neq(Some(filename)); + let (hierarchy, time_table) = + join!(platform::get_hierarchy(), platform::get_time_table()); + hierarchy_and_time_table + .set(Some((Rc::new(hierarchy), Rc::new(time_table)))) + } + }) + }) + }) + ) + } + + fn layout_switcher(&self) -> impl Element { + let layout = self.layout.clone(); + let (hovered, hovered_signal) = Mutable::new_and_signal(false); + Button::new() + .s(Padding::new().x(20).y(10)) + .s(Background::new().color_signal( + hovered_signal.map_bool(|| color!("MediumSlateBlue"), || color!("SlateBlue")), + )) + .s(Align::new().left()) + .s(RoundedCorners::all(15)) + .label_signal(layout.signal().map(|layout| match layout { + Layout::Tree => "Columns", + Layout::Columns => "Tree", + })) + .on_hovered_change(move |is_hovered| hovered.set_neq(is_hovered)) + .on_press(move || { + layout.update(|layout| match layout { + Layout::Tree => Layout::Columns, + Layout::Columns => Layout::Tree, }) }) } fn scopes_panel(&self, hierarchy: Rc) -> impl Element { Column::new() + .s(Height::fill().min(150)) + .s(Scrollbars::y_and_clip_x()) .s(Gap::new().y(20)) - .item(El::new().child("Scopes")) + .s(Width::fill()) + .item_signal( + self.layout + .signal() + .map(|layout| matches!(layout, Layout::Tree)) + .map_true(|| El::new().child("Scopes")), + ) .item(self.scopes_list(hierarchy)) } fn scopes_list(&self, hierarchy: Rc) -> impl Element { + let layout = self.layout.clone(); let mut scopes_for_ui = Vec::new(); + let mut max_level_index: usize = 0; for scope_ref in hierarchy.scopes() { - let mut scope_refs = VecDeque::new(); - scope_refs.push_back((0, scope_ref)); - while let Some((level, scope_ref)) = scope_refs.pop_front() { + let mut scope_refs = Vec::new(); + scope_refs.push((0, scope_ref, None)); + let mut selected_scope_in_levels: Vec>> = + vec![<_>::default()]; + while let Some((level, scope_ref, parent_expanded)) = scope_refs.pop() { let scope = hierarchy.get(scope_ref); + let mut children = scope.scopes(&hierarchy).peekable(); + let has_children = children.peek().is_some(); + let expanded = Mutable::new(false); + if level > max_level_index { + max_level_index = level; + selected_scope_in_levels.push(<_>::default()); + } scopes_for_ui.push(ScopeForUI { level, - name: scope.name(&hierarchy), + name: Rc::new(scope.name(&hierarchy).to_owned()), scope_ref, + has_children, + expanded: expanded.clone(), + parent_expanded, + selected_scope_in_level: selected_scope_in_levels[level].clone(), }); - for scope_ref in scope.scopes(&hierarchy) { - scope_refs.push_back((level + 1, scope_ref)); + for scope_ref in children { + scope_refs.push((level + 1, scope_ref, Some(expanded.read_only()))); } } } - Column::new() - .s(Align::new().left()) - .s(Gap::new().y(10)) - .items( - scopes_for_ui - .into_iter() - .map(clone!((self => s) move |scope_for_ui| s.scope_button(scope_for_ui))), - ) + let scopes_for_ui = Rc::new(scopes_for_ui); + let s = self.clone(); + El::new() + .s(Height::fill()) + .s(Scrollbars::both()) + .s(Width::fill()) + .child_signal(layout.signal().map(move |layout| match layout { + Layout::Tree => { + Column::new() + .s(Align::new().left()) + .s(Gap::new().y(10)) + .s(Height::fill()) + .s(Scrollbars::y_and_clip_x()) + .s(Padding::new().right(15)) + .items( + scopes_for_ui + .iter() + .map(clone!((s) move |scope_for_ui| s.scope_button_row(scope_for_ui.clone()))), + ).unify() + } + Layout::Columns => { + let mut scopes_for_ui_in_levels: Vec> = vec![Vec::new(); max_level_index + 1]; + for scope_for_ui in scopes_for_ui.iter() { + scopes_for_ui_in_levels[scope_for_ui.level].push(scope_for_ui.clone()); + } + let viewport_x = Mutable::new(0); + El::new() + .s(Height::fill()) + .s(Scrollbars::x_and_clip_y()) + .s(Padding::new().bottom(15)) + .s(Width::fill()) + .viewport_x_signal(viewport_x.signal()) + .child( + Row::new() + .s(Height::fill()) + // @TODO add `width: max-content` to MoonZoon's `Width`? + .update_raw_el(|raw_el| raw_el.style("width", "max-content")) + .on_viewport_size_change(move |_, _| viewport_x.set(i32::MAX)) + .items(scopes_for_ui_in_levels.into_iter().map(|scopes_in_level| { + Column::new() + .s(Height::fill()) + .s(Scrollbars::y_and_clip_x()) + // @TODO `Width::default` add the class `exact_width` with `flex-shrink: 0;` + // We should make it more explicit / discoverable in MoonZoon + .s(Width::default()) + .s(Gap::new().y(10)) + .s(Padding::new().x(10)) + .items( + scopes_in_level + .into_iter() + .map(clone!((s) move |scope_for_ui| s.scope_button_row(scope_for_ui))) + ) + })) + .item(s.vars_panel(hierarchy.clone())) + ).unify() + } + })) } - fn scope_button(&self, scope_for_ui: ScopeForUI) -> impl Element { - let (hovered, hovered_signal) = Mutable::new_and_signal(false); + fn scope_button_row(&self, scope_for_ui: ScopeForUI) -> impl Element { + let layout = self.layout.clone(); + let (button_hovered, button_hovered_signal) = Mutable::new_and_signal(false); let selected_scope_ref = self.selected_scope_ref.clone(); let is_selected = selected_scope_ref .signal() .map(move |selected_scope_ref| selected_scope_ref == Some(scope_for_ui.scope_ref)); let background_color = map_ref! { let is_selected = is_selected, - let is_hovered = hovered_signal => match (*is_selected, *is_hovered) { + let is_hovered = button_hovered_signal => match (*is_selected, *is_hovered) { (true, _) => color!("BlueViolet"), (false, true) => color!("MediumSlateBlue"), (false, false) => color!("SlateBlue"), } }; - El::new() - // @TODO REMOVE - .after_insert( - clone!((selected_scope_ref, scope_for_ui.scope_ref => scope_ref) move |_| { - if crate::SIMULATE_CLICKS { - selected_scope_ref.set_neq(Some(scope_ref)); + let task_collapse_on_parent_collapse = { + let expanded = scope_for_ui.expanded.clone(); + scope_for_ui.parent_expanded.clone().map(|parent_expanded| { + Task::start_droppable(parent_expanded.signal().for_each_sync( + move |parent_expanded| { + if not(parent_expanded) { + expanded.set_neq(false); + } + }, + )) + }) + }; + let task_expand_or_collapse_on_selected_scope_in_level_change = { + let expanded = scope_for_ui.expanded.clone(); + let scope_ref = scope_for_ui.scope_ref; + let layout = layout.clone(); + Task::start_droppable(scope_for_ui.selected_scope_in_level.signal().for_each_sync( + move |selected_scope_in_level| { + if matches!(layout.get(), Layout::Columns) { + if let Some(selected_scope) = selected_scope_in_level { + if selected_scope == scope_ref { + return expanded.set(true); + } + } + expanded.set(false); } - }), - ) - .s(Padding::new().left(scope_for_ui.level * 30)) + }, + )) + }; + let display = signal::option( + scope_for_ui + .parent_expanded + .clone() + .map(|parent_expanded| parent_expanded.signal().map_false(|| "none")), + ) + .map(Option::flatten); + let level = scope_for_ui.level as u32; + El::new() + // @TODO Add `Display` Style to MoonZoon? Merge with `Visible` Style? + .update_raw_el(|raw_el| raw_el.style_signal("display", display)) + .s(Padding::new().left_signal(layout.signal().map(move |layout| match layout { + Layout::Tree => level * 30, + Layout::Columns => 0, + }))) + .s(Width::default().max(SCOPE_VAR_ROW_MAX_WIDTH)) + .after_remove(move |_| { + drop(task_collapse_on_parent_collapse); + drop(task_expand_or_collapse_on_selected_scope_in_level_change); + }) .child( - Button::new() - .s(Padding::new().x(15).y(5)) + Row::new() .s(Background::new().color_signal(background_color)) .s(RoundedCorners::all(15)) - .on_hovered_change(move |is_hovered| hovered.set_neq(is_hovered)) - .on_press(move || selected_scope_ref.set_neq(Some(scope_for_ui.scope_ref))) - .label(scope_for_ui.name), + .s(Clip::both()) + .s(Align::new().left()) + .items_signal_vec(layout.signal().map(clone!((self => s, scope_for_ui) move |layout| { + let toggle = scope_for_ui.has_children.then(clone!((s, scope_for_ui) move || s.scope_toggle(scope_for_ui))); + let button = s.scope_button(scope_for_ui.clone(), button_hovered.clone()); + match layout { + Layout::Tree => element_vec![toggle, button], + Layout::Columns => element_vec![button, toggle], + } + })).to_signal_vec()) ) } + fn scope_toggle(&self, scope_for_ui: ScopeForUI) -> impl Element { + let layout = self.layout.clone(); + let expanded = scope_for_ui.expanded.clone(); + let layout_and_expanded = map_ref! { + let layout = layout.signal(), + let expanded = expanded.signal() => (*layout, *expanded) + }; + let selected_scope_ref: Mutable> = self.selected_scope_ref.clone(); + let (hovered, hovered_signal) = Mutable::new_and_signal(false); + Button::new() + .s(Padding::new() + .left_signal( + self.layout + .signal() + .map(|layout| matches!(layout, Layout::Tree)) + .map_true(|| 10), + ) + .right_signal( + self.layout + .signal() + .map(|layout| matches!(layout, Layout::Columns)) + .map_true(|| 10), + )) + .s(Height::fill()) + .s(Font::new().color_signal(hovered_signal.map_true(|| color!("LightBlue")))) + .label( + El::new() + .s(Transform::with_signal_self(layout_and_expanded.map( + |(layout, expanded)| match layout { + Layout::Tree => expanded.not().then(|| Transform::new().rotate(-90)), + Layout::Columns => { + Some(Transform::new().rotate(if expanded { -90 } else { 90 })) + } + }, + ))) + .child("▼"), + ) + .on_hovered_change(move |is_hovered| hovered.set_neq(is_hovered)) + .on_press(move || match layout.get() { + Layout::Tree => { + if scope_for_ui.expanded.get() { + scope_for_ui.selected_scope_in_level.set(None); + } else { + scope_for_ui + .selected_scope_in_level + .set(Some(scope_for_ui.scope_ref)); + } + scope_for_ui.expanded.update(not) + } + Layout::Columns => { + selected_scope_ref.set_neq(None); + if scope_for_ui.expanded.get() { + scope_for_ui.selected_scope_in_level.set(None); + } else { + scope_for_ui + .selected_scope_in_level + .set(Some(scope_for_ui.scope_ref)); + } + } + }) + } + + fn scope_button( + &self, + scope_for_ui: ScopeForUI, + button_hovered: Mutable, + ) -> impl Element { + Button::new() + .s(Padding::new().x(15).y(5)) + .s(Font::new().wrap_anywhere()) + .on_hovered_change(move |is_hovered| button_hovered.set_neq(is_hovered)) + .on_press( + clone!((self.selected_scope_ref => selected_scope_ref, scope_for_ui) move || { + selected_scope_ref.set_neq(Some(scope_for_ui.scope_ref)); + scope_for_ui.selected_scope_in_level.set_neq(None); + }), + ) + .label(scope_for_ui.name) + } + fn vars_panel(&self, hierarchy: Rc) -> impl Element { let selected_scope_ref = self.selected_scope_ref.clone(); Column::new() .s(Gap::new().y(20)) - .item(El::new().child("Variables")) + .s(Height::fill().min(150)) + .s(Scrollbars::y_and_clip_x()) + .item_signal( + self.layout + .signal() + .map(|layout| matches!(layout, Layout::Tree)) + .map_true(|| El::new().child("Variables")), + ) .item_signal(selected_scope_ref.signal().map_some( clone!((self => s) move |scope_ref| s.vars_list(scope_ref, hierarchy.clone())), )) } + // @TODO Group variables? fn vars_list( &self, selected_scope_ref: wellen::ScopeRef, @@ -231,26 +554,64 @@ impl ControlsPanel { .map(|var_ref| { let var = hierarchy.get(var_ref); VarForUI { - name: var.name(&hierarchy), + name: Rc::new(var.name(&hierarchy).to_owned()), var_type: var.var_type(), var_direction: var.direction(), var_ref, signal_type: var.signal_tpe(), } }); + + // Lazy loading to not freeze the main thread + const CHUNK_SIZE: usize = 50; + let mut chunked_vars_for_ui: Vec> = <_>::default(); + let mut chunk = Vec::with_capacity(CHUNK_SIZE); + for (index, var_for_ui) in vars_for_ui.enumerate() { + chunk.push(var_for_ui); + if index % CHUNK_SIZE == 0 { + chunked_vars_for_ui.push(mem::take(&mut chunk)); + } + } + if not(chunk.is_empty()) { + chunked_vars_for_ui.push(chunk); + } + let vars_for_ui_mutable_vec = MutableVec::::new(); + let append_vars_for_ui_task = + Task::start_droppable(clone!((vars_for_ui_mutable_vec) async move { + for chunk in chunked_vars_for_ui { + Task::next_macro_tick().await; + vars_for_ui_mutable_vec.lock_mut().extend(chunk); + } + })); + Column::new() + .s(Width::with_signal_self( + self.layout + .signal() + .map(|layout| matches!(layout, Layout::Columns)) + .map_true(|| Width::default().min(SCOPE_VAR_ROW_MAX_WIDTH)), + )) .s(Align::new().left()) .s(Gap::new().y(10)) - .items(vars_for_ui.map(clone!((self => s) move |var_for_ui| s.var_row(var_for_ui)))) + .s(Height::fill()) + .s(Scrollbars::y_and_clip_x()) + .items_signal_vec( + vars_for_ui_mutable_vec + .signal_vec_cloned() + .map(clone!((self => s) move |var_for_ui| s.var_row(var_for_ui))), + ) + .after_remove(move |_| drop(append_vars_for_ui_task)) } fn var_row(&self, var_for_ui: VarForUI) -> impl Element { Row::new() .s(Gap::new().x(10)) - .item(self.var_button(var_for_ui)) - .item(self.var_tag_type(var_for_ui)) - .item(self.var_tag_index(var_for_ui)) - .item(self.var_tag_bit(var_for_ui)) + .s(Padding::new().right(15)) + .s(Width::default().max(SCOPE_VAR_ROW_MAX_WIDTH)) + .item(self.var_button(var_for_ui.clone())) + .item(self.var_tag_type(var_for_ui.clone())) + .item(self.var_tag_index(var_for_ui.clone())) + .item(self.var_tag_bit(var_for_ui.clone())) .item(self.var_tag_direction(var_for_ui)) } @@ -259,14 +620,7 @@ impl ControlsPanel { let selected_var_ref = self.selected_var_refs.clone(); El::new().child( Button::new() - // @TODO REMOVE - .after_insert( - clone!((selected_var_ref, var_for_ui.var_ref => var_ref) move |_| { - if crate::SIMULATE_CLICKS { - selected_var_ref.lock_mut().extend([var_ref, var_ref]); - } - }), - ) + .s(Font::new().wrap_anywhere()) .s(Padding::new().x(15).y(5)) .s(Background::new().color_signal( hovered_signal.map_bool(|| color!("MediumSlateBlue"), || color!("SlateBlue")), diff --git a/frontend/src/main.rs b/frontend/src/main.rs index a23c265..de4b4c1 100644 --- a/frontend/src/main.rs +++ b/frontend/src/main.rs @@ -1,7 +1,7 @@ use std::rc::Rc; use zoon::*; -mod tauri_bridge; +mod platform; mod controls_panel; use controls_panel::ControlsPanel; @@ -11,30 +11,46 @@ use waveform_panel::WaveformPanel; type HierarchyAndTimeTable = (Rc, Rc); -// @TODO REMOVE -const SIMULATE_CLICKS: bool = false; +#[derive(Clone, Copy, Default)] +enum Layout { + Tree, + #[default] + Columns, +} fn main() { start_app("app", root); Task::start(async { // https://github.com/tauri-apps/tauri/issues/5170 Timer::sleep(100).await; - tauri_bridge::show_window().await; + platform::show_window().await; }); } fn root() -> impl Element { let hierarchy_and_time_table: Mutable> = <_>::default(); let selected_var_refs: MutableVec = <_>::default(); - Row::new() + let layout: Mutable = <_>::default(); + Column::new() .s(Height::fill()) + .s(Scrollbars::y_and_clip_x()) .s(Font::new().color(color!("Lavender"))) - .item(ControlsPanel::new( + .item( + Row::new() + .s(Height::fill()) + .s(Gap::new().x(15)) + .item(ControlsPanel::new( + hierarchy_and_time_table.clone(), + selected_var_refs.clone(), + layout.clone(), + )) + .item_signal(layout.signal().map(|layout| matches!(layout, Layout::Tree)).map_true(clone!((hierarchy_and_time_table, selected_var_refs) move || WaveformPanel::new( + hierarchy_and_time_table.clone(), + selected_var_refs.clone(), + )))) + ) + .item_signal(layout.signal().map(|layout| matches!(layout, Layout::Columns)).map_true(move || WaveformPanel::new( hierarchy_and_time_table.clone(), selected_var_refs.clone(), - )) - .item(WaveformPanel::new( - hierarchy_and_time_table, - selected_var_refs, - )) + ))) } diff --git a/frontend/src/platform.rs b/frontend/src/platform.rs new file mode 100644 index 0000000..297bee4 --- /dev/null +++ b/frontend/src/platform.rs @@ -0,0 +1,42 @@ +// @TODO maybe rewrite `FASTWAVE_PLATFORM` to features once it's possible to set them through env vars: +// https://github.com/rust-lang/cargo/issues/4829 + +// NOTE: `FASTWAVE_PLATFORM` is set in `Makefile.toml` tasks and then in `build.rs` + +#[cfg(FASTWAVE_PLATFORM = "TAURI")] +mod tauri; +#[cfg(FASTWAVE_PLATFORM = "TAURI")] +use tauri as platform; + +#[cfg(FASTWAVE_PLATFORM = "BROWSER")] +mod browser; +#[cfg(FASTWAVE_PLATFORM = "BROWSER")] +use browser as platform; + +type Filename = String; + +pub async fn show_window() { + platform::show_window().await +} + +// @TODO allow only supported file types by Wellen +// @TODO remove the `file` parameter once we don't have to use FileInput element +pub async fn pick_and_load_waveform(file: Option) -> Option { + platform::pick_and_load_waveform(file).await +} + +pub async fn get_hierarchy() -> wellen::Hierarchy { + platform::get_hierarchy().await +} + +pub async fn get_time_table() -> wellen::TimeTable { + platform::get_time_table().await +} + +pub async fn load_and_get_signal(signal_ref: wellen::SignalRef) -> wellen::Signal { + platform::load_and_get_signal(signal_ref).await +} + +pub async fn unload_signal(signal_ref: wellen::SignalRef) { + platform::unload_signal(signal_ref).await +} diff --git a/frontend/src/platform/browser.rs b/frontend/src/platform/browser.rs new file mode 100644 index 0000000..dc4d2eb --- /dev/null +++ b/frontend/src/platform/browser.rs @@ -0,0 +1,98 @@ +use shared::wellen_helpers; +use std::sync::Mutex; +use wellen::simple::Waveform; +use zoon::*; + +#[derive(Default)] +struct Store { + waveform: Mutex>, +} + +static STORE: Lazy = lazy::default(); + +pub(super) async fn show_window() {} + +pub(super) async fn pick_and_load_waveform( + file: Option, +) -> Option { + let file = file.unwrap_throw(); + + let content = gloo_file::futures::read_as_bytes(&file) + .await + .unwrap_throw(); + + let waveform = wellen_helpers::read_from_bytes(content); + let Ok(waveform) = waveform else { + panic!("Waveform file reading failed") + }; + *STORE.waveform.lock().unwrap_throw() = Some(waveform); + Some(file.name()) +} + +// @TODO Use this `pick_and_load_waveform` version once `showOpenFilePicker` is supported by Safari and Firefox +// https://caniuse.com/mdn-api_window_showopenfilepicker +// pub(super) async fn pick_and_load_waveform() -> Option { +// let file_handles_promise = window().show_open_file_picker().expect_throw( +// "failed to open file picker (browser has to support `showOpenFilePicker` and use HTTPS", +// ); +// let file_handles = JsFuture::from(file_handles_promise).await; +// let file_handles = match file_handles { +// Ok(file_handles) => file_handles.dyn_into::().unwrap_throw(), +// Err(error) => { +// println!("file picker error: {error:?}"); +// return None; +// } +// }; +// let file_handle = file_handles +// .at(0) +// .dyn_into::() +// .unwrap_throw(); + +// let file = JsFuture::from(file_handle.get_file()) +// .await +// .unwrap_throw() +// .dyn_into::() +// .unwrap_throw(); + +// let file = gloo_file::File::from(file); +// let content = gloo_file::futures::read_as_bytes(&file) +// .await +// .unwrap_throw(); + +// let waveform = wellen_helpers::read_from_bytes(content); +// let Ok(waveform) = waveform else { +// panic!("Waveform file reading failed") +// }; +// *STORE.waveform.lock().unwrap_throw() = Some(waveform); +// Some(file.name()) +// } + +pub(super) async fn get_hierarchy() -> wellen::Hierarchy { + let waveform = STORE.waveform.lock().unwrap_throw(); + let hierarchy = waveform.as_ref().unwrap_throw().hierarchy(); + // @TODO Wrap `hierarchy` in `Waveform` with `Rc/Arc` or add the method `take` / `clone` or refactor? + serde_json::from_value(serde_json::to_value(hierarchy).unwrap_throw()).unwrap_throw() +} + +pub(super) async fn get_time_table() -> wellen::TimeTable { + let waveform = STORE.waveform.lock().unwrap_throw(); + let time_table = waveform.as_ref().unwrap_throw().time_table(); + // @TODO Wrap `time_table` in `Waveform` with `Rc/Arc` or add the method `take` / `clone` or refactor? + serde_json::from_value(serde_json::to_value(time_table).unwrap_throw()).unwrap_throw() +} + +pub(super) async fn load_and_get_signal(signal_ref: wellen::SignalRef) -> wellen::Signal { + let mut waveform_lock = STORE.waveform.lock().unwrap_throw(); + let waveform = waveform_lock.as_mut().unwrap_throw(); + // @TODO maybe run it in a thread to not block the main one and then + waveform.load_signals(&[signal_ref]); + let signal = waveform.get_signal(signal_ref).unwrap_throw(); + // @TODO `clone` / `Rc/Arc` / refactor? + serde_json::from_value(serde_json::to_value(signal).unwrap_throw()).unwrap_throw() +} + +pub(super) async fn unload_signal(signal_ref: wellen::SignalRef) { + let mut waveform_lock = STORE.waveform.lock().unwrap_throw(); + let waveform = waveform_lock.as_mut().unwrap_throw(); + waveform.unload_signals(&[signal_ref]); +} diff --git a/frontend/src/platform/tauri.rs b/frontend/src/platform/tauri.rs new file mode 100644 index 0000000..cd97554 --- /dev/null +++ b/frontend/src/platform/tauri.rs @@ -0,0 +1,63 @@ +use zoon::*; + +pub(super) async fn show_window() { + tauri_glue::show_window().await.unwrap_throw() +} + +pub(super) async fn pick_and_load_waveform( + _file: Option, +) -> Option { + tauri_glue::pick_and_load_waveform() + .await + .unwrap_throw() + .as_string() +} + +pub(super) async fn get_hierarchy() -> wellen::Hierarchy { + serde_wasm_bindgen::from_value(tauri_glue::get_hierarchy().await.unwrap_throw()).unwrap_throw() +} + +pub(super) async fn get_time_table() -> wellen::TimeTable { + serde_wasm_bindgen::from_value(tauri_glue::get_time_table().await.unwrap_throw()).unwrap_throw() +} + +pub(super) async fn load_and_get_signal(signal_ref: wellen::SignalRef) -> wellen::Signal { + serde_wasm_bindgen::from_value( + tauri_glue::load_and_get_signal(signal_ref.index()) + .await + .unwrap_throw(), + ) + .unwrap_throw() +} + +pub(super) async fn unload_signal(signal_ref: wellen::SignalRef) { + tauri_glue::unload_signal(signal_ref.index()) + .await + .unwrap_throw() +} + +mod tauri_glue { + use zoon::*; + + // Note: Add all corresponding methods to `frontend/typescript/tauri_glue/tauri_glue.ts` + #[wasm_bindgen(module = "/typescript/bundles/tauri_glue.js")] + extern "C" { + #[wasm_bindgen(catch)] + pub async fn show_window() -> Result<(), JsValue>; + + #[wasm_bindgen(catch)] + pub async fn pick_and_load_waveform() -> Result; + + #[wasm_bindgen(catch)] + pub async fn get_hierarchy() -> Result; + + #[wasm_bindgen(catch)] + pub async fn get_time_table() -> Result; + + #[wasm_bindgen(catch)] + pub async fn load_and_get_signal(signal_ref_index: usize) -> Result; + + #[wasm_bindgen(catch)] + pub async fn unload_signal(signal_ref_index: usize) -> Result<(), JsValue>; + } +} diff --git a/frontend/src/tauri_bridge.rs b/frontend/src/tauri_bridge.rs deleted file mode 100644 index 68a3468..0000000 --- a/frontend/src/tauri_bridge.rs +++ /dev/null @@ -1,46 +0,0 @@ -use zoon::*; - -pub async fn show_window() { - tauri_glue::show_window().await -} - -pub async fn load_waveform() { - tauri_glue::load_waveform().await -} - -pub async fn get_hierarchy() -> wellen::Hierarchy { - serde_wasm_bindgen::from_value(tauri_glue::get_hierarchy().await).unwrap_throw() -} - -pub async fn get_time_table() -> wellen::TimeTable { - serde_wasm_bindgen::from_value(tauri_glue::get_time_table().await).unwrap_throw() -} - -pub async fn load_and_get_signal(signal_ref: wellen::SignalRef) -> wellen::Signal { - serde_wasm_bindgen::from_value(tauri_glue::load_and_get_signal(signal_ref.index()).await) - .unwrap_throw() -} - -pub async fn unload_signal(signal_ref: wellen::SignalRef) { - tauri_glue::unload_signal(signal_ref.index()).await -} - -mod tauri_glue { - use zoon::*; - - // Note: Add all corresponding methods to `frontend/typescript/tauri_glue/tauri_glue.ts` - #[wasm_bindgen(module = "/typescript/bundles/tauri_glue.js")] - extern "C" { - pub async fn show_window(); - - pub async fn load_waveform(); - - pub async fn get_hierarchy() -> JsValue; - - pub async fn get_time_table() -> JsValue; - - pub async fn load_and_get_signal(signal_ref_index: usize) -> JsValue; - - pub async fn unload_signal(signal_ref_index: usize); - } -} diff --git a/frontend/src/waveform_panel.rs b/frontend/src/waveform_panel.rs index 61aa76c..80b2b39 100644 --- a/frontend/src/waveform_panel.rs +++ b/frontend/src/waveform_panel.rs @@ -1,9 +1,9 @@ -use crate::{tauri_bridge, HierarchyAndTimeTable}; +use crate::{platform, HierarchyAndTimeTable}; use wellen::GetItem; -use zoon::*; +use zoon::{eprintln, *}; mod pixi_canvas; -use pixi_canvas::PixiCanvas; +use pixi_canvas::{PixiCanvas, PixiController}; const ROW_HEIGHT: u32 = 40; const ROW_GAP: u32 = 4; @@ -29,7 +29,7 @@ impl WaveformPanel { fn root(&self) -> impl Element { let selected_vars_panel_height_getter: Mutable = <_>::default(); Row::new() - .s(Padding::all(20).left(0)) + .s(Padding::all(20)) .s(Scrollbars::y_and_clip_x()) .s(Width::growable()) .s(Height::fill()) @@ -61,13 +61,19 @@ impl WaveformPanel { selected_var_refs.signal_vec().delay_remove(clone!((hierarchy_and_time_table) move |var_ref| { clone!((var_ref, hierarchy_and_time_table) async move { if let Some(hierarchy_and_time_table) = hierarchy_and_time_table.get_cloned() { - tauri_bridge::unload_signal(hierarchy_and_time_table.0.get(var_ref).signal_ref()).await; + platform::unload_signal(hierarchy_and_time_table.0.get(var_ref).signal_ref()).await; } }) })).for_each(clone!((controller, hierarchy_and_time_table) move |vec_diff| { clone!((controller, hierarchy_and_time_table) async move { match vec_diff { - VecDiff::Replace { values: _ } => { todo!("`task_with_controller` + `Replace`") }, + VecDiff::Replace { values } => { + let controller = controller.wait_for_some_cloned().await; + controller.clear_vars(); + for var_ref in values { + Self::push_var(&controller, &hierarchy_and_time_table, var_ref).await; + } + }, VecDiff::InsertAt { index: _, value: _ } => { todo!("`task_with_controller` + `InsertAt`") } VecDiff::UpdateAt { index: _, value: _ } => { todo!("`task_with_controller` + `UpdateAt`") } VecDiff::RemoveAt { index } => { @@ -78,20 +84,7 @@ impl WaveformPanel { VecDiff::Move { old_index: _, new_index: _ } => { todo!("`task_with_controller` + `Move`") } VecDiff::Push { value: var_ref } => { if let Some(controller) = controller.lock_ref().as_ref() { - let (hierarchy, time_table) = hierarchy_and_time_table.get_cloned().unwrap(); - let var = hierarchy.get(var_ref); - let signal_ref = var.signal_ref(); - let signal = tauri_bridge::load_and_get_signal(signal_ref).await; - - let timescale = hierarchy.timescale(); - zoon::println!("{timescale:?}"); - - // Note: Sync `timeline`'s type with the `Timeline` in `frontend/typescript/pixi_canvas/pixi_canvas.ts' - let mut timeline: Vec<(wellen::Time, Option)> = time_table.iter().map(|time| (*time, None)).collect(); - for (time_index, signal_value) in signal.iter_changes() { - timeline[time_index as usize].1 = Some(signal_value.to_string()); - } - controller.push_var(serde_wasm_bindgen::to_value(&timeline).unwrap_throw()); + Self::push_var(controller, &hierarchy_and_time_table, var_ref).await; } } VecDiff::Pop {} => { @@ -110,6 +103,42 @@ impl WaveformPanel { }) } + async fn push_var( + controller: &PixiController, + hierarchy_and_time_table: &Mutable>, + var_ref: wellen::VarRef, + ) { + let (hierarchy, time_table) = hierarchy_and_time_table.get_cloned().unwrap(); + if time_table.is_empty() { + eprintln!("timetable is empty"); + return; + } + let last_time = time_table.last().copied().unwrap_throw(); + + let var = hierarchy.get(var_ref); + let signal_ref = var.signal_ref(); + let signal = platform::load_and_get_signal(signal_ref).await; + + let timescale = hierarchy.timescale(); + // @TODO remove + zoon::println!("{timescale:?}"); + + let mut timeline: Vec<(wellen::Time, String)> = signal + .iter_changes() + .map(|(time_index, signal_value)| { + (time_table[time_index as usize], signal_value.to_string()) + }) + .collect(); + if timeline.is_empty() { + eprintln!("timeline is empty"); + return; + } + timeline.push((last_time, timeline.last().cloned().unwrap_throw().1)); + + // Note: Sync `timeline`'s type with the `Timeline` in `frontend/typescript/pixi_canvas/pixi_canvas.ts' + controller.push_var(serde_wasm_bindgen::to_value(&timeline).unwrap_throw()); + } + fn selected_var_panel( &self, index: ReadOnlyMutable>, diff --git a/frontend/src/waveform_panel/pixi_canvas.rs b/frontend/src/waveform_panel/pixi_canvas.rs index b935056..52a4c5a 100644 --- a/frontend/src/waveform_panel/pixi_canvas.rs +++ b/frontend/src/waveform_panel/pixi_canvas.rs @@ -1,3 +1,4 @@ +pub use js_bridge::PixiController; use zoon::*; pub struct PixiCanvas { @@ -89,6 +90,7 @@ mod js_bridge { // Note: Add all corresponding methods to `frontend/typescript/pixi_canvas/pixi_canvas.ts` #[wasm_bindgen(module = "/typescript/bundles/pixi_canvas.js")] extern "C" { + #[derive(Clone)] pub type PixiController; // @TODO `row_height` and `row_gap` is FastWave-specific diff --git a/frontend/typescript/bundles/pixi_canvas.js b/frontend/typescript/bundles/pixi_canvas.js index b8136f4..5ab8f18 100644 --- a/frontend/typescript/bundles/pixi_canvas.js +++ b/frontend/typescript/bundles/pixi_canvas.js @@ -35161,7 +35161,9 @@ var PixiController = class { } // -- FastWave-specific -- remove_var(index) { - this.var_signal_rows[index].destroy(); + if (typeof this.var_signal_rows[index] !== "undefined") { + this.var_signal_rows[index].destroy(); + } } push_var(timeline) { new VarSignalRow( @@ -35174,29 +35176,37 @@ var PixiController = class { ); } pop_var() { - this.var_signal_rows[this.var_signal_rows.length - 1].destroy(); + this.remove_var(this.var_signal_rows.length - 1); } clear_vars() { this.var_signal_rows.slice().reverse().forEach((row) => row.destroy()); } }; var VarSignalRow = class { - timeline; app; + timeline; + last_time; + formatter; + timeline_for_ui; owner; index_in_owner; rows_container; row_height; row_gap; row_height_with_gap; - renderer_resize_callback = () => this.draw(); + renderer_resize_callback = () => this.redraw_on_canvas_resize(); // -- elements -- row_container = new Container(); signal_blocks_container = new Container(); constructor(timeline, app, owner, rows_container, row_height, row_gap) { - console.log("VarSignalRow timeline:", timeline); - this.timeline = timeline; this.app = app; + this.timeline = timeline; + this.last_time = timeline[timeline.length - 1][0]; + this.formatter = (signal_value) => parseInt(signal_value, 2).toString(16); + this.timeline_for_ui = this.timeline.map(([time, value]) => { + const x2 = time / this.last_time * this.app.screen.width; + return [x2, this.formatter(value)]; + }); this.row_height = row_height; this.row_gap = row_gap; this.row_height_with_gap = row_height + row_gap; @@ -35204,46 +35214,59 @@ var VarSignalRow = class { this.owner = owner; this.owner.push(this); this.rows_container = rows_container; - this.create_element_tree(); this.draw(); this.app.renderer.on("resize", this.renderer_resize_callback); } - create_element_tree() { + draw() { this.row_container.y = this.index_in_owner * this.row_height_with_gap; this.rows_container.addChild(this.row_container); this.row_container.addChild(this.signal_blocks_container); + const label_style = new TextStyle({ + align: "center", + fill: "White", + fontSize: 16, + fontFamily: 'system-ui, -apple-system, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"' + }); + this.timeline_for_ui.forEach(([x2, value], index) => { + if (index == this.timeline_for_ui.length - 1) { + return; + } + const block_width = this.timeline_for_ui[index + 1][0] - x2; + const block_height = this.row_height; + const signal_block = new Container(); + signal_block.x = x2; + this.signal_blocks_container.addChild(signal_block); + const background = new Graphics().roundRect(0, 0, block_width, block_height, 15).fill("SlateBlue"); + background.label = "background"; + signal_block.addChild(background); + const label = new Text({ text: value, style: label_style }); + label.x = (block_width - label.width) / 2; + label.y = (block_height - label.height) / 2; + label.visible = label.width < block_width; + label.label = "label"; + signal_block.addChild(label); + }); } - draw() { - if (this.timeline.length > 0) { - const last_time = this.timeline[this.timeline.length - 1][0]; - const formatter = (signal_value) => parseInt(signal_value, 2).toString(16); - const timeline = this.timeline.map(([time, value]) => { - const x2 = time / last_time * this.app.screen.width; - const formatted_value = typeof value === "string" ? formatter(value) : void 0; - return [x2, formatted_value]; - }); - this.signal_blocks_container.removeChildren(); - timeline.forEach(([x2, value], index) => { - if (typeof value === "string") { - const block_width = timeline[index + 1][0] - x2; - const block_height = this.row_height; - const signal_block = new Container({ x: x2 }); - this.signal_blocks_container.addChild(signal_block); - let background = new Graphics().roundRect(0, 0, block_width, block_height, 15).fill("SlateBlue"); - signal_block.addChild(background); - let style = new TextStyle({ - align: "center", - fill: "White", - fontSize: 16, - fontFamily: 'system-ui, -apple-system, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"' - }); - let label = new Text({ text: value, style }); - label.x = (block_width - label.width) / 2; - label.y = (block_height - label.height) / 2; - signal_block.addChild(label); - } - }); + redraw_on_canvas_resize() { + for (let index = 0; index < this.timeline_for_ui.length; index++) { + const x2 = this.timeline[index][0] / this.last_time * this.app.screen.width; + this.timeline_for_ui[index][0] = x2; } + this.timeline_for_ui.forEach(([x2, _value], index) => { + if (index == this.timeline_for_ui.length - 1) { + return; + } + const block_width = this.timeline_for_ui[index + 1][0] - x2; + const block_height = this.row_height; + const signal_block = this.signal_blocks_container.getChildAt(index); + signal_block.x = x2; + const background = signal_block.getChildByLabel("background"); + background.width = block_width; + const label = signal_block.getChildByLabel("label"); + label.x = (block_width - label.width) / 2; + label.y = (block_height - label.height) / 2; + label.visible = label.width < block_width; + }); } decrement_index() { this.index_in_owner--; diff --git a/frontend/typescript/bundles/tauri_glue.js b/frontend/typescript/bundles/tauri_glue.js index ab2584c..3a14939 100644 --- a/frontend/typescript/bundles/tauri_glue.js +++ b/frontend/typescript/bundles/tauri_glue.js @@ -2514,8 +2514,8 @@ var invoke2 = core_exports.invoke; async function show_window() { return await invoke2("show_window"); } -async function load_waveform() { - return await invoke2("load_waveform"); +async function pick_and_load_waveform() { + return await invoke2("pick_and_load_waveform"); } async function get_hierarchy() { return await invoke2("get_hierarchy"); @@ -2533,7 +2533,7 @@ export { get_hierarchy, get_time_table, load_and_get_signal, - load_waveform, + pick_and_load_waveform, show_window, unload_signal }; diff --git a/frontend/typescript/pixi_canvas/pixi_canvas.ts b/frontend/typescript/pixi_canvas/pixi_canvas.ts index 8249c3a..97bd6fc 100644 --- a/frontend/typescript/pixi_canvas/pixi_canvas.ts +++ b/frontend/typescript/pixi_canvas/pixi_canvas.ts @@ -2,7 +2,10 @@ import { Application, Text, Graphics, Container, TextStyle } from "pixi.js"; type Time = number; type BitString = string; -type Timeline = Array<[Time, BitString | undefined]>; +type Timeline = Array<[Time, BitString]>; + +type X = number; +type TimelineForUI = Array<[X, string]>; export class PixiController { app: Application @@ -46,7 +49,9 @@ export class PixiController { // -- FastWave-specific -- remove_var(index: number) { - this.var_signal_rows[index].destroy(); + if (typeof this.var_signal_rows[index] !== 'undefined') { + this.var_signal_rows[index].destroy(); + } } push_var(timeline: Timeline) { @@ -61,7 +66,7 @@ export class PixiController { } pop_var() { - this.var_signal_rows[this.var_signal_rows.length - 1].destroy(); + this.remove_var(this.var_signal_rows.length - 1); } clear_vars() { @@ -70,15 +75,18 @@ export class PixiController { } class VarSignalRow { - timeline: Timeline; app: Application; + timeline: Timeline; + last_time: Time; + formatter: (signal_value: BitString) => string; + timeline_for_ui: TimelineForUI; owner: Array; index_in_owner: number; rows_container: Container; row_height: number; row_gap: number; row_height_with_gap: number; - renderer_resize_callback = () => this.draw(); + renderer_resize_callback = () => this.redraw_on_canvas_resize(); // -- elements -- row_container = new Container(); signal_blocks_container = new Container(); @@ -91,11 +99,17 @@ class VarSignalRow { row_height: number, row_gap: number, ) { - console.log("VarSignalRow timeline:", timeline); - this.timeline = timeline; - this.app = app; + this.timeline = timeline; + this.last_time = timeline[timeline.length - 1][0]; + this.formatter = signal_value => parseInt(signal_value, 2).toString(16); + + this.timeline_for_ui = this.timeline.map(([time, value]) => { + const x = time / this.last_time * this.app.screen.width; + return [x, this.formatter(value)] + }); + this.row_height = row_height; this.row_gap = row_gap; this.row_height_with_gap = row_height + row_gap; @@ -105,64 +119,82 @@ class VarSignalRow { this.owner.push(this); this.rows_container = rows_container; - this.create_element_tree(); this.draw(); this.app.renderer.on("resize", this.renderer_resize_callback); } - create_element_tree() { + draw() { // row_container this.row_container.y = this.index_in_owner * this.row_height_with_gap; this.rows_container.addChild(this.row_container); // signal_block_container this.row_container.addChild(this.signal_blocks_container); + + const label_style = new TextStyle({ + align: "center", + fill: "White", + fontSize: 16, + fontFamily: 'system-ui, -apple-system, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"', + }); + + this.timeline_for_ui.forEach(([x, value], index) => { + if (index == this.timeline_for_ui.length - 1) { + return; + } + const block_width = this.timeline_for_ui[index+1][0] - x; + const block_height = this.row_height; + + // signal_block + const signal_block = new Container(); + signal_block.x = x; + this.signal_blocks_container.addChild(signal_block); + + // background + const background = new Graphics() + .roundRect(0, 0, block_width, block_height, 15) + .fill("SlateBlue"); + background.label = "background"; + signal_block.addChild(background); + + // label + const label = new Text({ text: value, style: label_style }); + label.x = (block_width - label.width) / 2; + label.y = (block_height - label.height) / 2; + label.visible = label.width < block_width; + label.label = "label"; + signal_block.addChild(label); + }) } - draw() { - if (this.timeline.length > 0) { - const last_time = this.timeline[this.timeline.length - 1][0]; - // @TODO make formatter configurable - const formatter: (signal_value: BitString) => string = signal_value => parseInt(signal_value, 2).toString(16); - // @TODO optimize - one pass, partly in Rust, partly outside of `draw()`, etc. - const timeline: Array<[number, string | undefined]> = this.timeline.map(([time, value]) => { - const x = time / last_time * this.app.screen.width; - const formatted_value = typeof value === 'string' ? formatter(value) : undefined; - return [x, formatted_value] - }); - // @TODO optimize - don't recreate all on every draw - this.signal_blocks_container.removeChildren(); - timeline.forEach(([x, value], index) => { - if (typeof value === 'string') { - const block_width = timeline[index+1][0] - x; - const block_height = this.row_height; - - // signal_block - const signal_block = new Container({x}); - this.signal_blocks_container.addChild(signal_block); - - // background - let background = new Graphics() - .roundRect(0, 0, block_width, block_height, 15) - .fill("SlateBlue"); - signal_block.addChild(background); - - // label - let style = new TextStyle({ - align: "center", - fill: "White", - fontSize: 16, - fontFamily: 'system-ui, -apple-system, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"', - }); - // @TODO don't show when the label is wider/higher than the block - let label = new Text({ text: value, style }); - label.x = (block_width - label.width) / 2; - label.y = (block_height - label.height) / 2; - signal_block.addChild(label); - } - }) + redraw_on_canvas_resize() { + for (let index = 0; index < this.timeline_for_ui.length; index++) { + const x = this.timeline[index][0] / this.last_time * this.app.screen.width; + this.timeline_for_ui[index][0] = x; } + this.timeline_for_ui.forEach(([x, _value], index) => { + if (index == this.timeline_for_ui.length - 1) { + return; + } + + const block_width = this.timeline_for_ui[index+1][0] - x; + const block_height = this.row_height; + + // signal_block + const signal_block = this.signal_blocks_container.getChildAt(index); + signal_block.x = x; + + // background + const background = signal_block.getChildByLabel("background")!; + background.width = block_width; + + // label + const label = signal_block.getChildByLabel("label")!; + label.x = (block_width - label.width) / 2; + label.y = (block_height - label.height) / 2; + label.visible = label.width < block_width; + }) } decrement_index() { diff --git a/frontend/typescript/tauri_glue/tauri_glue.ts b/frontend/typescript/tauri_glue/tauri_glue.ts index 6ba1d8c..d075e4f 100644 --- a/frontend/typescript/tauri_glue/tauri_glue.ts +++ b/frontend/typescript/tauri_glue/tauri_glue.ts @@ -4,6 +4,7 @@ import { core } from '@tauri-apps/api' const invoke = core.invoke; +type Filename = string; type WellenHierarchy = unknown; type WellenTimeTable = unknown; type WellenSignal = unknown; @@ -12,8 +13,8 @@ export async function show_window(): Promise { return await invoke("show_window"); } -export async function load_waveform(): Promise { - return await invoke("load_waveform"); +export async function pick_and_load_waveform(): Promise { + return await invoke("pick_and_load_waveform"); } export async function get_hierarchy(): Promise { diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 8f63f9b..545e49d 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -6,3 +6,6 @@ repository.workspace = true authors.workspace = true readme.workspace = true publish.workspace = true + +[dependencies] +wellen.workspace = true diff --git a/shared/src/lib.rs b/shared/src/lib.rs index 8b13789..89b0b3b 100644 --- a/shared/src/lib.rs +++ b/shared/src/lib.rs @@ -1 +1 @@ - +pub mod wellen_helpers; diff --git a/src-tauri/src/wellen_helpers.rs b/shared/src/wellen_helpers.rs similarity index 100% rename from src-tauri/src/wellen_helpers.rs rename to shared/src/wellen_helpers.rs diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index fd54463..6bec432 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -13,11 +13,13 @@ name = "app_lib" crate-type = ["staticlib", "cdylib", "rlib"] [build-dependencies] -tauri-build = { version = "=2.0.0-beta.15", features = [] } +tauri-build = { version = "=2.0.0-beta.17", features = [] } [dependencies] +shared.workspace = true wellen.workspace = true serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "=2.0.0-beta.19", features = ["macos-private-api", "linux-ipc-protocol"] } -tauri-plugin-window-state = "=2.0.0-beta.7" +tauri = { version = "=2.0.0-beta.22", features = ["macos-private-api", "linux-ipc-protocol"] } +tauri-plugin-window-state = "=2.0.0-beta.9" +tauri-plugin-dialog = "=2.0.0-beta.9" diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index f248e47..daf6974 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -1,7 +1,8 @@ use std::sync::Mutex; +use tauri_plugin_dialog::DialogExt; use wellen::simple::Waveform; -mod wellen_helpers; +type Filename = String; #[derive(Default)] struct Store { @@ -9,36 +10,47 @@ struct Store { } #[tauri::command(rename_all = "snake_case")] -fn show_window(window: tauri::Window) { +async fn show_window(window: tauri::Window) { window.show().unwrap(); } #[tauri::command(rename_all = "snake_case")] -fn load_waveform(store: tauri::State) { - let waveform = - wellen_helpers::read_from_bytes(include_bytes!("../../test_files/simple.vcd").to_vec()); +async fn pick_and_load_waveform( + store: tauri::State<'_, Store>, + app: tauri::AppHandle, +) -> Result, ()> { + let Some(file_response) = app.dialog().file().blocking_pick_file() else { + return Ok(None); + }; + let file_path = file_response.path.as_os_str().to_str().unwrap(); + // @TODO `read` should accept `Path` instead of `&str` + let waveform = wellen::simple::read(file_path); let Ok(waveform) = waveform else { - panic!("VCD file reading failed") + panic!("Waveform file reading failed") }; *store.waveform.lock().unwrap() = Some(waveform); + Ok(Some(file_response.name.unwrap())) } #[tauri::command(rename_all = "snake_case")] -fn get_hierarchy(store: tauri::State) -> serde_json::Value { +async fn get_hierarchy(store: tauri::State<'_, Store>) -> Result { let waveform = store.waveform.lock().unwrap(); let hierarchy = waveform.as_ref().unwrap().hierarchy(); - serde_json::to_value(hierarchy).unwrap() + Ok(serde_json::to_value(hierarchy).unwrap()) } #[tauri::command(rename_all = "snake_case")] -fn get_time_table(store: tauri::State) -> serde_json::Value { +async fn get_time_table(store: tauri::State<'_, Store>) -> Result { let waveform = store.waveform.lock().unwrap(); let time_table = waveform.as_ref().unwrap().time_table(); - serde_json::to_value(time_table).unwrap() + Ok(serde_json::to_value(time_table).unwrap()) } #[tauri::command(rename_all = "snake_case")] -fn load_and_get_signal(signal_ref_index: usize, store: tauri::State) -> serde_json::Value { +async fn load_and_get_signal( + signal_ref_index: usize, + store: tauri::State<'_, Store>, +) -> Result { let signal_ref = wellen::SignalRef::from_index(signal_ref_index).unwrap(); let mut waveform_lock = store.waveform.lock().unwrap(); let waveform = waveform_lock.as_mut().unwrap(); @@ -46,15 +58,16 @@ fn load_and_get_signal(signal_ref_index: usize, store: tauri::State) -> s // make the command async or return the result through a Tauri channel waveform.load_signals_multi_threaded(&[signal_ref]); let signal = waveform.get_signal(signal_ref).unwrap(); - serde_json::to_value(signal).unwrap() + Ok(serde_json::to_value(signal).unwrap()) } #[tauri::command(rename_all = "snake_case")] -fn unload_signal(signal_ref_index: usize, store: tauri::State) { +async fn unload_signal(signal_ref_index: usize, store: tauri::State<'_, Store>) -> Result<(), ()> { let signal_ref = wellen::SignalRef::from_index(signal_ref_index).unwrap(); let mut waveform_lock = store.waveform.lock().unwrap(); let waveform = waveform_lock.as_mut().unwrap(); waveform.unload_signals(&[signal_ref]); + Ok(()) } #[cfg_attr(mobile, tauri::mobile_entry_point)] @@ -66,10 +79,11 @@ pub fn run() { tauri::Builder::default() .manage(Store::default()) .plugin(tauri_plugin_window_state::Builder::default().build()) + .plugin(tauri_plugin_dialog::init()) // Npte: Add all handlers to `frontend/src/tauri_bridge.rs` .invoke_handler(tauri::generate_handler![ show_window, - load_waveform, + pick_and_load_waveform, get_hierarchy, get_time_table, load_and_get_signal, diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index cd35803..bd2346e 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -5,8 +5,8 @@ "build": { "frontendDist": "../frontend_dist", "devUrl": "http://localhost:8080", - "beforeDevCommand": "makers mzoon start", - "beforeBuildCommand": "makers mzoon build -r -f" + "beforeDevCommand": "makers mzoon_for_tauri start", + "beforeBuildCommand": "makers mzoon_for_tauri build -r -f" }, "app": { "macOSPrivateApi": true, diff --git a/test_files/wave_27.fst b/test_files/wave_27.fst new file mode 100644 index 0000000..a573595 Binary files /dev/null and b/test_files/wave_27.fst differ