Add an (unused) DISPOFF step

Move board control into a self-contained object
Rename framebuf
2025-02-27 09:58:15 -05:00 · 2025-02-27 09:58:15 -05:00 · 2025-02-27 09:58:15 -05:00 · 2025-02-27 09:58:15 -05:00 · 2025-02-27 09:58:15 -05:00 · 2025-02-27 09:58:15 -05:00
19 changed files with 1385 additions and 1796 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -487,7 +487,7 @@ checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
 dependencies = [
 "bitflags 2.8.0",
 "cairo-sys-rs",
- "glib",
+ "glib 0.18.5",
 "libc",
 "once_cell",
 "thiserror 1.0.69",
@ -499,9 +499,9 @@ version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
 dependencies = [
- "glib-sys",
+ "glib-sys 0.18.1",
 "libc",
- "system-deps",
+ "system-deps 6.2.2",
 ]

 [[package]]
@ -532,6 +532,16 @@ dependencies = [
 "target-lexicon",
 ]

+[[package]]
+name = "cfg-expr"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d4ba6e40bd1184518716a6e1a781bf9160e286d219ccdb8ab2612e74cfe4789"
+dependencies = [
+ "smallvec",
+ "target-lexicon",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@ -888,8 +898,8 @@ dependencies = [
 "async-std",
 "cairo-rs",
 "cyberpunk",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "gtk4",
 "serde 1.0.218",
 "serde_yml",
@ -900,8 +910,8 @@ name = "cyberpunk"
 version = "0.1.0"
 dependencies = [
 "cairo-rs",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "gtk4",
 ]

@ -912,8 +922,8 @@ dependencies = [
 "async-std",
 "cairo-rs",
 "cyberpunk",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "gtk4",
 ]

@ -929,8 +939,8 @@ dependencies = [
 "futures",
 "gdk4",
 "geo-types",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "glib-build-tools 0.18.0",
 "gtk4",
 "lazy_static",
@ -1271,8 +1281,8 @@ dependencies = [
 "emseries",
 "ft-core",
 "gdk4",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "glib-build-tools 0.18.0",
 "gtk4",
 "libadwaita",
@ -1596,8 +1606,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec"
 dependencies = [
 "gdk-pixbuf-sys",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "libc",
 "once_cell",
 ]
@ -1608,11 +1618,11 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
 dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
+ "gio-sys 0.18.1",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
 "libc",
- "system-deps",
+ "system-deps 6.2.2",
 ]

 [[package]]
@ -1624,10 +1634,10 @@ dependencies = [
 "cairo-rs",
 "gdk-pixbuf",
 "gdk4-sys",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "libc",
- "pango",
+ "pango 0.18.3",
 ]

 [[package]]
@ -1638,13 +1648,13 @@ checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0"
 dependencies = [
 "cairo-sys-rs",
 "gdk-pixbuf-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
+ "gio-sys 0.18.1",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
 "libc",
- "pango-sys",
+ "pango-sys 0.18.0",
 "pkg-config",
- "system-deps",
+ "system-deps 6.2.2",
 ]

 [[package]]
@ -1729,8 +1739,8 @@ dependencies = [
 "futures-core",
 "futures-io",
 "futures-util",
- "gio-sys",
- "glib",
+ "gio-sys 0.18.1",
+ "glib 0.18.5",
 "libc",
 "once_cell",
 "pin-project-lite",
@ -1738,19 +1748,49 @@ dependencies = [
 "thiserror 1.0.69",
 ]

+[[package]]
+name = "gio"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4f00c70f8029d84ea7572dd0e1aaa79e5329667b4c17f329d79ffb1e6277487"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "gio-sys 0.20.9",
+ "glib 0.20.9",
+ "libc",
+ "pin-project-lite",
+ "smallvec",
+]
+
 [[package]]
 name = "gio-sys"
 version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
 dependencies = [
- "glib-sys",
- "gobject-sys",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
 "libc",
- "system-deps",
+ "system-deps 6.2.2",
 "winapi",
 ]

+[[package]]
+name = "gio-sys"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "160eb5250a26998c3e1b54e6a3d4ea15c6c7762a6062a19a7b63eff6e2b33f9e"
+dependencies = [
+ "glib-sys 0.20.9",
+ "gobject-sys 0.20.9",
+ "libc",
+ "system-deps 7.0.3",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "glib"
 version = "0.18.5"
@ -1763,10 +1803,10 @@ dependencies = [
 "futures-executor",
 "futures-task",
 "futures-util",
- "gio-sys",
- "glib-macros",
- "glib-sys",
- "gobject-sys",
+ "gio-sys 0.18.1",
+ "glib-macros 0.18.5",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
 "libc",
 "memchr",
 "once_cell",
@ -1774,6 +1814,27 @@ dependencies = [
 "thiserror 1.0.69",
 ]

+[[package]]
+name = "glib"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707b819af8059ee5395a2de9f2317d87a53dbad8846a2f089f0bb44703f37686"
+dependencies = [
+ "bitflags 2.8.0",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-task",
+ "futures-util",
+ "gio-sys 0.20.9",
+ "glib-macros 0.20.7",
+ "glib-sys 0.20.9",
+ "gobject-sys 0.20.9",
+ "libc",
+ "memchr",
+ "smallvec",
+]
+
 [[package]]
 name = "glib-build-tools"
 version = "0.16.3"
@ -1799,13 +1860,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc"
 dependencies = [
 "heck 0.4.1",
- "proc-macro-crate 2.0.2",
+ "proc-macro-crate 2.0.0",
 "proc-macro-error",
 "proc-macro2",
 "quote",
 "syn 2.0.98",
 ]

+[[package]]
+name = "glib-macros"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "715601f8f02e71baef9c1f94a657a9a77c192aea6097cf9ae7e5e177cd8cde68"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro-crate 3.2.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "glib-sys"
 version = "0.18.1"
@ -1813,7 +1887,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
 dependencies = [
 "libc",
- "system-deps",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8928869a44cfdd1fccb17d6746e4ff82c8f82e41ce705aa026a52ca8dc3aefb"
+dependencies = [
+ "libc",
+ "system-deps 7.0.3",
 ]

 [[package]]
@ -1842,8 +1926,8 @@ dependencies = [
 "config-derive",
 "futures",
 "gdk4",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "glib-build-tools 0.16.3",
 "gtk4",
 "libadwaita",
@ -1869,9 +1953,20 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
 dependencies = [
- "glib-sys",
+ "glib-sys 0.18.1",
 "libc",
- "system-deps",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "gobject-sys"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c773a3cb38a419ad9c26c81d177d96b4b08980e8bdbbf32dace883e96e96e7e3"
+dependencies = [
+ "glib-sys 0.20.9",
+ "libc",
+ "system-deps 7.0.3",
 ]

 [[package]]
@ -1880,7 +1975,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401"
 dependencies = [
- "glib",
+ "glib 0.18.5",
 "graphene-sys",
 "libc",
 ]
@ -1891,10 +1986,10 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59"
 dependencies = [
- "glib-sys",
+ "glib-sys 0.18.1",
 "libc",
 "pkg-config",
- "system-deps",
+ "system-deps 6.2.2",
 ]

 [[package]]
@ -1914,11 +2009,11 @@ checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e"
 dependencies = [
 "cairo-rs",
 "gdk4",
- "glib",
+ "glib 0.18.5",
 "graphene-rs",
 "gsk4-sys",
 "libc",
- "pango",
+ "pango 0.18.3",
 ]

 [[package]]
@ -1929,12 +2024,12 @@ checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55"
 dependencies = [
 "cairo-sys-rs",
 "gdk4-sys",
- "glib-sys",
- "gobject-sys",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
 "graphene-sys",
 "libc",
- "pango-sys",
- "system-deps",
+ "pango-sys 0.18.0",
+ "system-deps 6.2.2",
 ]

 [[package]]
@ -1948,14 +2043,14 @@ dependencies = [
 "futures-channel",
 "gdk-pixbuf",
 "gdk4",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "graphene-rs",
 "gsk4",
 "gtk4-macros",
 "gtk4-sys",
 "libc",
- "pango",
+ "pango 0.18.3",
 ]

 [[package]]
@ -1981,14 +2076,14 @@ dependencies = [
 "cairo-sys-rs",
 "gdk-pixbuf-sys",
 "gdk4-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
+ "gio-sys 0.18.1",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
 "graphene-sys",
 "gsk4-sys",
 "libc",
- "pango-sys",
- "system-deps",
+ "pango-sys 0.18.0",
+ "system-deps 6.2.2",
 ]

 [[package]]
@ -2119,8 +2214,8 @@ version = "0.1.0"
 dependencies = [
 "cairo-rs",
 "coordinates",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "glib-build-tools 0.18.0",
 "gtk4",
 "image 0.24.9",
@ -2293,8 +2388,8 @@ dependencies = [
 name = "icon-test"
 version = "0.1.0"
 dependencies = [
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "gtk4",
 "libadwaita",
 ]
@ -2319,6 +2414,7 @@ checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
 dependencies = [
 "displaydoc",
 "litemap",
+ "serde 1.0.218",
 "tinystr",
 "writeable",
 "zerovec",
@ -2621,6 +2717,21 @@ dependencies = [
 "log 0.4.26",
 ]

+[[package]]
+name = "l10n-db"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "clap",
+ "icu_locid",
+ "serde 1.0.218",
+ "serde_json",
+ "tempfile",
+ "thiserror 2.0.11",
+ "toml",
+ "xml-rs",
+]
+
 [[package]]
 name = "language-tags"
 version = "0.2.2"
@ -2656,12 +2767,12 @@ checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c"
 dependencies = [
 "gdk-pixbuf",
 "gdk4",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "gtk4",
 "libadwaita-sys",
 "libc",
- "pango",
+ "pango 0.18.3",
 ]

 [[package]]
@ -2671,13 +2782,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a"
 dependencies = [
 "gdk4-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
+ "gio-sys 0.18.1",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
 "gtk4-sys",
 "libc",
- "pango-sys",
- "system-deps",
+ "pango-sys 0.18.0",
+ "system-deps 6.2.2",
 ]

 [[package]]
@ -2716,7 +2827,7 @@ dependencies = [
 "libspa-sys",
 "nix",
 "nom",
- "system-deps",
+ "system-deps 6.2.2",
 ]

 [[package]]
@ -2727,7 +2838,7 @@ checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f"
 dependencies = [
 "bindgen",
 "cc",
- "system-deps",
+ "system-deps 6.2.2",
 ]

 [[package]]
@ -3214,14 +3325,14 @@ dependencies = [
 "async-channel 2.3.1",
 "async-std",
 "cairo-rs",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "glib-build-tools 0.17.10",
 "gtk4",
 "image 0.24.9",
 "libadwaita",
 "otg-core",
- "pango",
+ "pango 0.20.9",
 "sgf",
 "tokio",
 "uuid 0.8.2",
@ -3233,11 +3344,23 @@ version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4"
 dependencies = [
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "libc",
 "once_cell",
- "pango-sys",
+ "pango-sys 0.18.0",
+]
+
+[[package]]
+name = "pango"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b1f5dc1b8cf9bc08bfc0843a04ee0fa2e78f1e1fa4b126844a383af4f25f0ec"
+dependencies = [
+ "gio 0.20.9",
+ "glib 0.20.9",
+ "libc",
+ "pango-sys 0.20.9",
 ]

 [[package]]
@ -3246,10 +3369,22 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
 dependencies = [
- "glib-sys",
- "gobject-sys",
+ "glib-sys 0.18.1",
+ "gobject-sys 0.18.0",
 "libc",
- "system-deps",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "pango-sys"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dbb9b751673bd8fe49eb78620547973a1e719ed431372122b20abd12445bab5"
+dependencies = [
+ "glib-sys 0.20.9",
+ "gobject-sys 0.20.9",
+ "libc",
+ "system-deps 7.0.3",
 ]

 [[package]]
@ -3490,7 +3625,7 @@ checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112"
 dependencies = [
 "bindgen",
 "libspa-sys",
- "system-deps",
+ "system-deps 6.2.2",
 ]

 [[package]]
@ -3612,12 +3747,20 @@ dependencies = [

 [[package]]
 name = "proc-macro-crate"
-version = "2.0.2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
 dependencies = [
- "toml_datetime",
- "toml_edit 0.20.2",
+ "toml_edit 0.20.7",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+dependencies = [
+ "toml_edit 0.22.24",
 ]

 [[package]]
@ -4197,7 +4340,7 @@ name = "screenplay"
 version = "0.1.0"
 dependencies = [
 "async-std",
- "glib",
+ "glib 0.18.5",
 "gtk4",
 ]

@ -4412,12 +4555,12 @@ dependencies = [
 "async-std",
 "cairo-rs",
 "fixed",
- "gio",
- "glib",
+ "gio 0.18.4",
+ "glib 0.18.5",
 "gtk4",
 "libadwaita",
 "lights-core",
- "pango",
+ "pango 0.20.9",
 ]

 [[package]]
@ -4767,7 +4910,20 @@ version = "6.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
 dependencies = [
- "cfg-expr",
+ "cfg-expr 0.15.8",
+ "heck 0.5.0",
+ "pkg-config",
+ "toml",
+ "version-compare",
+]
+
+[[package]]
+name = "system-deps"
+version = "7.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005"
+dependencies = [
+ "cfg-expr 0.17.2",
 "heck 0.5.0",
 "pkg-config",
 "toml",
@ -4932,6 +5088,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
 "displaydoc",
+ "serde 1.0.218",
 "zerovec",
 ]

@ -5027,21 +5184,21 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.8.2"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
 dependencies = [
 "serde 1.0.218",
 "serde_spanned",
 "toml_datetime",
- "toml_edit 0.20.2",
+ "toml_edit 0.22.24",
 ]

 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
 "serde 1.0.218",
 ]
@ -5054,20 +5211,31 @@ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
 "indexmap",
 "toml_datetime",
- "winnow",
+ "winnow 0.5.40",
 ]

 [[package]]
 name = "toml_edit"
-version = "0.20.2"
+version = "0.20.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
 dependencies = [
 "indexmap",
 "serde 1.0.218",
 "serde_spanned",
 "toml_datetime",
- "winnow",
+ "winnow 0.7.3",
 ]

 [[package]]
@ -5792,6 +5960,15 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "winnow"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.50.0"
@ -5823,6 +6000,12 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"

+[[package]]
+name = "xml-rs"
+version = "0.8.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5b940ebc25896e71dd073bad2dbaa2abfe97b0a391415e22ad1326d9c54e3c4"
+
 [[package]]
 name = "yansi-term"
 version = "0.1.2"
--- a/Cargo.nix
+++ b/Cargo.nix
--- a/Cargo.toml
+++ b/Cargo.toml
@ -9,29 +9,30 @@ members = [
    "config",
    "config-derive",
    "coordinates",
-    "cyberpunk",
    "cyber-slides",
+    "cyberpunk",
    "cyberpunk-splash",
    "dashboard",
    "emseries",
    "file-service",
-    "fitnesstrax/core",
    "fitnesstrax/app",
+    "fitnesstrax/core",
    "fluent-ergonomics",
    "geo-types",
    "gm-control-panel",
+    "gm-dash/server",
    "hex-grid",
    "icon-test",
+    "l10n-db",
    "memorycache",
    "nom-training",
    "otg/core",
    "otg/gtk",
+    "pico-st7789",
    "result-extended",
    "screenplay",
    "sgf",
    "timezone-testing",
    "tree",
    "visions/server",
-    "gm-dash/server",
-    "pico-st7789",
 ]
--- a/crate-hashes.json
+++ b/crate-hashes.json
@ -3,7 +3,6 @@
  "registry+https://github.com/rust-lang/crates.io-index#adler2@2.0.0": "09r6drylvgy8vv8k20lnbvwq8gp09h7smfn6h1rxsy15pgh629si",
  "registry+https://github.com/rust-lang/crates.io-index#adler32@1.2.0": "0d7jq7jsjyhsgbhnfq5fvrlh9j0i9g1fqrl2735ibv5f75yjgqda",
  "registry+https://github.com/rust-lang/crates.io-index#adler@1.0.2": "1zim79cvzd5yrkzl3nyfx0avijwgk9fqv3yrscdy1cc79ih02qpj",
-  "registry+https://github.com/rust-lang/crates.io-index#ahash@0.8.11": "04chdfkls5xmhp1d48gnjsmglbqibizs3bpbj6rsj604m10si7g8",
  "registry+https://github.com/rust-lang/crates.io-index#aho-corasick@1.1.3": "05mrpkvdgp5d20y2p989f187ry9diliijgwrs254fs9s1m1x6q4f",
  "registry+https://github.com/rust-lang/crates.io-index#allocator-api2@0.2.21": "08zrzs022xwndihvzdn78yqarv2b9696y67i6h78nla3ww87jgb8",
  "registry+https://github.com/rust-lang/crates.io-index#android-tzdata@0.1.1": "1w7ynjxrfs97xg3qlcdns4kgfpwcdv824g611fq32cag4cdr96g9",
@ -15,7 +14,6 @@
  "registry+https://github.com/rust-lang/crates.io-index#anstyle-wincon@3.0.7": "0kmf0fq4c8yribdpdpylzz1zccpy84hizmcsac3wrac1f7kk8dfa",
  "registry+https://github.com/rust-lang/crates.io-index#anstyle@1.0.10": "1yai2vppmd7zlvlrp9grwll60knrmscalf8l2qpfz8b7y5lkpk2m",
  "registry+https://github.com/rust-lang/crates.io-index#anyhow@1.0.95": "010vd1ki8w84dzgx6c81sc8qm9n02fxic1gkpv52zp4nwrn0kb1l",
-  "registry+https://github.com/rust-lang/crates.io-index#assert-json-diff@2.0.2": "04mg3w0rh3schpla51l18362hsirl23q93aisws2irrj32wg5r27",
  "registry+https://github.com/rust-lang/crates.io-index#async-channel@1.9.0": "0dbdlkzlncbibd3ij6y6jmvjd0cmdn48ydcfdpfhw09njd93r5c1",
  "registry+https://github.com/rust-lang/crates.io-index#async-channel@2.3.1": "0skvwxj6ysfc6d7bhczz9a2550260g62bm5gl0nmjxxyn007id49",
  "registry+https://github.com/rust-lang/crates.io-index#async-executor@1.13.1": "1v6w1dbvsmw6cs4dk4lxj5dvrikc6xi479wikwaab2qy3h09mjih",
@ -27,13 +25,8 @@
  "registry+https://github.com/rust-lang/crates.io-index#async-trait@0.1.85": "0mm0gwad44zs7mna4a0m1z4dhzpmydfj73w4wm23c8xpnhrli4rz",
  "registry+https://github.com/rust-lang/crates.io-index#atoi@2.0.0": "0a05h42fggmy7h0ajjv6m7z72l924i7igbx13hk9d8pyign9k3gj",
  "registry+https://github.com/rust-lang/crates.io-index#atomic-waker@1.1.2": "1h5av1lw56m0jf0fd3bchxq8a30xv0b4wv8s4zkp4s0i7mfvs18m",
-  "registry+https://github.com/rust-lang/crates.io-index#auto-future@1.0.0": "0wykbakzh227vz6frx9p48zsq0wpswgmb7v3917m53m7gr2pw7iw",
  "registry+https://github.com/rust-lang/crates.io-index#autocfg@0.1.8": "0y4vw4l4izdxq1v0rrhvmlbqvalrqrmk60v1z0dqlgnlbzkl7phd",
  "registry+https://github.com/rust-lang/crates.io-index#autocfg@1.4.0": "09lz3by90d2hphbq56znag9v87gfpd9gb8nr82hll8z6x2nhprdc",
-  "registry+https://github.com/rust-lang/crates.io-index#axum-core@0.4.5": "16b1496c4gm387q20hkv5ic3k5bd6xmnvk50kwsy6ymr8rhvvwh9",
-  "registry+https://github.com/rust-lang/crates.io-index#axum-macros@0.4.2": "1klv77c889jm05bzayaaiinalarhvh2crc2w4nvp3l581xaj7lap",
-  "registry+https://github.com/rust-lang/crates.io-index#axum-test@16.4.1": "1p5qxacvxsagnqq30nr2wznjyhgb8svsfb925ah3d2b0s91s9qv3",
-  "registry+https://github.com/rust-lang/crates.io-index#axum@0.7.9": "07z7wqczi9i8xb4460rvn39p4wjqwr32hx907crd1vwb2fy8ijpd",
  "registry+https://github.com/rust-lang/crates.io-index#az@1.2.1": "0ww9k1w3al7x5qmb7f13v3s9c2pg1pdxbs8xshqy6zyrchj4qzkv",
  "registry+https://github.com/rust-lang/crates.io-index#backtrace@0.3.74": "06pfif7nwx66qf2zaanc2fcq7m64i91ki9imw9xd3bnz5hrwp0ld",
  "registry+https://github.com/rust-lang/crates.io-index#base64@0.21.7": "0rw52yvsk75kar9wgqfwgb414kvil1gn7mqkrhn9zf1537mpsacx",
@ -53,7 +46,6 @@
  "registry+https://github.com/rust-lang/crates.io-index#bytemuck@1.21.0": "18wj81x9xhqcd6985r8qxmbik6szjfjfj62q3xklw8h2p3x7srgg",
  "registry+https://github.com/rust-lang/crates.io-index#byteorder@1.5.0": "0jzncxyf404mwqdbspihyzpkndfgda450l0893pz5xj685cg5l0z",
  "registry+https://github.com/rust-lang/crates.io-index#bytes@1.9.0": "16ykzx24v1x4f42v2lxyvlczqhdfji3v7r4ghwckpwijzvb1hn9j",
-  "registry+https://github.com/rust-lang/crates.io-index#bytesize@1.3.0": "1k3aak70iwz4s2gsjbxf0ws4xnixqbdz6p2ha96s06748fpniqx3",
  "registry+https://github.com/rust-lang/crates.io-index#cairo-rs@0.18.5": "1qjfkcq3mrh3p01nnn71dy3kn99g21xx3j8xcdvzn8ll2pq6x8lc",
  "registry+https://github.com/rust-lang/crates.io-index#cairo-sys-rs@0.18.2": "0lfsxl7ylw3phbnwmz3k58j1gnqi6kc2hdc7g3bb7f4hwnl9yp38",
  "registry+https://github.com/rust-lang/crates.io-index#cc@1.2.10": "0aaj2ivamhfzhgb9maasnfkh03s2mzhzpzwrkghgzbkfnv5qy80k",
@ -64,9 +56,9 @@
  "registry+https://github.com/rust-lang/crates.io-index#chrono-tz@0.8.6": "0vlksnmpb6rd4h55245agnfhphnpslwnq9al3aw3is43dd3f16nm",
  "registry+https://github.com/rust-lang/crates.io-index#chrono@0.4.39": "09g8nf409lb184kl9j4s85k0kn8wzgjkp5ls9zid50b886fwqdky",
  "registry+https://github.com/rust-lang/crates.io-index#clang-sys@1.8.1": "1x1r9yqss76z8xwpdanw313ss6fniwc1r7dzb5ycjn0ph53kj0hb",
-  "registry+https://github.com/rust-lang/crates.io-index#clap@4.5.26": "10v7qvn90calfbhap1c4r249i5c7fbxj09fn3szfz9pkis85xsx8",
-  "registry+https://github.com/rust-lang/crates.io-index#clap_builder@4.5.26": "08f1mzcvi7zjhm7hvz6al4jnv70ccqhwiaq74hihlspwnl0iic4n",
-  "registry+https://github.com/rust-lang/crates.io-index#clap_derive@4.5.24": "131ih3dm76srkbpfx7zfspp9b556zgzj31wqhl0ji2b39lcmbdsl",
+  "registry+https://github.com/rust-lang/crates.io-index#clap@4.5.30": "0vcyrn4ymq2gd56sl3xnfki8q8llg64sj3rj3qx33mgsf66v3dwj",
+  "registry+https://github.com/rust-lang/crates.io-index#clap_builder@4.5.30": "0369xis2ar46icsaxqyy37976mlb62alzyx4j53k99vq2w3v4pd3",
+  "registry+https://github.com/rust-lang/crates.io-index#clap_derive@4.5.28": "1vgigkhljp3r8r5lwdrn1ij93nafmjwh8cx77nppb9plqsaysk5z",
  "registry+https://github.com/rust-lang/crates.io-index#clap_lex@0.7.4": "19nwfls5db269js5n822vkc8dw0wjq2h1wf0hgr06ld2g52d2spl",
  "registry+https://github.com/rust-lang/crates.io-index#cloudabi@0.0.3": "0kxcg83jlihy0phnd2g8c2c303px3l2p3pkjz357ll6llnd5pz6x",
  "registry+https://github.com/rust-lang/crates.io-index#color_quant@1.1.0": "12q1n427h2bbmmm1mnglr57jaz2dj9apk0plcxw7nwqiai7qjyrx",
@ -76,7 +68,6 @@
  "registry+https://github.com/rust-lang/crates.io-index#convert_case@0.6.0": "1jn1pq6fp3rri88zyw6jlhwwgf6qiyc08d6gjv0qypgkl862n67c",
  "registry+https://github.com/rust-lang/crates.io-index#cookie-factory@0.3.3": "18mka6fk3843qq3jw1fdfvzyv05kx7kcmirfbs2vg2kbw9qzm1cq",
  "registry+https://github.com/rust-lang/crates.io-index#cookie@0.17.0": "096c52jg9iq4lfcps2psncswv33fc30mmnaa2sbzzcfcw71kgyvy",
-  "registry+https://github.com/rust-lang/crates.io-index#cookie@0.18.1": "0iy749flficrlvgr3hjmf3igr738lk81n5akzf4ym4cs6cxg7pjd",
  "registry+https://github.com/rust-lang/crates.io-index#cool_asserts@2.0.3": "1v18dg7ifx41k2f82j3gsnpm1fg9wk5s4zv7sf42c7pnad72b7zf",
  "registry+https://github.com/rust-lang/crates.io-index#core-foundation-sys@0.8.7": "12w8j73lazxmr1z0h98hf3z623kl8ms7g07jch7n4p8f9nwlhdkp",
  "registry+https://github.com/rust-lang/crates.io-index#core-foundation@0.9.4": "13zvbbj07yk3b61b8fhwfzhy35535a583irf23vlcg59j7h9bqci",
@ -94,7 +85,6 @@
  "registry+https://github.com/rust-lang/crates.io-index#deflate@0.8.6": "0x6iqlayg129w63999kz97m279m0jj4x4sm6gkqlvmp73y70yxvk",
  "registry+https://github.com/rust-lang/crates.io-index#der@0.7.9": "1h4vzjfa1lczxdf8avfj9qlwh1qianqlxdy1g5rn762qnvkzhnzm",
  "registry+https://github.com/rust-lang/crates.io-index#deranged@0.3.11": "1d1ibqqnr5qdrpw8rclwrf1myn3wf0dygl04idf4j2s49ah6yaxl",
-  "registry+https://github.com/rust-lang/crates.io-index#diff@0.1.13": "1j0nzjxci2zqx63hdcihkp0a4dkdmzxd7my4m7zk6cjyfy34j9an",
  "registry+https://github.com/rust-lang/crates.io-index#digest@0.10.7": "14p2n6ih29x81akj097lvz7wi9b6b9hvls0lwrv7b6xwyy0s5ncy",
  "registry+https://github.com/rust-lang/crates.io-index#dimensioned@0.7.0": "09ky8s3higkf677lmyqg30hmj66gpg7hx907s6hfvbk2a9av05r5",
  "registry+https://github.com/rust-lang/crates.io-index#dimensioned@0.8.0": "15s3j4ry943xqlac63bp81sgdk9s3yilysabzww35j9ibmnaic50",
@ -110,8 +100,6 @@
  "registry+https://github.com/rust-lang/crates.io-index#event-listener@2.5.3": "1q4w3pndc518crld6zsqvvpy9lkzwahp2zgza9kbzmmqh9gif1h2",
  "registry+https://github.com/rust-lang/crates.io-index#event-listener@5.4.0": "1bii2gn3vaa33s0gr2zph7cagiq0ppcfxcxabs24ri9z9kgar4il",
  "registry+https://github.com/rust-lang/crates.io-index#exr@1.73.0": "1q47yq78q9k210r6jy1wwrilxwwxqavik9l3l426rd17k7srfcgq",
-  "registry+https://github.com/rust-lang/crates.io-index#fallible-iterator@0.3.0": "0ja6l56yka5vn4y4pk6hn88z0bpny7a8k1919aqjzp0j1yhy9k1a",
-  "registry+https://github.com/rust-lang/crates.io-index#fallible-streaming-iterator@0.1.9": "0nj6j26p71bjy8h42x6jahx1hn0ng6mc2miwpgwnp8vnwqf4jq3k",
  "registry+https://github.com/rust-lang/crates.io-index#fastrand@2.3.0": "1ghiahsw1jd68df895cy5h3gzwk30hndidn3b682zmshpgmrx41p",
  "registry+https://github.com/rust-lang/crates.io-index#fdeflate@0.3.7": "130ga18vyxbb5idbgi07njymdaavvk6j08yh1dfarm294ssm6s0y",
  "registry+https://github.com/rust-lang/crates.io-index#field-offset@0.3.6": "0zq5sssaa2ckmcmxxbly8qgz3sxpb8g1lwv90sdh1z74qif2gqiq",
@ -146,6 +134,7 @@
  "registry+https://github.com/rust-lang/crates.io-index#generic-array@0.11.2": "0a7w8w0rg47nmcinnfzv443lcyb8mplwc251p1jyr5xj2yh6wzv6",
  "registry+https://github.com/rust-lang/crates.io-index#generic-array@0.14.7": "16lyyrzrljfq424c3n8kfwkqihlimmsg5nhshbbp48np3yjrqr45",
  "registry+https://github.com/rust-lang/crates.io-index#getrandom@0.2.15": "1mzlnrb3dgyd1fb84gvw10pyr8wdqdl4ry4sr64i1s8an66pqmn4",
+  "registry+https://github.com/rust-lang/crates.io-index#getrandom@0.3.1": "1y154yzby383p63ndw6zpfm0fz3vf6c0zdwc7df6vkl150wrr923",
  "registry+https://github.com/rust-lang/crates.io-index#gif@0.11.4": "01hbw3isapzpzff8l6aw55jnaqx2bcscrbwyf3rglkbbfp397p9y",
  "registry+https://github.com/rust-lang/crates.io-index#gif@0.13.1": "1whrkvdg26gp1r7f95c6800y6ijqw5y0z8rgj6xihpi136dxdciz",
  "registry+https://github.com/rust-lang/crates.io-index#gimli@0.31.1": "0gvqc0ramx8szv76jhfd4dms0zyamvlg4whhiz11j34hh3dqxqh7",
@ -170,10 +159,8 @@
  "registry+https://github.com/rust-lang/crates.io-index#gtk4@0.7.3": "0hh8nzglmz94v1m1h6vy8z12m6fr7ia467ry0md5fa4p7sm53sss",
  "registry+https://github.com/rust-lang/crates.io-index#h2@0.3.26": "1s7msnfv7xprzs6xzfj5sg6p8bjcdpcqcmjjbkd345cyi1x55zl1",
  "registry+https://github.com/rust-lang/crates.io-index#half@2.4.1": "123q4zzw1x4309961i69igzd1wb7pj04aaii3kwasrz3599qrl3d",
-  "registry+https://github.com/rust-lang/crates.io-index#hashbrown@0.14.5": "1wa1vy1xs3mp11bn3z9dv0jricgr6a2j0zkf1g19yz3vw4il89z5",
  "registry+https://github.com/rust-lang/crates.io-index#hashbrown@0.15.2": "12dj0yfn59p3kh3679ac0w1fagvzf4z2zp87a13gbbqbzw0185dz",
  "registry+https://github.com/rust-lang/crates.io-index#hashlink@0.10.0": "1h8lzvnl9qxi3zyagivzz2p1hp6shgddfmccyf6jv7s1cdicz0kk",
-  "registry+https://github.com/rust-lang/crates.io-index#hashlink@0.9.1": "1byq4nyrflm5s6wdx5qwp96l1qbp2d0nljvrr5yqrsfy51qzz93b",
  "registry+https://github.com/rust-lang/crates.io-index#headers-core@0.2.0": "0ab469xfpd411mc3dhmjhmzrhqikzyj8a17jn5bkj9zfpy0n9xp7",
  "registry+https://github.com/rust-lang/crates.io-index#headers@0.3.9": "0w62gnwh2p1lml0zqdkrx9dp438881nhz32zrzdy61qa0a9kns06",
  "registry+https://github.com/rust-lang/crates.io-index#heck@0.4.1": "1a7mqsnycv5z4z5vnv1k34548jzmc0ajic7c1j8jsaspnhw5ql4m",
@ -185,19 +172,15 @@
  "registry+https://github.com/rust-lang/crates.io-index#hkdf@0.12.4": "1xxxzcarz151p1b858yn5skmhyrvn8fs4ivx5km3i1kjmnr8wpvv",
  "registry+https://github.com/rust-lang/crates.io-index#hmac@0.12.1": "0pmbr069sfg76z7wsssfk5ddcqd9ncp79fyz6zcm6yn115yc6jbc",
  "registry+https://github.com/rust-lang/crates.io-index#home@0.5.11": "1kxb4k87a9sayr8jipr7nq9wpgmjk4hk4047hmf9kc24692k75aq",
-  "registry+https://github.com/rust-lang/crates.io-index#http-body-util@0.1.2": "0kslwazg4400qnc2azkrgqqci0fppv12waicnsy5d8hncvbjjd3r",
  "registry+https://github.com/rust-lang/crates.io-index#http-body@0.4.6": "1lmyjfk6bqk6k9gkn1dxq770sb78pqbqshga241hr5p995bb5skw",
-  "registry+https://github.com/rust-lang/crates.io-index#http-body@1.0.1": "111ir5k2b9ihz5nr9cz7cwm7fnydca7dx4hc7vr16scfzghxrzhy",
  "registry+https://github.com/rust-lang/crates.io-index#http@0.2.12": "1w81s4bcbmcj9bjp7mllm8jlz6b31wzvirz8bgpzbqkpwmbvn730",
  "registry+https://github.com/rust-lang/crates.io-index#http@1.2.0": "1skglzdf98j5nzxlii540n11is0w4l80mi5sm3xrj716asps4v7i",
  "registry+https://github.com/rust-lang/crates.io-index#httparse@1.9.5": "0ip9v8m9lvgvq1lznl31wvn0ch1v254na7lhid9p29yx9rbx6wbx",
  "registry+https://github.com/rust-lang/crates.io-index#httpdate@1.0.3": "1aa9rd2sac0zhjqh24c9xvir96g188zldkx0hr6dnnlx5904cfyz",
  "registry+https://github.com/rust-lang/crates.io-index#humantime@2.1.0": "1r55pfkkf5v0ji1x6izrjwdq9v6sc7bv99xj6srywcar37xmnfls",
  "registry+https://github.com/rust-lang/crates.io-index#hyper-tls@0.5.0": "01crgy13102iagakf6q4mb75dprzr7ps1gj0l5hxm1cvm7gks66n",
-  "registry+https://github.com/rust-lang/crates.io-index#hyper-util@0.1.10": "1d1iwrkysjhq63pg54zk3vfby1j7zmxzm9zzyfr4lwvp0szcybfz",
  "registry+https://github.com/rust-lang/crates.io-index#hyper@0.10.16": "0wwjh9p3mzvg3fss2lqz5r7ddcgl1fh9w6my2j69d6k0lbcm41ha",
  "registry+https://github.com/rust-lang/crates.io-index#hyper@0.14.32": "1rvcb0smz8q1i0y6p7rwxr02x5sclfg2hhxf3g0774zczn0cgps1",
-  "registry+https://github.com/rust-lang/crates.io-index#hyper@1.5.2": "1q7akfb443yrjzkmnnbp2vs8zi15hgbk466rr4y144v4ppabhvr5",
  "registry+https://github.com/rust-lang/crates.io-index#iana-time-zone-haiku@0.1.2": "17r6jmj31chn7xs9698r122mapq85mfnv98bb4pg6spm0si2f67k",
  "registry+https://github.com/rust-lang/crates.io-index#iana-time-zone@0.1.61": "085jjsls330yj1fnwykfzmb2f10zp6l7w4fhq81ng81574ghhpi3",
  "registry+https://github.com/rust-lang/crates.io-index#icu_collections@1.5.0": "09j5kskirl59mvqc8kabhy7005yyy7dp88jw9f6f3gkf419a8byv",
@ -215,8 +198,6 @@
  "registry+https://github.com/rust-lang/crates.io-index#idna_adapter@1.2.0": "0wggnkiivaj5lw0g0384ql2d7zk4ppkn3b1ry4n0ncjpr7qivjns",
  "registry+https://github.com/rust-lang/crates.io-index#image@0.23.14": "18gn2f7xp30pf9aqka877knlq308khxqiwjvsccvzaa4f9zcpzr4",
  "registry+https://github.com/rust-lang/crates.io-index#image@0.24.9": "17gnr6ifnpzvhjf6dwbl9hki8x6bji5mwcqp0048x1jm5yfi742n",
-  "registry+https://github.com/rust-lang/crates.io-index#include_dir@0.7.4": "1pfh3g45z88kwq93skng0n6g3r7zkhq9ldqs9y8rvr7i11s12gcj",
-  "registry+https://github.com/rust-lang/crates.io-index#include_dir_macros@0.7.4": "0x8smnf6knd86g69p19z5lpfsaqp8w0nx14kdpkz1m8bxnkqbavw",
  "registry+https://github.com/rust-lang/crates.io-index#indent_write@2.2.0": "1hqjp80argdskrhd66g9sh542yxy8qi77j6rc69qd0l7l52rdzhc",
  "registry+https://github.com/rust-lang/crates.io-index#indexmap@2.7.0": "07s7jmdymvd0rm4yswp0j3napx57hkjm9gs9n55lvs2g78vj5y32",
  "registry+https://github.com/rust-lang/crates.io-index#intl-memoizer@0.5.2": "1nkvql7c7b76axv4g68di1p2m9bnxq1cbn6mlqcawf72zhhf08py",
@ -251,7 +232,6 @@
  "registry+https://github.com/rust-lang/crates.io-index#log@0.4.25": "17ydv5zhfv1zzygy458bmg3f3jx1vfziv9d74817w76yhfqgbjq4",
  "registry+https://github.com/rust-lang/crates.io-index#logger@0.4.0": "14xlxvkspcfnspjil0xi63qj5cybxn1hjmr5gq8m4v1g9k5p54bc",
  "registry+https://github.com/rust-lang/crates.io-index#matches@0.1.10": "1994402fq4viys7pjhzisj4wcw894l53g798kkm2y74laxk0jci5",
-  "registry+https://github.com/rust-lang/crates.io-index#matchit@0.7.3": "156bgdmmlv4crib31qhgg49nsjk88dxkdqp80ha2pk2rk6n6ax0f",
  "registry+https://github.com/rust-lang/crates.io-index#md-5@0.10.6": "1kvq5rnpm4fzwmyv5nmnxygdhhb2369888a06gdc9pxyrzh7x7nq",
  "registry+https://github.com/rust-lang/crates.io-index#memchr@2.7.4": "18z32bhxrax0fnjikv475z7ii718hq457qwmaryixfxsl2qrmjkq",
  "registry+https://github.com/rust-lang/crates.io-index#memoffset@0.9.1": "12i17wh9a9plx869g7j4whf62xw68k5zd4k0k5nh6ys5mszid028",
@ -317,10 +297,9 @@
  "registry+https://github.com/rust-lang/crates.io-index#polling@3.7.4": "0bs4nhwfwsvlzlhah2gbhj3aa9ynvchv2g350wapswh26a65c156",
  "registry+https://github.com/rust-lang/crates.io-index#powerfmt@0.2.0": "14ckj2xdpkhv3h6l5sdmb9f1d57z8hbfpdldjc2vl5givq2y77j3",
  "registry+https://github.com/rust-lang/crates.io-index#ppv-lite86@0.2.20": "017ax9ssdnpww7nrl1hvqh2lzncpv04nnsibmnw9nxjnaqlpp5bp",
-  "registry+https://github.com/rust-lang/crates.io-index#pretty_assertions@1.4.1": "0v8iq35ca4rw3rza5is3wjxwsf88303ivys07anc5yviybi31q9s",
  "registry+https://github.com/rust-lang/crates.io-index#pretty_env_logger@0.5.0": "076w9dnvcpx6d3mdbkqad8nwnsynb7c8haxmscyrz7g3vga28mw6",
  "registry+https://github.com/rust-lang/crates.io-index#proc-macro-crate@1.3.1": "069r1k56bvgk0f58dm5swlssfcp79im230affwk6d9ck20g04k3z",
-  "registry+https://github.com/rust-lang/crates.io-index#proc-macro-crate@2.0.2": "092x5acqnic14cw6vacqap5kgknq3jn4c6jij9zi6j85839jc3xh",
+  "registry+https://github.com/rust-lang/crates.io-index#proc-macro-crate@2.0.0": "1s23imns07vmacn2xjd5hv2h6rr94iqq3fd2frwa6i4h2nk6d0vy",
  "registry+https://github.com/rust-lang/crates.io-index#proc-macro-error-attr@1.0.4": "0sgq6m5jfmasmwwy8x4mjygx5l7kp8s4j60bv25ckv2j1qc41gm1",
  "registry+https://github.com/rust-lang/crates.io-index#proc-macro-error@1.0.4": "1373bhxaf0pagd8zkyd03kkx6bchzf6g0dkwrwzsnal9z47lj9fs",
  "registry+https://github.com/rust-lang/crates.io-index#proc-macro2@1.0.93": "169dw9wch753if1mgyi2nfl1il77gslvh6y2q46qplprwml6m530",
@ -353,11 +332,7 @@
  "registry+https://github.com/rust-lang/crates.io-index#regex@1.11.1": "148i41mzbx8bmq32hsj1q4karkzzx5m60qza6gdw4pdc9qdyyi5m",
  "registry+https://github.com/rust-lang/crates.io-index#remove_dir_all@0.5.3": "1rzqbsgkmr053bxxl04vmvsd1njyz0nxvly97aip6aa2cmb15k9s",
  "registry+https://github.com/rust-lang/crates.io-index#reqwest@0.11.27": "0qjary4hpplpgdi62d2m0xvbn6lnzckwffm0rgkm2x51023m6ryx",
-  "registry+https://github.com/rust-lang/crates.io-index#reserve-port@2.0.1": "10x21rdb1hjzp6n5flbbw3hfd7brmirckz1q0zsf3a7s5d516f4q",
  "registry+https://github.com/rust-lang/crates.io-index#rsa@0.9.7": "06amqm85raq26v6zg00fbf93lbj3kx559n2lpxc3wrvbbiy5vis7",
-  "registry+https://github.com/rust-lang/crates.io-index#rusqlite@0.32.1": "0vlx040bppl414pbjgbp7qr4jdxwszi9krx0m63zzf2f2whvflvp",
-  "registry+https://github.com/rust-lang/crates.io-index#rusqlite_migration@1.3.1": "076dm65g0sngzrb93r07va4l5zl3gjx9gq5mlsh21p7p0bl44fwj",
-  "registry+https://github.com/rust-lang/crates.io-index#rust-multipart-rfc7578_2@0.6.1": "0mwd3i2mk91n6diaxnkw28vyjbifhrm5ls73pcpfzz8a1i0lidq3",
  "registry+https://github.com/rust-lang/crates.io-index#rustc-demangle@0.1.24": "07zysaafgrkzy2rjgwqdj2a8qdpsm6zv6f5pgpk9x0lm40z9b6vi",
  "registry+https://github.com/rust-lang/crates.io-index#rustc-hash@1.1.0": "1qkc5khrmv5pqi5l5ca9p5nl5hs742cagrndhbrlk3dhlrx3zm08",
  "registry+https://github.com/rust-lang/crates.io-index#rustc_version@0.4.1": "14lvdsmr5si5qbqzrajgb6vfn69k0sfygrvfvr2mps26xwi3mjyg",
@ -377,10 +352,9 @@
  "registry+https://github.com/rust-lang/crates.io-index#self_cell@1.1.0": "1gmxk5bvnnimcif7v1jk8ai2azfvh9djki545nd86vsnphjgrzf2",
  "registry+https://github.com/rust-lang/crates.io-index#semver@1.0.24": "1fmvjjkd3f64y5fqr1nakkq371mnwzv09fbz5mbmdxril63ypdiw",
  "registry+https://github.com/rust-lang/crates.io-index#serde@0.9.15": "1bsla8l5xr9pp5sirkal6mngxcq6q961km88jvf339j5ff8j7dil",
-  "registry+https://github.com/rust-lang/crates.io-index#serde@1.0.217": "0w2ck1p1ajmrv1cf51qf7igjn2nc51r0izzc00fzmmhkvxjl5z02",
-  "registry+https://github.com/rust-lang/crates.io-index#serde_derive@1.0.217": "180r3rj5gi5s1m23q66cr5wlfgc5jrs6n1mdmql2njnhk37zg6ss",
-  "registry+https://github.com/rust-lang/crates.io-index#serde_json@1.0.136": "1lipcjhh1zazh283i4wsl4l14knh81q2rlkwmag8v8s2rwihqsik",
-  "registry+https://github.com/rust-lang/crates.io-index#serde_path_to_error@0.1.16": "19hlz2359l37ifirskpcds7sxg0gzpqvfilibs7whdys0128i6dg",
+  "registry+https://github.com/rust-lang/crates.io-index#serde@1.0.218": "0q6z4bnrwagnms0bds4886711l6mc68s979i49zd3xnvkg8wkpz8",
+  "registry+https://github.com/rust-lang/crates.io-index#serde_derive@1.0.218": "0azqd74xbpb1v5vf6w1fdbgmwp39ljjfj25cib5rgrzlj7hh75gh",
+  "registry+https://github.com/rust-lang/crates.io-index#serde_json@1.0.139": "19kj3irpa22a7djz1jaf4wambzh7psiqa6zyafqnb76crhx6ry24",
  "registry+https://github.com/rust-lang/crates.io-index#serde_spanned@0.6.8": "1q89g70azwi4ybilz5jb8prfpa575165lmrffd49vmcf76qpqq47",
  "registry+https://github.com/rust-lang/crates.io-index#serde_urlencoded@0.7.1": "1zgklbdaysj3230xivihs30qi5vkhigg323a9m62k8jwf4a1qjfk",
  "registry+https://github.com/rust-lang/crates.io-index#serde_yml@0.0.12": "1p8xwz4znd6fj962y22fdvvv16gb8c0hx4iv5hjplngiidcdvqjr",
@ -412,14 +386,13 @@
  "registry+https://github.com/rust-lang/crates.io-index#syn@1.0.109": "0ds2if4600bd59wsv7jjgfkayfzy3hnazs394kz6zdkmna8l3dkj",
  "registry+https://github.com/rust-lang/crates.io-index#syn@2.0.96": "102wk3cgawimi3i0q3r3xw3i858zkyingg6y7gsxfy733amsvl6m",
  "registry+https://github.com/rust-lang/crates.io-index#sync_wrapper@0.1.2": "0q01lyj0gr9a93n10nxsn8lwbzq97jqd6b768x17c8f7v7gccir0",
-  "registry+https://github.com/rust-lang/crates.io-index#sync_wrapper@1.0.2": "0qvjyasd6w18mjg5xlaq5jgy84jsjfsvmnn12c13gypxbv75dwhb",
  "registry+https://github.com/rust-lang/crates.io-index#synstructure@0.13.1": "0wc9f002ia2zqcbj0q2id5x6n7g1zjqba7qkg2mr0qvvmdk7dby8",
  "registry+https://github.com/rust-lang/crates.io-index#system-configuration-sys@0.5.0": "1jckxvdr37bay3i9v52izgy52dg690x5xfg3hd394sv2xf4b2px7",
  "registry+https://github.com/rust-lang/crates.io-index#system-configuration@0.5.1": "1rz0r30xn7fiyqay2dvzfy56cvaa3km74hnbz2d72p97bkf3lfms",
  "registry+https://github.com/rust-lang/crates.io-index#system-deps@6.2.2": "0j93ryw031n3h8b0nfpj5xwh3ify636xmv8kxianvlyyipmkbrd3",
  "registry+https://github.com/rust-lang/crates.io-index#target-lexicon@0.12.16": "1cg3bnx1gdkdr5hac1hzxy64fhw4g7dqkd0n3dxy5lfngpr1mi31",
  "registry+https://github.com/rust-lang/crates.io-index#tempdir@0.3.7": "1n5n86zxpgd85y0mswrp5cfdisizq2rv3la906g6ipyc03xvbwhm",
-  "registry+https://github.com/rust-lang/crates.io-index#tempfile@3.15.0": "016pmkbwn3shas44gcwq1kc9lajalb90qafhiip5fvv8h6f5b2ls",
+  "registry+https://github.com/rust-lang/crates.io-index#tempfile@3.17.1": "0c52ggq5vy5mzgk5ly36cgzs1cig3cv6r1jarijmzxgkn6na1r92",
  "registry+https://github.com/rust-lang/crates.io-index#termcolor@1.4.1": "0mappjh3fj3p2nmrg4y7qv94rchwi9mzmgmfflr8p2awdj7lyy86",
  "registry+https://github.com/rust-lang/crates.io-index#thiserror-impl@1.0.69": "1h84fmn2nai41cxbhk6pqf46bxqq1b344v8yz089w1chzi76rvjg",
  "registry+https://github.com/rust-lang/crates.io-index#thiserror-impl@2.0.11": "1hkkn7p2y4cxbffcrprybkj0qy1rl1r6waxmxqvr764axaxc3br6",
@ -440,14 +413,12 @@
  "registry+https://github.com/rust-lang/crates.io-index#tokio-tungstenite@0.21.0": "0f5wj0crsx74rlll97lhw0wk6y12nhdnqvmnjx002hjn08fmcfy8",
  "registry+https://github.com/rust-lang/crates.io-index#tokio-util@0.7.13": "0y0h10a52c7hrldmr3410bp7j3fadq0jn9nf7awddgd2an6smz6p",
  "registry+https://github.com/rust-lang/crates.io-index#tokio@1.43.0": "17pdm49ihlhfw3rpxix3kdh2ppl1yv7nwp1kxazi5r1xz97zlq9x",
-  "registry+https://github.com/rust-lang/crates.io-index#toml@0.8.2": "0g9ysjaqvm2mv8q85xpqfn7hi710hj24sd56k49wyddvvyq8lp8q",
-  "registry+https://github.com/rust-lang/crates.io-index#toml_datetime@0.6.3": "0jsy7v8bdvmzsci6imj8fzgd255fmy5fzp6zsri14yrry7i77nkw",
+  "registry+https://github.com/rust-lang/crates.io-index#toml@0.8.20": "0j012b37iz1mihksr6a928s6dzszxvblzg3l5wxp7azzsv6sb1yd",
+  "registry+https://github.com/rust-lang/crates.io-index#toml_datetime@0.6.8": "0hgv7v9g35d7y9r2afic58jvlwnf73vgd1mz2k8gihlgrf73bmqd",
  "registry+https://github.com/rust-lang/crates.io-index#toml_edit@0.19.15": "08bl7rp5g6jwmfpad9s8jpw8wjrciadpnbaswgywpr9hv9qbfnqv",
  "registry+https://github.com/rust-lang/crates.io-index#toml_edit@0.20.2": "0f7k5svmxw98fhi28jpcyv7ldr2s3c867pjbji65bdxjpd44svir",
-  "registry+https://github.com/rust-lang/crates.io-index#tower-http@0.6.2": "15wnvhl6cpir9125s73bqjzjsvfb0fmndmsimnl2ddnlhfvs6gs0",
-  "registry+https://github.com/rust-lang/crates.io-index#tower-layer@0.3.3": "03kq92fdzxin51w8iqix06dcfgydyvx7yr6izjq0p626v9n2l70j",
+  "registry+https://github.com/rust-lang/crates.io-index#toml_edit@0.22.24": "0x0lgp70x5cl9nla03xqs5vwwwlrwmd0djkdrp3h3lpdymgpkd0p",
  "registry+https://github.com/rust-lang/crates.io-index#tower-service@0.3.3": "1hzfkvkci33ra94xjx64vv3pp0sq346w06fpkcdwjcid7zhvdycd",
-  "registry+https://github.com/rust-lang/crates.io-index#tower@0.5.2": "1ybmd59nm4abl9bsvy6rx31m4zvzp5rja2slzpn712y9b68ssffh",
  "registry+https://github.com/rust-lang/crates.io-index#tracing-attributes@0.1.28": "0v92l9cxs42rdm4m5hsa8z7ln1xsiw1zc2iil8c6k7lzq0jf2nir",
  "registry+https://github.com/rust-lang/crates.io-index#tracing-core@0.1.33": "170gc7cxyjx824r9kr17zc9gvzx89ypqfdzq259pr56gg5bwjwp6",
  "registry+https://github.com/rust-lang/crates.io-index#tracing@0.1.41": "1l5xrzyjfyayrwhvhldfnwdyligi1mpqm8mzbi2m1d6y6p2hlkkq",
@ -474,7 +445,6 @@
  "registry+https://github.com/rust-lang/crates.io-index#unsafe-any@0.4.2": "0zwwphsqkw5qaiqmjwngnfpv9ym85qcsyj7adip9qplzjzbn00zk",
  "registry+https://github.com/rust-lang/crates.io-index#url@1.7.2": "0nim1c90mxpi9wgdw2xh8dqd72vlklwlzam436akcrhjac6pqknx",
  "registry+https://github.com/rust-lang/crates.io-index#url@2.5.4": "0q6sgznyy2n4l5lm16zahkisvc9nip9aa5q1pps7656xra3bdy1j",
-  "registry+https://github.com/rust-lang/crates.io-index#urlencoding@2.1.3": "1nj99jp37k47n0hvaz5fvz7z6jd0sb4ppvfy3nphr1zbnyixpy6s",
  "registry+https://github.com/rust-lang/crates.io-index#utf-8@0.7.6": "1a9ns3fvgird0snjkd3wbdhwd3zdpc2h5gpyybrfr6ra5pkqxk09",
  "registry+https://github.com/rust-lang/crates.io-index#utf16_iter@1.0.5": "0ik2krdr73hfgsdzw0218fn35fa09dg2hvbi1xp3bmdfrp9js8y8",
  "registry+https://github.com/rust-lang/crates.io-index#utf8_iter@1.0.4": "1gmna9flnj8dbyd8ba17zigrp9c4c3zclngf5lnb5yvz1ri41hdn",
@ -492,6 +462,7 @@
  "registry+https://github.com/rust-lang/crates.io-index#warp@0.3.7": "07137zd13lchy5hxpspd0hs6sl19b0fv2zc1chf02nwnzw1d4y23",
  "registry+https://github.com/rust-lang/crates.io-index#wasi@0.10.0+wasi-snapshot-preview1": "07y3l8mzfzzz4cj09c8y90yak4hpsi9g7pllyzpr6xvwrabka50s",
  "registry+https://github.com/rust-lang/crates.io-index#wasi@0.11.0+wasi-snapshot-preview1": "08z4hxwkpdpalxjps1ai9y7ihin26y9f476i53dv98v45gkqg3cw",
+  "registry+https://github.com/rust-lang/crates.io-index#wasi@0.13.3+wasi-0.2.2": "1lnapbvdcvi3kc749wzqvwrpd483win2kicn1faa4dja38p6v096",
  "registry+https://github.com/rust-lang/crates.io-index#wasite@0.1.0": "0nw5h9nmcl4fyf4j5d4mfdjfgvwi1cakpi349wc4zrr59wxxinmq",
  "registry+https://github.com/rust-lang/crates.io-index#wasm-bindgen-backend@0.2.100": "1ihbf1hq3y81c4md9lyh6lcwbx6a5j0fw4fygd423g62lm8hc2ig",
  "registry+https://github.com/rust-lang/crates.io-index#wasm-bindgen-futures@0.4.50": "0q8ymi6i9r3vxly551dhxcyai7nc491mspj0j1wbafxwq074fpam",
@ -528,11 +499,13 @@
  "registry+https://github.com/rust-lang/crates.io-index#windows_x86_64_msvc@0.48.5": "0f4mdp895kkjh9zv8dxvn4pc10xr7839lf5pa9l0193i2pkgr57d",
  "registry+https://github.com/rust-lang/crates.io-index#windows_x86_64_msvc@0.52.6": "1v7rb5cibyzx8vak29pdrk8nx9hycsjs4w0jgms08qk49jl6v7sq",
  "registry+https://github.com/rust-lang/crates.io-index#winnow@0.5.40": "0xk8maai7gyxda673mmw3pj1hdizy5fpi7287vaywykkk19sk4zm",
+  "registry+https://github.com/rust-lang/crates.io-index#winnow@0.7.3": "1c9bmhpdwbdmll6b4l6skabz0296dchnmnxw84hh2y3ggyllwzqf",
  "registry+https://github.com/rust-lang/crates.io-index#winreg@0.50.0": "1cddmp929k882mdh6i9f2as848f13qqna6czwsqzkh1pqnr5fkjj",
+  "registry+https://github.com/rust-lang/crates.io-index#wit-bindgen-rt@0.33.0": "0g4lwfp9x6a2i1hgjn8k14nr4fsnpd5izxhc75zpi2s5cvcg6s1j",
  "registry+https://github.com/rust-lang/crates.io-index#write16@1.0.0": "0dnryvrrbrnl7vvf5vb1zkmwldhjkf2n5znliviam7bm4900z2fi",
  "registry+https://github.com/rust-lang/crates.io-index#writeable@0.5.5": "0lawr6y0bwqfyayf3z8zmqlhpnzhdx0ahs54isacbhyjwa7g778y",
+  "registry+https://github.com/rust-lang/crates.io-index#xml-rs@0.8.25": "1i73ajf6scni5bi1a51r19xykgrambdx5fkks0fyg5jqqbml1ff5",
  "registry+https://github.com/rust-lang/crates.io-index#yansi-term@0.1.2": "1w8vjlvxba6yvidqdvxddx3crl6z66h39qxj8xi6aqayw2nk0p7y",
-  "registry+https://github.com/rust-lang/crates.io-index#yansi@1.0.1": "0jdh55jyv0dpd38ij4qh60zglbw9aa8wafqai6m0wa7xaxk3mrfg",
  "registry+https://github.com/rust-lang/crates.io-index#yoke-derive@0.7.5": "0m4i4a7gy826bfvnqa9wy6sp90qf0as3wps3wb0smjaamn68g013",
  "registry+https://github.com/rust-lang/crates.io-index#yoke@0.7.5": "0h3znzrdmll0a7sglzf9ji0p5iqml11wrj1dypaf6ad6kbpnl3hj",
  "registry+https://github.com/rust-lang/crates.io-index#zerocopy-derive@0.7.35": "0gnf2ap2y92nwdalzz3x7142f2b83sni66l39vxp2ijd6j080kzs",
--- a/flake.lock
+++ b/flake.lock
@ -1,5 +1,20 @@
 {
  "nodes": {
+    "crane": {
+      "locked": {
+        "lastModified": 1739936662,
+        "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
    "flake-utils": {
      "inputs": {
        "systems": "systems"
@ -20,16 +35,16 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1704732714,
-        "narHash": "sha256-ABqK/HggMYA/jMUXgYyqVAcQ8QjeMyr1jcXfTpSHmps=",
+        "lastModified": 1740339700,
+        "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6723fa4e4f1a30d42a633bef5eb01caeb281adc3",
+        "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.11",
        "type": "indirect"
      }
    },
@ -50,6 +65,7 @@
    },
    "root": {
      "inputs": {
+        "crane": "crane",
        "nixpkgs": "nixpkgs",
        "typeshare": "typeshare",
        "unstable": "unstable"
--- a/flake.nix
+++ b/flake.nix
@ -2,12 +2,13 @@
  description = "Lumenescent Dreams Tools";

  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.11";
+    nixpkgs.url = "nixpkgs/nixos-24.11";
    unstable.url = "nixpkgs/nixos-unstable";
    typeshare.url = "github:1Password/typeshare";
+    crane.url = "github:ipetkov/crane";
  };

-  outputs = { self, nixpkgs, unstable, typeshare, ... }:
+  outputs = { self, nixpkgs, unstable, typeshare, crane, ... }:
    let 
      version = builtins.string 0 8 self.lastModifiedDate;
      supportedSystems = [ "x86_64-linux" ];
@ -56,6 +57,8 @@
      packages."x86_64-linux" =
        let
          pkgs = import nixpkgs { system = "x86_64-linux"; };
+          craneLib = crane.mkLib pkgs;
+          src = craneLib.cleanCargoSource ./.;

          gtkNativeInputs = [
            pkgs.pkg-config
@ -88,6 +91,11 @@
          dashboard = cargo_nix.workspaceMembers.dashboard.build;
          # file-service = cargo_nix.workspaceMembers.file-service.build;
          fitnesstrax = cargo_nix.workspaceMembers.fitnesstrax.build;
+          l10n-db = craneLib.buildPackage {
+            pname = "l10n-db";
+            cargoExtraArgs = "-p l10n-db";
+            src = ./.;
+          };
          otg-gtk = cargo_nix.workspaceMembers.otg-gtk.build;

          all = pkgs.symlinkJoin {
@ -98,6 +106,7 @@
                dashboard
                # file-service
                fitnesstrax
+                l10n-db
                otg-gtk
            ];
          };
--- a/l10n-db/Cargo.toml
+++ b/l10n-db/Cargo.toml
@ -0,0 +1,24 @@
+[package]
+name = "l10n-db"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+chrono = { version = "0.4.39", features = ["serde"] }
+clap = { version = "4.5.30", features = ["derive"] }
+icu_locid = { version = "1.5.0", features = ["serde"] }
+serde = { version = "1.0.218", features = ["derive"] }
+serde_json = "1.0.139"
+tempfile = "3.17.1"
+thiserror = "2.0.11"
+toml = "0.8.20"
+xml-rs = "0.8.25"
+
+# [lib]
+# name = "l10n_db"
+# path = "src/lib.rs"
+# 
+# [[bin]]
+# name = "l10n-db"
+# path = "src/main.rs"
+
--- a/l10n-db/config.toml
+++ b/l10n-db/config.toml
@ -0,0 +1,8 @@
+db_path = "./i18n"
+base_locale = "en"
+locales = [
+    "en",
+    "eo",
+    "de",
+    "es",
+]
--- a/l10n-db/i18n/SaveSettings.toml
+++ b/l10n-db/i18n/SaveSettings.toml
@ -0,0 +1,22 @@
+key = "SaveSettings"
+description = "This is a label on a button which will save the settings when clicked"
+
+[variants.eo]
+locale = "eo"
+content = "Konservi Agordojn"
+modified = "2025-02-24T19:32:11.246639077Z"
+
+[variants.es]
+locale = "es"
+content = "Guardar Configuraciones"
+modified = "2025-02-24T19:33:23.861329923Z"
+
+[variants.en]
+locale = "en"
+content = "Save Settings"
+modified = "2025-02-22T23:44:18.874218939Z"
+
+[variants.de]
+locale = "de"
+content = "Einstellungen Speichern"
+modified = "2025-02-24T19:33:19.516005843Z"
--- a/l10n-db/i18n/TimeDistance.toml
+++ b/l10n-db/i18n/TimeDistance.toml
@ -0,0 +1,22 @@
+key = "TimeDistance"
+description = "A summary of a workout or many workouts that involve a time and a distance"
+
+[variants.es]
+locale = "es"
+content = "{distance} de {activity} en {hours, plural, one {}=1 {{hours} hora} other {{hours} horas}} y {minutes, plural, one {}=1 {{minutes} minuto} other {{minutes} minutos}}"
+modified = "2025-02-24T19:33:23.861604738Z"
+
+[variants.eo]
+locale = "eo"
+content = "{distance} de {activity} en {hours, plural, =1 {{hours} horo} other {{hours} horoj}} {minutes, plural, =1 {{minutes} minuto} other {{minutes} minutoj}}"
+modified = "2025-02-24T19:32:11.246943602Z"
+
+[variants.en]
+locale = "en"
+content = "{distance} of {activity} in {hours, plural, =1 {{hours} hour} other {{hours} hours}} and {minutes, plural, =1 {{minutes} minute} other {{minutes} minutes}}"
+modified = "2025-02-24T14:09:17.361641899Z"
+
+[variants.de]
+locale = "de"
+content = "{distance} von {activity} in {hours, plural, one {}=1 {{hours} Stunde} other {{hours} Stunden}} und {minutes, plural, one {}=1 {{minutes} Minute} other {{minutes} Minuten}}"
+modified = "2025-02-24T19:33:19.516210807Z"
--- a/l10n-db/i18n/Welcome.toml
+++ b/l10n-db/i18n/Welcome.toml
@ -0,0 +1,22 @@
+key = "Welcome"
+description = "This is a welcome content that will be shown on first app opening, before configuration."
+
+[variants.en]
+locale = "en"
+content = "Welcome to FitnessTrax, the privacy-centered fitness tracker"
+modified = "2025-02-25T02:12:25.757240004Z"
+
+[variants.eo]
+locale = "eo"
+content = "Bonvenon al FitnessTrax"
+modified = "2025-02-24T19:32:11.246407627Z"
+
+[variants.es]
+locale = "es"
+content = "Bienvenido a FitnessTrax"
+modified = "2025-02-24T19:33:23.861143003Z"
+
+[variants.de]
+locale = "de"
+content = "Willkommen bei FitnessTrax"
+modified = "2025-02-24T19:33:19.515861453Z"
--- a/l10n-db/src/bin/l10n-db.rs
+++ b/l10n-db/src/bin/l10n-db.rs
@ -0,0 +1,143 @@
+use std::{fmt, path::PathBuf};
+
+use clap::{Parser, Subcommand};
+
+use icu_locid::{langid, LanguageIdentifier};
+use l10n_db::{
+    self, js, read_file,
+    xliff::{self, import_file},
+    Bundle, Editor, ReadError,
+};
+use serde::Deserialize;
+
+#[derive(Parser)]
+#[command(version, about, long_about = None)]
+struct Cli {
+    #[command(subcommand)]
+    command: Option<Commands>,
+}
+
+#[derive(Subcommand)]
+enum Commands {
+    /// Edit, potentially creating, a key
+    EditKey {
+        #[arg(short, long)]
+        key: String,
+        #[arg(short, long)]
+        locale: Option<String>,
+    },
+    /// List al keys in the database
+    ListKeys,
+    // Search the database
+    // Search { },
+    Import {
+        #[arg(short, long)]
+        file: String,
+    },
+    /// Export the database
+    Export {
+        #[arg(short, long)]
+        format: String,
+        #[arg(short, long)]
+        file: String,
+        #[arg(short, long)]
+        locale: Option<String>,
+    },
+    Report,
+}
+
+#[derive(Debug, Deserialize)]
+struct Config {
+    db_path: PathBuf,
+    base_locale: LanguageIdentifier,
+}
+
+fn edit_key(bundle: &mut Bundle, key: String, locale: LanguageIdentifier, editor: &str) {
+    let message = bundle.message(key);
+    Editor::edit(message, locale, editor);
+    bundle.save();
+}
+
+#[derive(Clone, Debug, Default)]
+struct Report {
+    keys: Vec<String>,
+    // source_deleted: Vec<String>,
+    out_of_date: Vec<String>,
+}
+
+impl fmt::Display for Report {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        writeln!(f, "{} messages in bundle", self.keys.len())?;
+        writeln!(f, "Out of date messages")?;
+        for key in self.out_of_date.iter() {
+            writeln!(f, "\t{}", key)?;
+        }
+        Ok(())
+    }
+}
+
+fn generate_report(bundle: &Bundle, base_locale: &LanguageIdentifier) -> Report {
+    let mut report: Report = Default::default();
+    for (key, message) in bundle.message_iter() {
+        report.keys.push(key.to_owned());
+        if !message.variants_out_of_date(base_locale).is_empty() {
+            report.out_of_date.push(key.to_owned())
+        }
+    }
+
+    report
+}
+
+fn main() {
+    let editor = std::env::var("EDITOR").expect("Set EDITOR to the path to your favorite editor");
+
+    let config: Config = read_file(&PathBuf::from("./config.toml"))
+        .and_then(|bytes| String::from_utf8(bytes).map_err(|_| ReadError::InvalidFormat))
+        .and_then(|content| toml::from_str(&content).map_err(|_| ReadError::InvalidFormat))
+        .unwrap();
+
+    let cli = Cli::parse();
+
+    let mut bundle = Bundle::load_from_disk(PathBuf::from(&config.db_path));
+
+    match &cli.command {
+        Some(Commands::EditKey { key, locale }) => {
+            let identifier = locale.as_ref()
+                .map(|l| l.parse::<LanguageIdentifier>().unwrap())
+                .unwrap_or(config.base_locale);
+            edit_key(&mut bundle, key.to_owned(), identifier, &editor)
+        }
+        Some(Commands::ListKeys) => {
+            for (key, _) in bundle.message_iter() {
+                println!("{}", key);
+            }
+        }
+        Some(Commands::Import { file }) => {
+            import_file(&mut bundle, &PathBuf::from(file)).unwrap();
+            bundle.save();
+        }
+        Some(Commands::Export {
+            format,
+            file,
+            locale,
+        }) => {
+            let locale = locale
+                .as_ref()
+                .map(|l| l.clone().parse::<LanguageIdentifier>().unwrap())
+                .unwrap_or(langid!("en"));
+
+            match format.as_ref() {
+                "js" => js::export_file(&bundle, locale, &PathBuf::from(file)).unwrap(),
+                "xliff" => {
+                    xliff::export_file(&bundle, locale, &PathBuf::from(file)).unwrap()
+                }
+                _ => todo!(),
+            }
+        }
+        Some(Commands::Report) => {
+            let report = generate_report(&bundle, &config.base_locale);
+            println!("{}", report);
+        }
+        None => {}
+    }
+}
--- a/l10n-db/src/bundle.rs
+++ b/l10n-db/src/bundle.rs
@ -0,0 +1,143 @@
+use std::{collections::HashMap, fs::File, io::{BufReader, Read, Write}, path::{Path, PathBuf}};
+
+use chrono::{DateTime, Utc};
+use icu_locid::LanguageIdentifier;
+use serde::{Deserialize, Serialize};
+
+pub struct Bundle {
+    path: PathBuf,
+    messages: HashMap<String, Message>,
+}
+
+impl Bundle {
+    pub fn load_from_disk(path: PathBuf) -> Self {
+        let mut messages = HashMap::new();
+        if path.is_dir() {
+            for entry in std::fs::read_dir(&path).unwrap() {
+                let entry = entry.unwrap();
+                let path = entry.path().clone();
+                let key = path.file_stem().unwrap();
+
+                let message = Message::from_file(&entry.path());
+                messages.insert(key.to_str().unwrap().to_owned(), message);
+            }
+        }
+        Self { path, messages }
+    }
+
+    pub fn message_iter(&self) -> impl Iterator<Item = (&String, &Message)> {
+        self.messages.iter()
+    }
+
+    pub fn message(&mut self, name: String) -> &mut Message {
+        self.messages
+            .entry(name.to_owned())
+            .or_insert(Message::new(name.to_owned()))
+    }
+
+    pub fn save(&self) {
+        self.messages.iter().for_each(|(key, value)| {
+            let mut path = self.path.clone();
+            path.push(key);
+            path.set_extension("toml");
+            save_file(&path, toml::to_string(value).unwrap().as_bytes());
+        });
+    }
+}
+
+fn save_file(path: &PathBuf, s: &[u8]) {
+    let mut f = File::create(path).unwrap();
+    let _ = f.write(s).unwrap();
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+pub struct Message {
+    key: String,
+    description: String,
+    variants: HashMap<LanguageIdentifier, Variant>,
+}
+
+impl Message {
+    pub fn new(key: String) -> Self {
+        Self {
+            key,
+            description: "".to_owned(),
+            variants: HashMap::new(),
+        }
+    }
+
+    pub fn from_file(path: &Path) -> Message {
+        let file = std::fs::File::open(path).unwrap();
+        let mut content = Vec::new();
+        let mut reader = BufReader::new(file);
+        let _ = reader.read_to_end(&mut content);
+        toml::from_str(&String::from_utf8(content).unwrap()).unwrap()
+    }
+
+    pub fn set_description(&mut self, desc: String) {
+        self.description = desc;
+    }
+
+    pub fn description(&self) -> &str {
+        &self.description
+    }
+
+    pub fn variant(&self, locale: &LanguageIdentifier) -> Option<&Variant> {
+        self.variants.get(locale)
+    }
+
+    pub fn variant_mut(&mut self, locale: LanguageIdentifier) -> &mut Variant {
+        self.variants.entry(locale.clone()).or_insert(Variant {
+            locale,
+            content: "".to_owned(),
+            modified: Utc::now(),
+        })
+    }
+
+    pub fn variants_out_of_date(
+        &self,
+        base_locale: &LanguageIdentifier,
+    ) -> Vec<LanguageIdentifier> {
+        match self
+            .variants
+            .get(base_locale)
+            .map(|variant| variant.modified())
+        {
+            Some(base_date) => self
+                .variants
+                .iter()
+                .filter(|(_, value)| base_date > value.modified())
+                .map(|(locale, _)| locale.clone())
+                .collect(),
+            None => vec![],
+        }
+    }
+
+    // pub fn missing_variants(&self, locals: Vec<LanguageIdentifier>) -> Vec<LanguageIdentifier> {}
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+pub struct Variant {
+    locale: LanguageIdentifier,
+    content: String,
+    modified: DateTime<Utc>,
+}
+
+impl Variant {
+    pub fn content(&self) -> &str {
+        &self.content
+    }
+
+    pub fn set_content(&mut self, content: String) {
+        self.content = content;
+        self.modified = Utc::now();
+    }
+
+    pub fn modified(&self) -> DateTime<Utc> {
+        self.modified
+    }
+}
+
+
+#[cfg(test)]
+mod test {}
--- a/l10n-db/src/editor.rs
+++ b/l10n-db/src/editor.rs
@ -0,0 +1,43 @@
+use std::{io::Write, process::Command};
+
+use icu_locid::{langid, LanguageIdentifier};
+use serde::{Deserialize, Serialize};
+
+use crate::{read_fh, Message};
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct EditorMessage {
+    description: String,
+    source: String,
+    content: String,
+}
+
+pub struct Editor {}
+
+impl Editor {
+    pub fn edit(msg: &mut Message, locale: LanguageIdentifier, editor: &str) {
+        let description = msg.description().to_owned();
+        let source_string = msg.variant_mut(langid!("en")).content().to_owned();
+        let variant = msg.variant_mut(locale);
+        // let editable_content = EditorMessage::from_variant(description, &variant);
+        let editable_content = EditorMessage {
+            description,
+            source: source_string,
+            content: variant.content().to_owned(),
+        };
+
+        let mut file = tempfile::NamedTempFile::new().unwrap();
+        let _ = file.write(toml::to_string(&editable_content).unwrap().as_bytes());
+        let _ = file.flush();
+        let mut cmd = Command::new(editor).args([file.path()]).spawn().unwrap();
+        cmd.wait().unwrap();
+        let file = file.reopen().unwrap();
+        let content = read_fh(&file).unwrap();
+
+        let new_variant: EditorMessage =
+            toml::from_str(&String::from_utf8(content).unwrap()).unwrap();
+
+        variant.set_content(new_variant.content);
+        msg.set_description(new_variant.description);
+    }
+}
--- a/l10n-db/src/formats/js.rs
+++ b/l10n-db/src/formats/js.rs
@ -0,0 +1,22 @@
+use std::{collections::BTreeMap, fs::File, io::Write, path::Path};
+
+use icu_locid::LanguageIdentifier;
+
+use crate::{Bundle, WriteError};
+
+pub fn export_file(bundle: &Bundle, locale: LanguageIdentifier, path: &Path) -> Result<(), WriteError> {
+    let mut file = File::create(path).unwrap();
+    export_fh(bundle, locale, &mut file)
+}
+
+pub fn export_fh(bundle: &Bundle, locale: LanguageIdentifier, fh: &mut File) -> Result<(), WriteError> {
+    let messages = bundle.message_iter().map(|(key, message)| {
+        let content = message.variant(&locale).unwrap().content().to_owned();
+        (key.to_owned(), content)
+    }).collect::<Vec<(String, String)>>();
+
+    let messages: BTreeMap<String, String> = messages.into_iter().collect();
+    let _ = fh.write(serde_json::to_string_pretty(&messages).unwrap().as_bytes()).unwrap();
+
+    Ok(())
+}
--- a/l10n-db/src/formats/mod.rs
+++ b/l10n-db/src/formats/mod.rs
@ -0,0 +1,4 @@
+pub mod js;
+pub mod xliff;
+
+
--- a/l10n-db/src/formats/xliff.rs
+++ b/l10n-db/src/formats/xliff.rs
@ -0,0 +1,146 @@
+use std::{
+    fs::File,
+    io::{BufReader, Read, Write},
+    path::Path,
+};
+
+use icu_locid::{langid, LanguageIdentifier};
+use xml::{attribute::OwnedAttribute, reader, writer, EmitterConfig, EventReader, EventWriter};
+
+use crate::{Bundle, Message, ReadError, WriteError};
+
+pub fn export_file(
+    bundle: &Bundle,
+    locale: LanguageIdentifier,
+    path: &Path,
+) -> Result<(), WriteError> {
+    let mut file = File::create(path).unwrap();
+    export_fh(bundle, locale, &mut file)
+}
+
+pub fn export_fh<W>(bundle: &Bundle, locale: LanguageIdentifier, fh: W) -> Result<(), WriteError>
+where
+    W: Write,
+{
+    let mut writer = EmitterConfig::new().perform_indent(true).create_writer(fh);
+
+    writer
+        .write(
+            writer::XmlEvent::start_element("xliff")
+                .attr("xmlns", "urn:oasis:names:tc:xliff:document:2.0")
+                .attr("version", "2.0")
+                .attr("srcLang", &format!("{}", locale)),
+        )
+        .unwrap();
+    writer
+        .write(writer::XmlEvent::start_element("file").attr("id", "main"))
+        .unwrap();
+
+    for (key, message) in bundle.message_iter() {
+        write_message(&mut writer, key, message, &locale);
+    }
+
+    writer.write(writer::XmlEvent::end_element()).unwrap();
+    writer.write(writer::XmlEvent::end_element()).unwrap();
+    Ok(())
+}
+
+pub fn import_file(bundle: &mut Bundle, path: &Path) -> Result<(), ReadError> {
+    let file = File::open(path).unwrap();
+    let file = BufReader::new(file);
+
+    import_reader(bundle, file)
+}
+
+pub fn import_reader<R>(bundle: &mut Bundle, fh: R) -> Result<(), ReadError>
+where
+    R: Read,
+{
+    let parser = EventReader::new(fh);
+
+    let mut locale: LanguageIdentifier = langid!("en");
+    let mut current_key = None;
+    let mut current_text: Option<String> = None;
+    let mut in_target = false;
+
+    for event in parser {
+        match event {
+            Ok(reader::XmlEvent::StartElement {
+                name, attributes, ..
+            }) => match name.local_name.as_ref() {
+                "xliff" => {
+                    locale = find_attribute(&attributes, "trgLang")
+                        .unwrap()
+                        .parse::<LanguageIdentifier>()
+                        .unwrap();
+                }
+                "unit" => current_key = find_attribute(&attributes, "id"),
+                "target" => in_target = true,
+                _ => println!("name: {}", name),
+            },
+            Ok(reader::XmlEvent::EndElement { name }) => match name.local_name.as_ref() {
+                "unit" => {
+                    if let Some(key) = current_key {
+                        let message = bundle.message(key);
+                        let variant = message.variant_mut(locale.clone());
+                        if let Some(ref text) = current_text {
+                            variant.set_content(text.clone());
+                        }
+                    }
+                    current_key = None;
+                }
+                "target" => in_target = false,
+                _ => {}
+            },
+            Ok(reader::XmlEvent::Characters(data)) => {
+                if in_target {
+                    current_text = Some(data)
+                }
+            }
+            Err(e) => {
+                eprintln!("error: {e}");
+                break;
+            }
+            _ => {}
+        }
+    }
+
+    Ok(())
+}
+
+fn write_message<T>(
+    writer: &mut EventWriter<T>,
+    key: &str,
+    message: &Message,
+    locale: &LanguageIdentifier,
+) where
+    T: std::io::Write,
+{
+    [
+        writer::XmlEvent::start_element("unit")
+            .attr("id", key)
+            .into(),
+        writer::XmlEvent::start_element("notes").into(),
+        writer::XmlEvent::start_element("note").into(),
+        writer::XmlEvent::characters(message.description()),
+        writer::XmlEvent::end_element().into(),
+        writer::XmlEvent::end_element().into(),
+        writer::XmlEvent::start_element("segment").into(),
+        writer::XmlEvent::start_element("source").into(),
+        writer::XmlEvent::characters(message.variant(locale).unwrap().content()),
+        writer::XmlEvent::end_element().into(),
+        writer::XmlEvent::end_element().into(),
+        writer::XmlEvent::end_element().into(),
+    ]
+    .into_iter()
+    .for_each(|elem: writer::XmlEvent| writer.write(elem).unwrap());
+}
+
+fn find_attribute(attrs: &Vec<OwnedAttribute>, name: &str) -> Option<String> {
+    for f in attrs {
+        if name == f.name.local_name {
+            return Some(f.value.clone());
+        }
+    }
+    None
+}
--- a/l10n-db/src/lib.rs
+++ b/l10n-db/src/lib.rs
@ -0,0 +1,11 @@
+mod bundle;
+pub use bundle::{Bundle, Message, Variant};
+
+mod editor;
+pub use editor::Editor;
+
+mod formats;
+pub use formats::{js, xliff};
+
+mod utils;
+pub use utils::*;
--- a/l10n-db/src/utils.rs
+++ b/l10n-db/src/utils.rs
@ -0,0 +1,37 @@
+use std::{fs::File, io::{BufReader, ErrorKind, Read}, path::Path};
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum ReadError {
+    #[error("file not found")]
+    FileNotFound,
+
+    #[error("invalid file format")]
+    InvalidFormat,
+
+    #[error("unhandled read error")]
+    Unhandled(ErrorKind),
+}
+
+pub fn read_file(path: &Path) -> Result<Vec<u8>, ReadError> {
+    let file = File::open(path).map_err(|err| {
+        match err.kind() {
+            ErrorKind::NotFound => ReadError::FileNotFound,
+            _ => ReadError::Unhandled( err.kind()),
+        }
+    })?;
+    read_fh(&file)
+}
+
+pub fn read_fh(file: &File) -> Result<Vec<u8>, ReadError> {
+    let mut content = Vec::new();
+    let mut reader = BufReader::new(file);
+    reader.read_to_end(&mut content).map_err(|err| ReadError::Unhandled(err.kind()))?;
+    Ok(content)
+}
+
+#[derive(Debug, Error)]
+pub enum WriteError {
+    #[error("unhandled write error")]
+    Unhandled(ErrorKind),
+}
Author	SHA1	Message	Date
Savanni D'Gerinel	21c6f30a7d	Add an (unused) DISPOFF step	2025-02-27 09:58:15 -05:00
Savanni D'Gerinel	45dc19c329	Move board control into a self-contained object	2025-02-27 09:58:15 -05:00
Savanni D'Gerinel	a69a864dca	Rename framebuf	2025-02-27 09:58:15 -05:00
Savanni D'Gerinel	f004aa3514	Use the onboard LED and try to transmit at 2MB	2025-02-27 09:58:15 -05:00
Savanni D'Gerinel	54dd004915	Tweak the hell out of the code until it shows a small square in the center of the screen	2025-02-27 09:58:15 -05:00
Savanni D'Gerinel	fb0e914edf	This gets the screen working, though not correctly	2025-02-27 09:58:15 -05:00
Savanni D'Gerinel	47e90cc6f9	Set up an app for the adafruit TFT	2025-02-27 09:58:14 -05:00
Savanni D'Gerinel	afa846f7e0	Add a crane build for l10n-db	2025-02-24 23:37:59 -05:00
Savanni D'Gerinel	254a2aefd7	Remove remaining warnings	2025-02-24 23:10:15 -05:00
Savanni D'Gerinel	a07ecae04a	Mvoe teh message and variant types into the bundle	2025-02-24 22:54:39 -05:00
Savanni D'Gerinel	76de75210f	Improve the report format	2025-02-24 22:50:06 -05:00
Savanni D'Gerinel	e5b3c7e4e1	Write a rudimentary report	2025-02-24 22:18:42 -05:00
Savanni D'Gerinel	704009b76c	Import translated xliff data	2025-02-24 21:11:12 -05:00
Savanni D'Gerinel	cd5837a437	Fix the ICU message in TimeDistance	2025-02-24 12:35:54 -05:00
Savanni D'Gerinel	a8a61cf03f	Fill out the xliff exporter	2025-02-24 09:44:44 -05:00
Savanni D'Gerinel	0df0ff9419	Start on an xliff output	2025-02-23 21:48:13 -05:00
Savanni D'Gerinel	44ee6ec8a5	Export to json	2025-02-22 19:11:29 -05:00
Savanni D'Gerinel	52a0d6e3f2	Put in more meaningful working text	2025-02-22 18:45:36 -05:00
Savanni D'Gerinel	200c13a14e	Add a configuration file	2025-02-22 18:39:32 -05:00
Savanni D'Gerinel	1c3d0711e1	Start reading the bundle	2025-02-22 16:40:23 -05:00
Savanni D'Gerinel	e16fef2b14	Write a rudimentary editor	2025-02-22 11:22:14 -05:00
Savanni D'Gerinel	e0392a4150	Write a single phrase to disk	2025-02-22 10:23:46 -05:00
Savanni D'Gerinel	359ab96779	Prototype for an l10n message bundle database	2025-02-21 10:28:41 -05:00