diff --git a/burrow-gtk/.cargo/config.toml b/burrow-gtk/.cargo/config.toml
new file mode 100644
index 0000000..87e5dd7
--- /dev/null
+++ b/burrow-gtk/.cargo/config.toml
@@ -0,0 +1,2 @@
+[target.'cfg(unix)']
+runner = "sh -c"
diff --git a/burrow-gtk/Cargo.lock b/burrow-gtk/Cargo.lock
index 3d8f154..59c05cc 100644
--- a/burrow-gtk/Cargo.lock
+++ b/burrow-gtk/Cargo.lock
@@ -203,6 +203,12 @@ version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+[[package]]
+name = "block"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+
[[package]]
name = "block-buffer"
version = "0.10.4"
@@ -246,10 +252,12 @@ dependencies = [
name = "burrow-gtk"
version = "0.1.0"
dependencies = [
+ "anyhow",
"burrow",
+ "gettext-rs",
+ "glib-build-tools",
"relm4",
- "relm4-components",
- "relm4-icons",
+ "tokio",
]
[[package]]
@@ -287,11 +295,11 @@ dependencies = [
[[package]]
name = "cairo-rs"
-version = "0.17.10"
+version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a"
+checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
"cairo-sys-rs",
"glib",
"libc",
@@ -301,9 +309,9 @@ dependencies = [
[[package]]
name = "cairo-sys-rs"
-version = "0.17.10"
+version = "0.18.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "691d0c66b1fb4881be80a760cb8fe76ea97218312f9dfe2c9cc0f496ca279cb1"
+checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
dependencies = [
"glib-sys",
"libc",
@@ -614,14 +622,13 @@ dependencies = [
[[package]]
name = "flume"
-version = "0.10.14"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
dependencies = [
"futures-core",
"futures-sink",
"nanorand",
- "pin-project",
"spin",
]
@@ -752,11 +759,10 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
-version = "0.17.10"
+version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717"
+checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c"
dependencies = [
- "bitflags 1.3.2",
"gdk-pixbuf-sys",
"gio",
"glib",
@@ -766,9 +772,9 @@ dependencies = [
[[package]]
name = "gdk-pixbuf-sys"
-version = "0.17.10"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9285ec3c113c66d7d0ab5676599176f1f42f4944ca1b581852215bf5694870cb"
+checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
dependencies = [
"gio-sys",
"glib-sys",
@@ -779,11 +785,10 @@ dependencies = [
[[package]]
name = "gdk4"
-version = "0.6.3"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff"
+checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6"
dependencies = [
- "bitflags 1.3.2",
"cairo-rs",
"gdk-pixbuf",
"gdk4-sys",
@@ -795,9 +800,9 @@ dependencies = [
[[package]]
name = "gdk4-sys"
-version = "0.6.3"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64"
+checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -833,6 +838,26 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "gettext-rs"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364"
+dependencies = [
+ "gettext-sys",
+ "locale_config",
+]
+
+[[package]]
+name = "gettext-sys"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d"
+dependencies = [
+ "cc",
+ "temp-dir",
+]
+
[[package]]
name = "gimli"
version = "0.28.0"
@@ -841,11 +866,10 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
[[package]]
name = "gio"
-version = "0.17.10"
+version = "0.18.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6973e92937cf98689b6a054a9e56c657ed4ff76de925e36fc331a15f0c5d30a"
+checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73"
dependencies = [
- "bitflags 1.3.2",
"futures-channel",
"futures-core",
"futures-io",
@@ -861,9 +885,9 @@ dependencies = [
[[package]]
name = "gio-sys"
-version = "0.17.10"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3"
+checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -874,11 +898,11 @@ dependencies = [
[[package]]
name = "glib"
-version = "0.17.10"
+version = "0.18.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b"
+checksum = "951bbd7fdc5c044ede9f05170f05a3ae9479239c3afdfe2d22d537a3add15c4e"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
"futures-channel",
"futures-core",
"futures-executor",
@@ -896,25 +920,30 @@ dependencies = [
]
[[package]]
-name = "glib-macros"
-version = "0.17.10"
+name = "glib-build-tools"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca5c79337338391f1ab8058d6698125034ce8ef31b72a442437fa6c8580de26"
+checksum = "3431c56f463443cba9bc3600248bc6d680cb614c2ee1cdd39dab5415bd12ac5c"
+
+[[package]]
+name = "glib-macros"
+version = "0.18.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5"
dependencies = [
- "anyhow",
"heck",
- "proc-macro-crate",
+ "proc-macro-crate 2.0.0",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.39",
]
[[package]]
name = "glib-sys"
-version = "0.17.10"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d80aa6ea7bba0baac79222204aa786a6293078c210abe69ef1336911d4bdc4f0"
+checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
dependencies = [
"libc",
"system-deps",
@@ -928,9 +957,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "gobject-sys"
-version = "0.17.10"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062"
+checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
dependencies = [
"glib-sys",
"libc",
@@ -939,9 +968,9 @@ dependencies = [
[[package]]
name = "graphene-rs"
-version = "0.17.10"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "def4bb01265b59ed548b05455040d272d989b3012c42d4c1bbd39083cb9b40d9"
+checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401"
dependencies = [
"glib",
"graphene-sys",
@@ -950,9 +979,9 @@ dependencies = [
[[package]]
name = "graphene-sys"
-version = "0.17.10"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1856fc817e6a6675e36cea0bd9a3afe296f5d9709d1e2d3182803ac77f0ab21d"
+checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59"
dependencies = [
"glib-sys",
"libc",
@@ -962,11 +991,10 @@ dependencies = [
[[package]]
name = "gsk4"
-version = "0.6.3"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c"
+checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e"
dependencies = [
- "bitflags 1.3.2",
"cairo-rs",
"gdk4",
"glib",
@@ -978,9 +1006,9 @@ dependencies = [
[[package]]
name = "gsk4-sys"
-version = "0.6.3"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0"
+checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@@ -994,11 +1022,10 @@ dependencies = [
[[package]]
name = "gtk4"
-version = "0.6.6"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b"
+checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842"
dependencies = [
- "bitflags 1.3.2",
"cairo-rs",
"field-offset",
"futures-channel",
@@ -1011,18 +1038,17 @@ dependencies = [
"gtk4-macros",
"gtk4-sys",
"libc",
- "once_cell",
"pango",
]
[[package]]
name = "gtk4-macros"
-version = "0.6.6"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f"
+checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f"
dependencies = [
"anyhow",
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
"proc-macro-error",
"proc-macro2",
"quote",
@@ -1031,9 +1057,9 @@ dependencies = [
[[package]]
name = "gtk4-sys"
-version = "0.6.3"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f"
+checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1048,24 +1074,6 @@ dependencies = [
"system-deps",
]
-[[package]]
-name = "gvdb"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7139233c0ecb66f285c47a3c1c02b35c8d52a42ca4c7448d0163e5637bb4bd3"
-dependencies = [
- "byteorder",
- "flate2",
- "lazy_static",
- "memmap2",
- "quick-xml",
- "safe-transmute",
- "serde",
- "serde_json",
- "walkdir",
- "zvariant",
-]
-
[[package]]
name = "h2"
version = "0.3.21"
@@ -1283,9 +1291,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.65"
+version = "0.3.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
dependencies = [
"wasm-bindgen",
]
@@ -1304,11 +1312,10 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libadwaita"
-version = "0.4.4"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf"
+checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c"
dependencies = [
- "bitflags 1.3.2",
"gdk-pixbuf",
"gdk4",
"gio",
@@ -1321,9 +1328,9 @@ dependencies = [
[[package]]
name = "libadwaita-sys"
-version = "0.4.4"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4231cb2499a9f0c4cdfa4885414b33e39901ddcac61150bc0bb4ff8a57ede404"
+checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a"
dependencies = [
"gdk4-sys",
"gio-sys",
@@ -1375,6 +1382,19 @@ version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
+[[package]]
+name = "locale_config"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934"
+dependencies = [
+ "lazy_static",
+ "objc",
+ "objc-foundation",
+ "regex",
+ "winapi",
+]
+
[[package]]
name = "lock_api"
version = "0.4.11"
@@ -1391,6 +1411,15 @@ version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "matchers"
version = "0.1.0"
@@ -1406,15 +1435,6 @@ version = "2.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
-[[package]]
-name = "memmap2"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "memoffset"
version = "0.7.1"
@@ -1558,6 +1578,35 @@ dependencies = [
"libc",
]
+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+]
+
+[[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_id"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
+dependencies = [
+ "objc",
+]
+
[[package]]
name = "object"
version = "0.32.1"
@@ -1625,11 +1674,10 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "pango"
-version = "0.17.10"
+version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48"
+checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4"
dependencies = [
- "bitflags 1.3.2",
"gio",
"glib",
"libc",
@@ -1639,9 +1687,9 @@ dependencies = [
[[package]]
name = "pango-sys"
-version = "0.17.10"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da69f9f3850b0d8990d462f8c709561975e95f689c1cdf0fecdebde78b35195"
+checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -1707,26 +1755,6 @@ version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
-[[package]]
-name = "pin-project"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
-
[[package]]
name = "pin-project-lite"
version = "0.2.13"
@@ -1771,6 +1799,15 @@ dependencies = [
"toml_edit 0.19.15",
]
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+dependencies = [
+ "toml_edit 0.20.7",
+]
+
[[package]]
name = "proc-macro-error"
version = "1.0.4"
@@ -1804,16 +1841,6 @@ dependencies = [
"unicode-ident",
]
-[[package]]
-name = "quick-xml"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51"
-dependencies = [
- "memchr",
- "serde",
-]
-
[[package]]
name = "quote"
version = "1.0.33"
@@ -1884,9 +1911,8 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
[[package]]
name = "relm4"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c16f3fad883034773b7f5af4d7e865532b8f3641e5a8bab2a34561a8d960d81"
+version = "0.7.0-beta.2"
+source = "git+https://github.com/Relm4/Relm4#61990d5c2a59565c5d11bd26270a2bb133e62ab1"
dependencies = [
"async-trait",
"flume",
@@ -1900,32 +1926,10 @@ dependencies = [
"tracing",
]
-[[package]]
-name = "relm4-components"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5485d72dc94c12a59c571d80cf9a545e5b9a2f0ebc90ea5fd234929a9376f66d"
-dependencies = [
- "once_cell",
- "relm4",
- "tracker",
-]
-
-[[package]]
-name = "relm4-icons"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e28bcc718a587bcfa31b034e0b8f4efe5b70e945b7de9d7d154b45357a0dadc"
-dependencies = [
- "gtk4",
- "gvdb",
-]
-
[[package]]
name = "relm4-macros"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9340e2553c0a184a80a0bfa1dcf73c47f3d48933aa6be90724b202f9fbd24735"
+version = "0.7.0-beta.2"
+source = "git+https://github.com/Relm4/Relm4#61990d5c2a59565c5d11bd26270a2bb133e62ab1"
dependencies = [
"proc-macro2",
"quote",
@@ -2010,21 +2014,6 @@ version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
-[[package]]
-name = "safe-transmute"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98a01dab6acf992653be49205bdd549f32f17cb2803e8eacf1560bf97259aae8"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
[[package]]
name = "schannel"
version = "0.1.22"
@@ -2264,12 +2253,6 @@ dependencies = [
"xxhash-rust",
]
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
[[package]]
name = "strsim"
version = "0.10.0"
@@ -2344,6 +2327,12 @@ version = "0.12.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
+[[package]]
+name = "temp-dir"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6"
+
[[package]]
name = "tempfile"
version = "3.8.1"
@@ -2431,9 +2420,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.34.0"
+version = "1.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
dependencies = [
"backtrace",
"bytes",
@@ -2513,6 +2502,17 @@ dependencies = [
"winnow",
]
+[[package]]
+name = "toml_edit"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+dependencies = [
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow",
+]
+
[[package]]
name = "toml_edit"
version = "0.21.0"
@@ -2619,26 +2619,6 @@ dependencies = [
"tracing-log",
]
-[[package]]
-name = "tracker"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff9636d15e370187f6bf55b79ce62ebf4221998bc0ba1774d7fa208b007f6bf8"
-dependencies = [
- "tracker-macros",
-]
-
-[[package]]
-name = "tracker-macros"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca029746fbe0efda3298205de77bf759d7fef23ac97902641e0b49a623b0455f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
-
[[package]]
name = "try-lock"
version = "0.2.4"
@@ -2755,16 +2735,6 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-[[package]]
-name = "walkdir"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
[[package]]
name = "want"
version = "0.3.1"
@@ -2782,9 +2752,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.88"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
+checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -2792,9 +2762,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.88"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
+checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
dependencies = [
"bumpalo",
"log",
@@ -2819,9 +2789,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.88"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
+checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2829,9 +2799,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.88"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
+checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
dependencies = [
"proc-macro2",
"quote",
@@ -2842,9 +2812,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.88"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
+checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
[[package]]
name = "web-sys"
@@ -3053,40 +3023,3 @@ dependencies = [
"cc",
"pkg-config",
]
-
-[[package]]
-name = "zvariant"
-version = "3.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c"
-dependencies = [
- "byteorder",
- "libc",
- "serde",
- "static_assertions",
- "zvariant_derive",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "3.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "zvariant_utils",
-]
-
-[[package]]
-name = "zvariant_utils"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
diff --git a/burrow-gtk/Cargo.toml b/burrow-gtk/Cargo.toml
index 4763320..613dce3 100644
--- a/burrow-gtk/Cargo.toml
+++ b/burrow-gtk/Cargo.toml
@@ -6,7 +6,12 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-relm4 = { version = "0.6.2", features = ["libadwaita"] }
-relm4-components = "0.6.2"
-relm4-icons = { version = "0.6.0", features = ["plus"] }
+anyhow = "1.0"
+relm4 = { features = ["libadwaita", "gnome_45"], git = "https://github.com/Relm4/Relm4" }
burrow = { version = "*", path = "../burrow/" }
+tokio = { version = "1.35.0", features = ["time", "sync"] }
+gettext-rs = "0.7.0"
+
+[build-dependencies]
+anyhow = "1.0"
+glib-build-tools = "0.18.0"
diff --git a/burrow-gtk/com.hackclub.burrow.devel.json b/burrow-gtk/build-aux/com.hackclub.burrow.devel.json
similarity index 68%
rename from burrow-gtk/com.hackclub.burrow.devel.json
rename to burrow-gtk/build-aux/com.hackclub.burrow.devel.json
index 8b32b02..31b05c7 100644
--- a/burrow-gtk/com.hackclub.burrow.devel.json
+++ b/burrow-gtk/build-aux/com.hackclub.burrow.devel.json
@@ -24,31 +24,16 @@
"RUST_LOG" : "burrow-gtk=debug"
}
},
- "cleanup" : [
- "/include",
- "/lib/pkgconfig",
- "/man",
- "/share/doc",
- "/share/gtk-doc",
- "/share/man",
- "/share/pkgconfig",
- "*.la",
- "*.a"
- ],
"modules" : [
{
"name" : "burrow-gtk",
"builddir" : true,
"subdir" : "burrow-gtk",
- "buildsystem" : "simple",
- "build-commands": [
- "cargo build",
- "install -Dm755 -t /app/bin target/debug/burrow-gtk"
- ],
+ "buildsystem" : "meson",
"sources" : [
{
"type": "dir",
- "path": "../"
+ "path": "../../"
}
]
}
diff --git a/burrow-gtk/com.hackclub.burrow.json b/burrow-gtk/build-aux/com.hackclub.burrow.json
similarity index 83%
rename from burrow-gtk/com.hackclub.burrow.json
rename to burrow-gtk/build-aux/com.hackclub.burrow.json
index 831a236..dde4f9a 100644
--- a/burrow-gtk/com.hackclub.burrow.json
+++ b/burrow-gtk/build-aux/com.hackclub.burrow.json
@@ -40,15 +40,11 @@
"name" : "burrow-gtk",
"builddir" : true,
"subdir" : "burrow-gtk",
- "buildsystem" : "simple",
- "build-commands": [
- "cargo build --release",
- "install -Dm755 -t /app/bin target/release/burrow-gtk"
- ],
+ "buildsystem" : "meson",
"sources" : [
{
"type": "dir",
- "path": "../"
+ "path": "../../"
}
]
}
diff --git a/burrow-gtk/build.rs b/burrow-gtk/build.rs
new file mode 100644
index 0000000..4db0175
--- /dev/null
+++ b/burrow-gtk/build.rs
@@ -0,0 +1,16 @@
+use anyhow::Result;
+
+fn main() -> Result<()> {
+ compile_gresources()?;
+
+ Ok(())
+}
+
+fn compile_gresources() -> Result<()> {
+ glib_build_tools::compile_resources(
+ &["data"],
+ "data/resources.gresource.xml",
+ "compiled.gresource",
+ );
+ Ok(())
+}
diff --git a/burrow-gtk/data/resources.gresource.xml b/burrow-gtk/data/resources.gresource.xml
new file mode 100644
index 0000000..381e8ef
--- /dev/null
+++ b/burrow-gtk/data/resources.gresource.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/burrow-gtk/meson.build b/burrow-gtk/meson.build
new file mode 100644
index 0000000..2df1486
--- /dev/null
+++ b/burrow-gtk/meson.build
@@ -0,0 +1,28 @@
+project('burrow-gtk', 'rust',
+ version: '0.1.0',
+ meson_version: '>= 0.62.0',
+ default_options: [ 'warning_level=2', 'werror=false', ],
+)
+
+i18n = import('i18n')
+gnome = import('gnome')
+
+glib_compile_resources = find_program('glib-compile-resources', required: true)
+glib_compile_schemas = find_program('glib-compile-schemas', required: true)
+desktop_file_validate = find_program('desktop-file-validate', required: false)
+appstream_util = find_program('appstream-util', required: false)
+fc_cache = find_program('fc-cache', required: false)
+update_mime_database = find_program('update-mime-database', required: false)
+
+dependency('gtk4', version: '>= 4.12')
+dependency('libadwaita-1', version: '>= 1.4')
+
+subdir('po')
+subdir('data')
+subdir('src')
+
+gnome.post_install(
+ glib_compile_schemas: true,
+ gtk_update_icon_cache: true,
+ update_desktop_database: true,
+)
diff --git a/burrow-gtk/po/POTFILES b/burrow-gtk/po/POTFILES
index d1acb5a..775914f 100644
--- a/burrow-gtk/po/POTFILES
+++ b/burrow-gtk/po/POTFILES
@@ -1,4 +1,3 @@
data/com.hackclub.Burrow.desktop.in
data/com.hackclub.Burrow.appdata.xml.in
data/com.hackclub.Burrow.gschema.xml
-src/window.ui
diff --git a/burrow-gtk/src/.gitignore b/burrow-gtk/src/.gitignore
new file mode 100644
index 0000000..c6bb786
--- /dev/null
+++ b/burrow-gtk/src/.gitignore
@@ -0,0 +1 @@
+config.rs
diff --git a/burrow-gtk/src/components/app.rs b/burrow-gtk/src/components/app.rs
new file mode 100644
index 0000000..cffe466
--- /dev/null
+++ b/burrow-gtk/src/components/app.rs
@@ -0,0 +1,136 @@
+use super::*;
+use anyhow::Context;
+use std::time::Duration;
+
+const RECONNECT_POLL_TIME: Duration = Duration::from_secs(5);
+
+pub struct App {
+ daemon_client: Arc>>,
+ _settings_screen: Controller,
+ switch_screen: AsyncController,
+}
+
+#[derive(Debug)]
+pub enum AppMsg {
+ None,
+ PostInit,
+}
+
+impl App {
+ pub fn run() {
+ let app = RelmApp::new("com.hackclub.burrow");
+ Self::setup_gresources().unwrap();
+ Self::setup_i18n().unwrap();
+
+ app.run_async::(());
+ }
+
+ fn setup_i18n() -> Result<()> {
+ gettextrs::setlocale(gettextrs::LocaleCategory::LcAll, "");
+ gettextrs::bindtextdomain(config::GETTEXT_PACKAGE, config::LOCALEDIR)?;
+ gettextrs::bind_textdomain_codeset(config::GETTEXT_PACKAGE, "UTF-8")?;
+ gettextrs::textdomain(config::GETTEXT_PACKAGE)?;
+ Ok(())
+ }
+
+ fn setup_gresources() -> Result<()> {
+ gtk::gio::resources_register_include!("compiled.gresource")
+ .context("Failed to register and include compiled gresource.")
+ }
+}
+
+#[relm4::component(pub, async)]
+impl AsyncComponent for App {
+ type Init = ();
+ type Input = AppMsg;
+ type Output = ();
+ type CommandOutput = ();
+
+ view! {
+ adw::Window {
+ set_title: Some("Burrow"),
+ set_default_size: (640, 480),
+ }
+ }
+
+ async fn init(
+ _: Self::Init,
+ root: Self::Root,
+ sender: AsyncComponentSender,
+ ) -> AsyncComponentParts {
+ let daemon_client = Arc::new(Mutex::new(DaemonClient::new().await.ok()));
+
+ let switch_screen = switch_screen::SwitchScreen::builder()
+ .launch(switch_screen::SwitchScreenInit {
+ daemon_client: Arc::clone(&daemon_client),
+ })
+ .forward(sender.input_sender(), |_| AppMsg::None);
+
+ let settings_screen = settings_screen::SettingsScreen::builder()
+ .launch(settings_screen::SettingsScreenInit {
+ daemon_client: Arc::clone(&daemon_client),
+ })
+ .forward(sender.input_sender(), |_| AppMsg::None);
+
+ let widgets = view_output!();
+
+ let view_stack = adw::ViewStack::new();
+ view_stack.add_titled(switch_screen.widget(), None, "Switch");
+ view_stack.add_titled(settings_screen.widget(), None, "Settings");
+
+ let view_switcher_bar = adw::ViewSwitcherBar::builder().stack(&view_stack).build();
+ view_switcher_bar.set_reveal(true);
+
+ let toolbar = adw::ToolbarView::new();
+ toolbar.add_top_bar(
+ &adw::HeaderBar::builder()
+ .title_widget(>k::Label::new(Some("Burrow")))
+ .build(),
+ );
+ toolbar.add_bottom_bar(&view_switcher_bar);
+ toolbar.set_content(Some(&view_stack));
+
+ root.set_content(Some(&toolbar));
+
+ sender.input(AppMsg::PostInit);
+
+ let model = App {
+ daemon_client,
+ switch_screen,
+ _settings_screen: settings_screen,
+ };
+
+ AsyncComponentParts { model, widgets }
+ }
+
+ async fn update(
+ &mut self,
+ _msg: Self::Input,
+ _sender: AsyncComponentSender,
+ _root: &Self::Root,
+ ) {
+ loop {
+ tokio::time::sleep(RECONNECT_POLL_TIME).await;
+ {
+ let mut daemon_client = self.daemon_client.lock().await;
+ let mut disconnected_daemon_client = false;
+
+ if let Some(daemon_client) = daemon_client.as_mut() {
+ if let Err(_e) = daemon_client.send_command(DaemonCommand::ServerInfo).await {
+ disconnected_daemon_client = true;
+ self.switch_screen
+ .emit(switch_screen::SwitchScreenMsg::DaemonDisconnect);
+ }
+ }
+
+ if disconnected_daemon_client || daemon_client.is_none() {
+ *daemon_client = DaemonClient::new().await.ok();
+ if daemon_client.is_some() {
+ self.switch_screen
+ .emit(switch_screen::SwitchScreenMsg::DaemonReconnect);
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/burrow-gtk/src/components/mod.rs b/burrow-gtk/src/components/mod.rs
new file mode 100644
index 0000000..b1cc938
--- /dev/null
+++ b/burrow-gtk/src/components/mod.rs
@@ -0,0 +1,20 @@
+use super::*;
+use adw::prelude::*;
+use burrow::{DaemonClient, DaemonCommand, DaemonResponseData};
+use gtk::Align;
+use relm4::{
+ component::{
+ AsyncComponent, AsyncComponentController, AsyncComponentParts, AsyncComponentSender,
+ AsyncController,
+ },
+ prelude::*,
+};
+use std::sync::Arc;
+use tokio::sync::Mutex;
+
+mod app;
+mod settings;
+mod settings_screen;
+mod switch_screen;
+
+pub use app::*;
diff --git a/burrow-gtk/src/components/settings/diag_group.rs b/burrow-gtk/src/components/settings/diag_group.rs
new file mode 100644
index 0000000..be542cd
--- /dev/null
+++ b/burrow-gtk/src/components/settings/diag_group.rs
@@ -0,0 +1,126 @@
+use super::*;
+use diag::{StatusTernary, SystemSetup};
+
+#[derive(Debug)]
+pub struct DiagGroup {
+ daemon_client: Arc>>,
+
+ init_system: SystemSetup,
+ service_installed: StatusTernary,
+ socket_installed: StatusTernary,
+ socket_enabled: StatusTernary,
+ daemon_running: bool,
+}
+
+pub struct DiagGroupInit {
+ pub daemon_client: Arc>>,
+}
+
+impl DiagGroup {
+ async fn new(daemon_client: Arc>>) -> Result {
+ let setup = SystemSetup::new();
+ let daemon_running = daemon_client.lock().await.is_some();
+
+ Ok(Self {
+ service_installed: setup.is_service_installed()?,
+ socket_installed: setup.is_socket_installed()?,
+ socket_enabled: setup.is_socket_enabled()?,
+ daemon_running,
+ init_system: setup,
+ daemon_client,
+ })
+ }
+}
+
+#[derive(Debug)]
+pub enum DiagGroupMsg {
+ Refresh,
+}
+
+#[relm4::component(pub, async)]
+impl AsyncComponent for DiagGroup {
+ type Init = DiagGroupInit;
+ type Input = DiagGroupMsg;
+ type Output = ();
+ type CommandOutput = ();
+
+ view! {
+ #[name(group)]
+ adw::PreferencesGroup {
+ set_title: "Diagnose",
+ set_description: Some("Diagnose Burrow"),
+
+ adw::ActionRow {
+ #[watch]
+ set_title: &format!("Init System: {}", model.init_system)
+ },
+ adw::ActionRow {
+ #[watch]
+ set_title: &format!(
+ "Service installed: {}",
+ status_ternary_to_str(model.service_installed)
+ )
+ },
+ adw::ActionRow {
+ #[watch]
+ set_title: &format!(
+ "Socket installed: {}",
+ status_ternary_to_str(model.socket_installed)
+ )
+ },
+ adw::ActionRow {
+ #[watch]
+ set_title: &format!(
+ "Socket enabled: {}",
+ status_ternary_to_str(model.socket_enabled)
+ )
+ },
+ adw::ActionRow {
+ #[watch]
+ set_title: &format!(
+ "Daemon running: {}",
+ if model.daemon_running { "Yes" } else { "No" }
+ )
+ },
+ gtk::Button {
+ set_label: "Refresh",
+ connect_clicked => DiagGroupMsg::Refresh
+ }
+ }
+ }
+
+ async fn init(
+ init: Self::Init,
+ root: Self::Root,
+ sender: AsyncComponentSender,
+ ) -> AsyncComponentParts {
+ // Should be impossible to panic here
+ let model = DiagGroup::new(init.daemon_client).await.unwrap();
+
+ let widgets = view_output!();
+
+ AsyncComponentParts { model, widgets }
+ }
+
+ async fn update(
+ &mut self,
+ msg: Self::Input,
+ _sender: AsyncComponentSender,
+ _root: &Self::Root,
+ ) {
+ match msg {
+ DiagGroupMsg::Refresh => {
+ // Should be impossible to panic here
+ *self = Self::new(Arc::clone(&self.daemon_client)).await.unwrap();
+ }
+ }
+ }
+}
+
+fn status_ternary_to_str(status: StatusTernary) -> &'static str {
+ match status {
+ StatusTernary::True => "Yes",
+ StatusTernary::False => "No",
+ StatusTernary::NA => "N/A",
+ }
+}
diff --git a/burrow-gtk/src/components/settings/mod.rs b/burrow-gtk/src/components/settings/mod.rs
new file mode 100644
index 0000000..53f46d4
--- /dev/null
+++ b/burrow-gtk/src/components/settings/mod.rs
@@ -0,0 +1,5 @@
+use super::*;
+
+mod diag_group;
+
+pub use diag_group::{DiagGroup, DiagGroupInit};
diff --git a/burrow-gtk/src/components/settings_screen.rs b/burrow-gtk/src/components/settings_screen.rs
new file mode 100644
index 0000000..0a29e43
--- /dev/null
+++ b/burrow-gtk/src/components/settings_screen.rs
@@ -0,0 +1,44 @@
+use super::*;
+
+pub struct SettingsScreen {
+ _diag_group: AsyncController,
+}
+
+pub struct SettingsScreenInit {
+ pub daemon_client: Arc>>,
+}
+
+#[relm4::component(pub)]
+impl SimpleComponent for SettingsScreen {
+ type Init = SettingsScreenInit;
+ type Input = ();
+ type Output = ();
+
+ view! {
+ #[name(preferences)]
+ adw::PreferencesPage {}
+ }
+
+ fn init(
+ init: Self::Init,
+ root: &Self::Root,
+ sender: ComponentSender,
+ ) -> ComponentParts {
+ let diag_group = settings::DiagGroup::builder()
+ .launch(settings::DiagGroupInit {
+ daemon_client: Arc::clone(&init.daemon_client),
+ })
+ .forward(sender.input_sender(), |_| ());
+
+ let widgets = view_output!();
+ widgets.preferences.add(diag_group.widget());
+
+ let model = SettingsScreen {
+ _diag_group: diag_group,
+ };
+
+ ComponentParts { model, widgets }
+ }
+
+ fn update(&mut self, _: Self::Input, _sender: ComponentSender) {}
+}
diff --git a/burrow-gtk/src/components/switch_screen.rs b/burrow-gtk/src/components/switch_screen.rs
new file mode 100644
index 0000000..a296c09
--- /dev/null
+++ b/burrow-gtk/src/components/switch_screen.rs
@@ -0,0 +1,158 @@
+use super::*;
+
+pub struct SwitchScreen {
+ daemon_client: Arc>>,
+ switch: gtk::Switch,
+ switch_screen: gtk::Box,
+ disconnected_banner: adw::Banner,
+}
+
+pub struct SwitchScreenInit {
+ pub daemon_client: Arc>>,
+}
+
+#[derive(Debug, PartialEq, Eq)]
+pub enum SwitchScreenMsg {
+ DaemonReconnect,
+ DaemonDisconnect,
+ Start,
+ Stop,
+}
+
+#[relm4::component(pub, async)]
+impl AsyncComponent for SwitchScreen {
+ type Init = SwitchScreenInit;
+ type Input = SwitchScreenMsg;
+ type Output = ();
+ type CommandOutput = ();
+
+ view! {
+ gtk::Box {
+ set_orientation: gtk::Orientation::Vertical,
+ set_valign: Align::BaselineFill,
+
+ gtk::Box {
+ set_orientation: gtk::Orientation::Vertical,
+ set_spacing: 5,
+ set_margin_all: 5,
+ set_valign: Align::Start,
+
+ #[name(setup_banner)]
+ adw::Banner {
+ set_title: "Burrow is not running!",
+ },
+ },
+
+ #[name(switch_screen)]
+ gtk::Box {
+ set_orientation: gtk::Orientation::Vertical,
+ set_spacing: 10,
+ set_margin_all: 5,
+ set_valign: Align::Center,
+ set_vexpand: true,
+
+ gtk::Label {
+ set_label: "Burrow Switch",
+ },
+
+ #[name(switch)]
+ gtk::Switch {
+ set_halign: Align::Center,
+ set_hexpand: false,
+ set_vexpand: false,
+ connect_active_notify => move |switch|
+ sender.input(if switch.is_active() { SwitchScreenMsg::Start } else { SwitchScreenMsg::Stop })
+ },
+ }
+ }
+ }
+
+ async fn init(
+ init: Self::Init,
+ root: Self::Root,
+ sender: AsyncComponentSender,
+ ) -> AsyncComponentParts {
+ let mut initial_switch_status = false;
+ let mut initial_daemon_server_down = false;
+
+ if let Some(daemon_client) = init.daemon_client.lock().await.as_mut() {
+ if let Ok(res) = daemon_client
+ .send_command(DaemonCommand::ServerInfo)
+ .await
+ .as_ref()
+ {
+ initial_switch_status = match res.result.as_ref() {
+ Ok(DaemonResponseData::None) => false,
+ Ok(DaemonResponseData::ServerInfo(_)) => true,
+ _ => false,
+ };
+ } else {
+ initial_daemon_server_down = true;
+ }
+ } else {
+ initial_daemon_server_down = true;
+ }
+
+ let widgets = view_output!();
+
+ widgets.switch.set_active(initial_switch_status);
+
+ if initial_daemon_server_down {
+ *init.daemon_client.lock().await = None;
+ widgets.switch.set_active(false);
+ widgets.switch_screen.set_sensitive(false);
+ widgets.setup_banner.set_revealed(true);
+ }
+
+ let model = SwitchScreen {
+ daemon_client: init.daemon_client,
+ switch: widgets.switch.clone(),
+ switch_screen: widgets.switch_screen.clone(),
+ disconnected_banner: widgets.setup_banner.clone(),
+ };
+
+ AsyncComponentParts { model, widgets }
+ }
+
+ async fn update(
+ &mut self,
+ msg: Self::Input,
+ _: AsyncComponentSender,
+ _root: &Self::Root,
+ ) {
+ let mut disconnected_daemon_client = false;
+
+ if let Some(daemon_client) = self.daemon_client.lock().await.as_mut() {
+ match msg {
+ Self::Input::Start => {
+ if let Err(_e) = daemon_client
+ .send_command(DaemonCommand::Start(Default::default()))
+ .await
+ {
+ disconnected_daemon_client = true;
+ }
+ }
+ Self::Input::Stop => {
+ if let Err(_e) = daemon_client.send_command(DaemonCommand::Stop).await {
+ disconnected_daemon_client = true;
+ }
+ }
+ _ => {}
+ }
+ } else {
+ disconnected_daemon_client = true;
+ }
+
+ if msg == Self::Input::DaemonReconnect {
+ self.disconnected_banner.set_revealed(false);
+ self.switch_screen.set_sensitive(true);
+ }
+
+ if disconnected_daemon_client || msg == Self::Input::DaemonDisconnect {
+ *self.daemon_client.lock().await = None;
+ self.switch.set_active(false);
+ self.switch_screen.set_sensitive(false);
+ self.disconnected_banner.set_revealed(true);
+ }
+ }
+}
diff --git a/burrow-gtk/src/config.rs.in b/burrow-gtk/src/config.rs.in
new file mode 100644
index 0000000..1a24858
--- /dev/null
+++ b/burrow-gtk/src/config.rs.in
@@ -0,0 +1,4 @@
+pub static VERSION: &str = @VERSION@;
+pub static GETTEXT_PACKAGE: &str = @GETTEXT_PACKAGE@;
+pub static LOCALEDIR: &str = @LOCALEDIR@;
+pub static PKGDATADIR: &str = @PKGDATADIR@;
diff --git a/burrow-gtk/src/diag.rs b/burrow-gtk/src/diag.rs
new file mode 100644
index 0000000..348293e
--- /dev/null
+++ b/burrow-gtk/src/diag.rs
@@ -0,0 +1,80 @@
+use super::*;
+use std::{fmt::Display, fs, process::Command};
+
+const SYSTEMD_SOCKET_LOC: &str = "/etc/systemd/system/burrow.socket";
+const SYSTEMD_SERVICE_LOC: &str = "/etc/systemd/system/burrow.service";
+
+// I don't like this type very much.
+#[derive(Debug, Clone, Copy)]
+pub enum StatusTernary {
+ True,
+ False,
+ NA,
+}
+
+// Realistically, we may not explicitly "support" non-systemd platforms which would simply this
+// code greatly.
+// Along with replacing [`StatusTernary`] with good old [`bool`].
+#[derive(Debug, Clone, Copy)]
+pub enum SystemSetup {
+ Systemd,
+ Other,
+}
+
+impl SystemSetup {
+ pub fn new() -> Self {
+ if Command::new("systemctl").arg("--version").output().is_ok() {
+ SystemSetup::Systemd
+ } else {
+ SystemSetup::Other
+ }
+ }
+
+ pub fn is_service_installed(&self) -> Result {
+ match self {
+ SystemSetup::Systemd => Ok(fs::metadata(SYSTEMD_SERVICE_LOC).is_ok().into()),
+ SystemSetup::Other => Ok(StatusTernary::NA),
+ }
+ }
+
+ pub fn is_socket_installed(&self) -> Result {
+ match self {
+ SystemSetup::Systemd => Ok(fs::metadata(SYSTEMD_SOCKET_LOC).is_ok().into()),
+ SystemSetup::Other => Ok(StatusTernary::NA),
+ }
+ }
+
+ pub fn is_socket_enabled(&self) -> Result {
+ match self {
+ SystemSetup::Systemd => {
+ let output = Command::new("systemctl")
+ .arg("is-enabled")
+ .arg("burrow.socket")
+ .output()?
+ .stdout;
+ let output = String::from_utf8(output)?;
+ Ok((output == "enabled\n").into())
+ }
+ SystemSetup::Other => Ok(StatusTernary::NA),
+ }
+ }
+}
+
+impl From for StatusTernary {
+ fn from(value: bool) -> Self {
+ if value {
+ StatusTernary::True
+ } else {
+ StatusTernary::False
+ }
+ }
+}
+
+impl Display for SystemSetup {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ f.write_str(match self {
+ SystemSetup::Systemd => "Systemd",
+ SystemSetup::Other => "Other",
+ })
+ }
+}
diff --git a/burrow-gtk/src/main.rs b/burrow-gtk/src/main.rs
index d91b6c2..6f91e2a 100644
--- a/burrow-gtk/src/main.rs
+++ b/burrow-gtk/src/main.rs
@@ -1,87 +1,11 @@
-use adw::prelude::*;
-use burrow::{DaemonClient, DaemonCommand, DaemonStartOptions};
-use gtk::Align;
-use relm4::{
- component::{AsyncComponent, AsyncComponentParts, AsyncComponentSender},
- prelude::*,
-};
+use anyhow::Result;
-struct App {}
+pub mod components;
+mod diag;
-#[derive(Debug)]
-enum Msg {
- Start,
- Stop,
-}
-
-#[relm4::component(async)]
-impl AsyncComponent for App {
- type Init = ();
- type Input = Msg;
- type Output = ();
- type CommandOutput = ();
-
- view! {
- adw::Window {
- set_title: Some("Simple app"),
- set_default_size: (640, 480),
-
- gtk::Box {
- set_orientation: gtk::Orientation::Vertical,
- set_spacing: 5,
- set_margin_all: 5,
- set_valign: Align::Center,
-
- gtk::Label {
- set_label: "Burrow GTK Switch",
- },
-
- gtk::Switch {
- set_halign: Align::Center,
- set_hexpand: false,
- set_vexpand: false,
- connect_active_notify => move |switch|
- sender.input(if switch.is_active() { Msg::Start } else { Msg::Stop })
- },
- }
- }
- }
-
- async fn init(
- _: Self::Init,
- root: Self::Root,
- sender: AsyncComponentSender,
- ) -> AsyncComponentParts {
- let model = App {};
-
- let widgets = view_output!();
-
- AsyncComponentParts { model, widgets }
- }
-
- async fn update(
- &mut self,
- msg: Self::Input,
- _sender: AsyncComponentSender,
- _root: &Self::Root,
- ) {
- match msg {
- Msg::Start => {
- let mut client = DaemonClient::new().await.unwrap();
- client
- .send_command(DaemonCommand::Start(DaemonStartOptions::default()))
- .await
- .unwrap();
- }
- Msg::Stop => {
- let mut client = DaemonClient::new().await.unwrap();
- client.send_command(DaemonCommand::Stop).await.unwrap();
- }
- }
- }
-}
+// Generated using meson
+mod config;
fn main() {
- let app = RelmApp::new("com.hackclub.burrow");
- app.run_async::(());
+ components::App::run();
}
diff --git a/burrow-gtk/src/meson.build b/burrow-gtk/src/meson.build
new file mode 100644
index 0000000..1d7422a
--- /dev/null
+++ b/burrow-gtk/src/meson.build
@@ -0,0 +1,46 @@
+pkgdatadir = get_option('prefix') / get_option('datadir') / meson.project_name()
+
+global_conf = configuration_data()
+global_conf.set_quoted('VERSION', meson.project_version())
+global_conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+global_conf.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
+global_conf.set_quoted('PKGDATADIR', pkgdatadir)
+config = configure_file(
+ input: 'config.rs.in',
+ output: 'config.rs',
+ configuration: global_conf
+)
+
+run_command(
+ 'cp',
+ meson.project_build_root() / 'src' / 'config.rs',
+ meson.project_source_root() / 'src' / 'config.rs',
+ check: true
+)
+
+cargo_bin = find_program('cargo')
+cargo_opt = [ '--manifest-path', meson.project_source_root() / 'Cargo.toml' ]
+cargo_opt += [ '--target-dir', meson.project_build_root() / 'src' ]
+cargo_env = [ 'CARGO_HOME=' + meson.project_build_root() / 'cargo-home' ]
+
+if get_option('buildtype') == 'release'
+ cargo_options += [ '--release' ]
+ rust_target = 'release'
+else
+ rust_target = 'debug'
+endif
+
+cargo_build = custom_target(
+ 'cargo-build',
+ build_by_default: true,
+ build_always_stale: true,
+ output: meson.project_name(),
+ console: true,
+ install: true,
+ install_dir: get_option('bindir'),
+ command: [
+ 'env', cargo_env,
+ cargo_bin, 'build',
+ cargo_opt, '&&', 'cp', 'src' / rust_target / meson.project_name(), '@OUTPUT@',
+ ]
+)