diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f4cdd222..3b2057cb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -34,7 +34,7 @@ jobs:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921
with:
- toolchain: stable
+ toolchain: nightly
components: rustfmt,clippy
- name: Format
diff --git a/Cargo.lock b/Cargo.lock
index 958a31cf..805e8b46 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -30,18 +30,46 @@ dependencies = [
[[package]]
name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
dependencies = [
"memchr",
]
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "ansi-str"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "060de1453b69f46304b28274f382132f4e72c55637cf362920926a70d090890d"
+dependencies = [
+ "ansitok",
+]
+
+[[package]]
+name = "ansitok"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0a8acea8c2f1c60f0a92a8cd26bf96ca97db56f10bbcab238bbe0cceba659ee"
+dependencies = [
+ "nom",
+ "vte",
+]
+
[[package]]
name = "anstream"
-version = "0.6.20"
+version = "0.6.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -54,9 +82,9 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.11"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
[[package]]
name = "anstyle-parse"
@@ -69,11 +97,11 @@ dependencies = [
[[package]]
name = "anstyle-query"
-version = "1.1.4"
+version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
]
[[package]]
@@ -162,9 +190,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "bitflags"
-version = "2.9.4"
+version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
[[package]]
name = "bitvec"
@@ -216,11 +244,17 @@ version = "3.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+[[package]]
+name = "bytecount"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e"
+
[[package]]
name = "bytemuck"
-version = "1.23.2"
+version = "1.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677"
+checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
[[package]]
name = "byteorder-lite"
@@ -230,9 +264,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
[[package]]
name = "bytes"
-version = "1.10.1"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
[[package]]
name = "bzip2"
@@ -254,10 +288,11 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.2.33"
+version = "1.2.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ee0f8803222ba5a7e2777dd72ca451868909b1ac410621b676adf07280e9b5f"
+checksum = "9f50d563227a1c37cc0a263f64eca3334388c01c5e4c4861a9def205c614383c"
dependencies = [
+ "find-msvc-tools",
"jobserver",
"libc",
"shlex",
@@ -265,9 +300,9 @@ dependencies = [
[[package]]
name = "cfg-if"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
[[package]]
name = "cfg_aliases"
@@ -275,6 +310,19 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+[[package]]
+name = "chrono"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+dependencies = [
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-link 0.2.1",
+]
+
[[package]]
name = "cipher"
version = "0.4.4"
@@ -287,9 +335,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.47"
+version = "4.5.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"
+checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8"
dependencies = [
"clap_builder",
"clap_derive",
@@ -297,9 +345,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.47"
+version = "4.5.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"
+checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00"
dependencies = [
"anstream",
"anstyle",
@@ -309,9 +357,9 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.47"
+version = "4.5.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
+checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
dependencies = [
"heck",
"proc-macro2",
@@ -321,9 +369,9 @@ dependencies = [
[[package]]
name = "clap_lex"
-version = "0.7.5"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
[[package]]
name = "colorchoice"
@@ -355,7 +403,7 @@ dependencies = [
"encode_unicode",
"libc",
"once_cell",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.2",
"windows-sys 0.60.2",
]
@@ -403,6 +451,12 @@ dependencies = [
"url",
]
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
[[package]]
name = "cpufeatures"
version = "0.2.17"
@@ -553,9 +607,9 @@ dependencies = [
[[package]]
name = "deranged"
-version = "0.4.0"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
dependencies = [
"powerfmt",
]
@@ -573,13 +627,14 @@ dependencies = [
[[package]]
name = "diesel"
-version = "2.3.2"
+version = "2.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8496eeb328dce26ee9d9b73275d396d9bddb433fa30106cf6056dd8c3c2764c"
+checksum = "e130c806dccc85428c564f2dc5a96e05b6615a27c9a28776bd7761a9af4bb552"
dependencies = [
"diesel_derives",
"downcast-rs",
"libsqlite3-sys",
+ "serde_json",
"sqlite-wasm-rs",
"time",
]
@@ -599,9 +654,9 @@ dependencies = [
[[package]]
name = "diesel_migrations"
-version = "2.3.0"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee060f709c3e3b1cadd83fcd0f61711f7a8cf493348f758d3a1c1147d70b3c97"
+checksum = "745fd255645f0f1135f9ec55c7b00e0882192af9683ab4731e4bba3da82b8f9c"
dependencies = [
"diesel",
"migrations_internals",
@@ -645,7 +700,7 @@ version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
dependencies = [
- "litrs 1.0.0",
+ "litrs",
]
[[package]]
@@ -655,7 +710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed6b3e31251e87acd1b74911aed84071c8364fc9087972748ade2f1094ccce34"
dependencies = [
"documented-macros",
- "phf 0.12.1",
+ "phf",
"thiserror 2.0.17",
]
@@ -714,26 +769,14 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
[[package]]
name = "errno"
-version = "0.3.13"
+version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [
"libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
]
-[[package]]
-name = "fallible-iterator"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
-
-[[package]]
-name = "fallible-streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
-
[[package]]
name = "fast-glob"
version = "1.0.0"
@@ -770,11 +813,17 @@ dependencies = [
"windows-sys 0.60.2",
]
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
+
[[package]]
name = "flate2"
-version = "1.1.2"
+version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -786,12 +835,6 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-[[package]]
-name = "foldhash"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
-
[[package]]
name = "form_urlencoded"
version = "1.2.2"
@@ -908,19 +951,19 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
dependencies = [
"cfg-if",
"libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
]
[[package]]
name = "getrandom"
-version = "0.3.3"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
dependencies = [
"cfg-if",
"libc",
"r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasip2",
]
[[package]]
@@ -942,27 +985,9 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
-dependencies = [
- "foldhash",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
-
-[[package]]
-name = "hashlink"
-version = "0.10.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
-dependencies = [
- "hashbrown 0.15.5",
-]
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
[[package]]
name = "heck"
@@ -981,12 +1006,11 @@ dependencies = [
[[package]]
name = "http"
-version = "1.3.1"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
dependencies = [
"bytes",
- "fnv",
"itoa",
]
@@ -996,11 +1020,35 @@ version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+[[package]]
+name = "iana-time-zone"
+version = "0.1.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
[[package]]
name = "icu_collections"
-version = "2.0.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
dependencies = [
"displaydoc",
"potential_utf",
@@ -1011,9 +1059,9 @@ dependencies = [
[[package]]
name = "icu_locale_core"
-version = "2.0.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
dependencies = [
"displaydoc",
"litemap",
@@ -1024,11 +1072,10 @@ dependencies = [
[[package]]
name = "icu_normalizer"
-version = "2.0.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
dependencies = [
- "displaydoc",
"icu_collections",
"icu_normalizer_data",
"icu_properties",
@@ -1039,42 +1086,38 @@ dependencies = [
[[package]]
name = "icu_normalizer_data"
-version = "2.0.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
[[package]]
name = "icu_properties"
-version = "2.0.1"
+version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
dependencies = [
- "displaydoc",
"icu_collections",
"icu_locale_core",
"icu_properties_data",
"icu_provider",
- "potential_utf",
"zerotrie",
"zerovec",
]
[[package]]
name = "icu_properties_data"
-version = "2.0.1"
+version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
[[package]]
name = "icu_provider"
-version = "2.0.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
dependencies = [
"displaydoc",
"icu_locale_core",
- "stable_deref_trait",
- "tinystr",
"writeable",
"yoke",
"zerofrom",
@@ -1111,9 +1154,9 @@ dependencies = [
[[package]]
name = "image"
-version = "0.25.8"
+version = "0.25.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "529feb3e6769d234375c4cf1ee2ce713682b8e76538cb13f9fc23e1400a591e7"
+checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a"
dependencies = [
"bytemuck",
"byteorder-lite",
@@ -1122,44 +1165,25 @@ dependencies = [
"png",
]
-[[package]]
-name = "include_dir"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
-dependencies = [
- "include_dir_macros",
-]
-
-[[package]]
-name = "include_dir_macros"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
[[package]]
name = "indexmap"
-version = "2.12.0"
+version = "2.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
+checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
dependencies = [
"equivalent",
- "hashbrown 0.16.0",
+ "hashbrown",
]
[[package]]
name = "indicatif"
-version = "0.18.0"
+version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70a646d946d06bedbbc4cac4c218acf4bbf2d87757a784857025f4d447e4e1cd"
+checksum = "9375e112e4b463ec1b1c6c011953545c65a30164fbab5b581df32b3abf0dcb88"
dependencies = [
"console",
"portable-atomic",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.2",
"unit-prefix",
"web-time",
]
@@ -1174,17 +1198,6 @@ dependencies = [
"generic-array",
]
-[[package]]
-name = "io-uring"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
-dependencies = [
- "bitflags",
- "cfg-if",
- "libc",
-]
-
[[package]]
name = "is_ci"
version = "1.2.0"
@@ -1193,9 +1206,9 @@ checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
[[package]]
name = "is_terminal_polyfill"
-version = "1.70.1"
+version = "1.70.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
[[package]]
name = "itertools"
@@ -1208,25 +1221,25 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.15"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "7ee5b5339afb4c41626dde77b7a611bd4f2c202b897852b4bcf5d03eddc61010"
[[package]]
name = "jobserver"
-version = "0.1.33"
+version = "0.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
"libc",
]
[[package]]
name = "js-sys"
-version = "0.3.77"
+version = "0.3.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8"
dependencies = [
"once_cell",
"wasm-bindgen",
@@ -1246,9 +1259,9 @@ checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7"
[[package]]
name = "libc"
-version = "0.2.175"
+version = "0.2.178"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
[[package]]
name = "libredox"
@@ -1267,28 +1280,21 @@ version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f"
dependencies = [
- "cc",
"pkg-config",
"vcpkg",
]
[[package]]
name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
[[package]]
name = "litemap"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
-
-[[package]]
-name = "litrs"
-version = "0.4.2"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
[[package]]
name = "litrs"
@@ -1298,19 +1304,18 @@ checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
[[package]]
name = "lock_api"
-version = "0.4.13"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
dependencies = [
- "autocfg",
"scopeguard",
]
[[package]]
name = "log"
-version = "0.4.27"
+version = "0.4.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
[[package]]
name = "lzma-rust2"
@@ -1340,9 +1345,9 @@ dependencies = [
[[package]]
name = "memchr"
-version = "2.7.5"
+version = "2.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
[[package]]
name = "memmap2"
@@ -1404,6 +1409,12 @@ dependencies = [
"quote",
]
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
[[package]]
name = "minisign-verify"
version = "0.2.4"
@@ -1420,22 +1431,11 @@ dependencies = [
"simd-adler32",
]
-[[package]]
-name = "mio"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
-dependencies = [
- "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.59.0",
-]
-
[[package]]
name = "moxcms"
-version = "0.7.5"
+version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddd32fa8935aeadb8a8a6b6b351e40225570a37c43de67690383d87ef170cd08"
+checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97"
dependencies = [
"num-traits",
"pxfm",
@@ -1462,13 +1462,23 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
[[package]]
name = "nu-ansi-term"
-version = "0.50.1"
+version = "0.50.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
]
[[package]]
@@ -1524,11 +1534,24 @@ version = "4.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52"
+[[package]]
+name = "papergrid"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6978128c8b51d8f4080631ceb2302ab51e32cc6e8615f735ee2f83fd269ae3f1"
+dependencies = [
+ "ansi-str",
+ "ansitok",
+ "bytecount",
+ "fnv",
+ "unicode-width 0.2.2",
+]
+
[[package]]
name = "parking_lot"
-version = "0.12.4"
+version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
dependencies = [
"lock_api",
"parking_lot_core",
@@ -1536,15 +1559,15 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.11"
+version = "0.9.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
- "windows-targets 0.52.6",
+ "windows-link 0.2.1",
]
[[package]]
@@ -1563,15 +1586,6 @@ version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
-[[package]]
-name = "phf"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
-dependencies = [
- "phf_shared 0.11.3",
-]
-
[[package]]
name = "phf"
version = "0.12.1"
@@ -1579,27 +1593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7"
dependencies = [
"phf_macros",
- "phf_shared 0.12.1",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
-dependencies = [
- "phf_generator 0.11.3",
- "phf_shared 0.11.3",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
-dependencies = [
- "phf_shared 0.11.3",
- "rand 0.8.5",
+ "phf_shared",
]
[[package]]
@@ -1609,7 +1603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b"
dependencies = [
"fastrand",
- "phf_shared 0.12.1",
+ "phf_shared",
]
[[package]]
@@ -1618,23 +1612,13 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d713258393a82f091ead52047ca779d37e5766226d009de21696c4e667044368"
dependencies = [
- "phf_generator 0.12.1",
- "phf_shared 0.12.1",
+ "phf_generator",
+ "phf_shared",
"proc-macro2",
"quote",
"syn",
]
-[[package]]
-name = "phf_shared"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
-dependencies = [
- "siphasher",
- "uncased",
-]
-
[[package]]
name = "phf_shared"
version = "0.12.1"
@@ -1689,9 +1673,9 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
[[package]]
name = "potential_utf"
-version = "0.1.2"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
dependencies = [
"zerovec",
]
@@ -1726,29 +1710,51 @@ dependencies = [
"toml_edit 0.22.27",
]
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
dependencies = [
"unicode-ident",
]
[[package]]
name = "pxfm"
-version = "0.1.23"
+version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55f4fedc84ed39cb7a489322318976425e42a147e2be79d8f878e2884f94e84"
+checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8"
dependencies = [
"num-traits",
]
[[package]]
name = "quote"
-version = "1.0.40"
+version = "1.0.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
dependencies = [
"proc-macro2",
]
@@ -1765,15 +1771,6 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "rand_core 0.6.4",
-]
-
[[package]]
name = "rand"
version = "0.9.2"
@@ -1781,7 +1778,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
dependencies = [
"rand_chacha",
- "rand_core 0.9.3",
+ "rand_core",
]
[[package]]
@@ -1791,22 +1788,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
dependencies = [
"ppv-lite86",
- "rand_core 0.9.3",
+ "rand_core",
]
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-
[[package]]
name = "rand_core"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
]
[[package]]
@@ -1840,9 +1831,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.11.2"
+version = "1.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
dependencies = [
"aho-corasick",
"memchr",
@@ -1852,9 +1843,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.10"
+version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
dependencies = [
"aho-corasick",
"memchr",
@@ -1863,9 +1854,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.6"
+version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
[[package]]
name = "ring"
@@ -1881,32 +1872,6 @@ dependencies = [
"windows-sys 0.52.0",
]
-[[package]]
-name = "rusqlite"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f"
-dependencies = [
- "bitflags",
- "fallible-iterator",
- "fallible-streaming-iterator",
- "hashlink",
- "libsqlite3-sys",
- "rusqlite-macros",
- "smallvec",
-]
-
-[[package]]
-name = "rusqlite-macros"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfb91de75df4c93dc85781b3bc7e5d5ce3c2de9eb23dc7c4e3b82ae48b22ef8"
-dependencies = [
- "fallible-iterator",
- "litrs 0.4.2",
- "sqlite3-parser",
-]
-
[[package]]
name = "rustc-demangle"
version = "0.1.26"
@@ -1921,22 +1886,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustix"
-version = "1.0.8"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
dependencies = [
"bitflags",
"errno",
"libc",
"linux-raw-sys",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
]
[[package]]
name = "rustls"
-version = "0.23.31"
+version = "0.23.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
+checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
dependencies = [
"log",
"once_cell",
@@ -1947,29 +1912,20 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
-]
-
[[package]]
name = "rustls-pki-types"
-version = "1.12.0"
+version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282"
dependencies = [
"zeroize",
]
[[package]]
name = "rustls-webpki"
-version = "0.103.4"
+version = "0.103.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
dependencies = [
"ring",
"rustls-pki-types",
@@ -1984,9 +1940,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
[[package]]
name = "ryu"
-version = "1.0.20"
+version = "1.0.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "62049b2877bf12821e8f9ad256ee38fdc31db7387ec2d3b3f403024de2034aea"
[[package]]
name = "scc"
@@ -2037,9 +1993,9 @@ checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
[[package]]
name = "serde"
-version = "1.0.225"
+version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6c24dee235d0da097043389623fb913daddf92c76e9f5a1db88607a0bcbd1d"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
dependencies = [
"serde_core",
"serde_derive",
@@ -2047,18 +2003,18 @@ dependencies = [
[[package]]
name = "serde_core"
-version = "1.0.225"
+version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "659356f9a0cb1e529b24c01e43ad2bdf520ec4ceaf83047b83ddcc2251f96383"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.225"
+version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea936adf78b1f766949a4977b91d2f5595825bd6ec079aa9543ad2685fc4516"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
dependencies = [
"proc-macro2",
"quote",
@@ -2067,9 +2023,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.145"
+version = "1.0.146"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+checksum = "217ca874ae0207aac254aa02c957ded05585a90892cc8d87f9e5fa49669dadd8"
dependencies = [
"indexmap",
"itoa",
@@ -2081,9 +2037,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
+checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
dependencies = [
"serde_core",
]
@@ -2123,7 +2079,7 @@ dependencies = [
"bzip2",
"cbc",
"crc32fast",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
"js-sys",
"lzma-rust2",
"ppmd-rust",
@@ -2170,9 +2126,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
[[package]]
name = "simd-adler32"
-version = "0.3.7"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
[[package]]
name = "siphasher"
@@ -2198,22 +2154,25 @@ version = "0.8.1"
dependencies = [
"clap",
"indicatif",
+ "miette",
"minisign-verify",
"nu-ansi-term",
"once_cell",
- "rand 0.9.2",
+ "rand",
"rayon",
"regex",
- "rusqlite",
"semver",
"serde",
"serde_json",
"soar-config",
"soar-core",
+ "soar-db",
"soar-dl",
"soar-package",
"soar-registry",
"soar-utils",
+ "tabled",
+ "terminal_size",
"tokio",
"toml",
"tracing",
@@ -2231,7 +2190,7 @@ dependencies = [
"soar-utils",
"thiserror 2.0.17",
"toml",
- "toml_edit 0.23.7",
+ "toml_edit 0.23.10+spec-1.0.0",
"tracing",
]
@@ -2239,16 +2198,17 @@ dependencies = [
name = "soar-core"
version = "0.8.1"
dependencies = [
- "include_dir",
+ "chrono",
+ "diesel",
+ "miette",
"nix",
"regex",
- "rusqlite",
"serde",
"serde_json",
"soar-config",
+ "soar-db",
"soar-dl",
"soar-package",
- "soar-registry",
"soar-utils",
"thiserror 2.0.17",
"toml",
@@ -2262,8 +2222,12 @@ version = "0.1.0"
dependencies = [
"diesel",
"diesel_migrations",
+ "miette",
+ "regex",
"serde",
"serde_json",
+ "soar-registry",
+ "thiserror 2.0.17",
]
[[package]]
@@ -2320,9 +2284,11 @@ name = "soar-utils"
version = "0.1.0"
dependencies = [
"blake3",
+ "miette",
"nix",
"serial_test",
"tempfile",
+ "thiserror 2.0.17",
]
[[package]]
@@ -2343,24 +2309,6 @@ dependencies = [
"web-sys",
]
-[[package]]
-name = "sqlite3-parser"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44b0cfa2d88bd3288931e1af41f1e8427199458c894bed44e579e0ffd6ceb74b"
-dependencies = [
- "bitflags",
- "cc",
- "fallible-iterator",
- "indexmap",
- "log",
- "memchr",
- "phf 0.11.3",
- "phf_codegen",
- "phf_shared 0.11.3",
- "uncased",
-]
-
[[package]]
name = "squishy"
version = "0.3.2"
@@ -2375,9 +2323,9 @@ dependencies = [
[[package]]
name = "stable_deref_trait"
-version = "1.2.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
[[package]]
name = "strsim"
@@ -2435,9 +2383,9 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2"
[[package]]
name = "syn"
-version = "2.0.106"
+version = "2.0.111"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
dependencies = [
"proc-macro2",
"quote",
@@ -2455,6 +2403,32 @@ dependencies = [
"syn",
]
+[[package]]
+name = "tabled"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e39a2ee1fbcd360805a771e1b300f78cc88fec7b8d3e2f71cd37bbf23e725c7d"
+dependencies = [
+ "ansi-str",
+ "ansitok",
+ "papergrid",
+ "tabled_derive",
+ "testing_table",
+]
+
+[[package]]
+name = "tabled_derive"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea5d1b13ca6cff1f9231ffd62f15eefd72543dab5e468735f1a456728a02846"
+dependencies = [
+ "heck",
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "tap"
version = "1.0.1"
@@ -2474,15 +2448,15 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.22.0"
+version = "3.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
dependencies = [
"fastrand",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
"once_cell",
"rustix",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
]
[[package]]
@@ -2495,6 +2469,16 @@ dependencies = [
"windows-sys 0.60.2",
]
+[[package]]
+name = "testing_table"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f8daae29995a24f65619e19d8d31dea5b389f3d853d8bf297bbf607cd0014cc"
+dependencies = [
+ "ansitok",
+ "unicode-width 0.2.2",
+]
+
[[package]]
name = "textwrap"
version = "0.16.2"
@@ -2502,7 +2486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
dependencies = [
"unicode-linebreak",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.2",
]
[[package]]
@@ -2556,9 +2540,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.41"
+version = "0.3.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
dependencies = [
"deranged",
"itoa",
@@ -2571,15 +2555,15 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.4"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
[[package]]
name = "time-macros"
-version = "0.2.22"
+version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
dependencies = [
"num-conv",
"time-core",
@@ -2587,9 +2571,9 @@ dependencies = [
[[package]]
name = "tinystr"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
dependencies = [
"displaydoc",
"zerovec",
@@ -2597,24 +2581,19 @@ dependencies = [
[[package]]
name = "tokio"
-version = "1.47.1"
+version = "1.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
dependencies = [
- "backtrace",
- "io-uring",
- "libc",
- "mio",
"pin-project-lite",
- "slab",
"tokio-macros",
]
[[package]]
name = "tokio-macros"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
dependencies = [
"proc-macro2",
"quote",
@@ -2623,14 +2602,14 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.9.8"
+version = "0.9.10+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
+checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48"
dependencies = [
"indexmap",
"serde_core",
"serde_spanned",
- "toml_datetime 0.7.3",
+ "toml_datetime 0.7.5+spec-1.1.0",
"toml_parser",
"toml_writer",
"winnow",
@@ -2644,9 +2623,9 @@ checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
[[package]]
name = "toml_datetime"
-version = "0.7.3"
+version = "0.7.5+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
dependencies = [
"serde_core",
]
@@ -2664,12 +2643,12 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.23.7"
+version = "0.23.10+spec-1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
+checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
dependencies = [
"indexmap",
- "toml_datetime 0.7.3",
+ "toml_datetime 0.7.5+spec-1.1.0",
"toml_parser",
"toml_writer",
"winnow",
@@ -2677,24 +2656,24 @@ dependencies = [
[[package]]
name = "toml_parser"
-version = "1.0.4"
+version = "1.0.6+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
dependencies = [
"winnow",
]
[[package]]
name = "toml_writer"
-version = "1.0.4"
+version = "1.0.6+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
+checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"
[[package]]
name = "tracing"
-version = "0.1.41"
+version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
dependencies = [
"pin-project-lite",
"tracing-attributes",
@@ -2703,9 +2682,9 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.30"
+version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
dependencies = [
"proc-macro2",
"quote",
@@ -2714,9 +2693,9 @@ dependencies = [
[[package]]
name = "tracing-core"
-version = "0.1.34"
+version = "0.1.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
dependencies = [
"once_cell",
"valuable",
@@ -2734,9 +2713,9 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
-version = "0.3.20"
+version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
+checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
dependencies = [
"matchers",
"nu-ansi-term",
@@ -2757,20 +2736,11 @@ version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
-[[package]]
-name = "uncased"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697"
-dependencies = [
- "version_check",
-]
-
[[package]]
name = "unicode-ident"
-version = "1.0.19"
+version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
[[package]]
name = "unicode-linebreak"
@@ -2792,9 +2762,9 @@ checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "unicode-width"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
[[package]]
name = "unit-prefix"
@@ -2810,9 +2780,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "ureq"
-version = "3.1.2"
+version = "3.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99ba1025f18a4a3fc3e9b48c868e9beb4f24f4b4b1a325bada26bd4119f46537"
+checksum = "d39cb1dbab692d82a977c0392ffac19e188bd9186a9f32806f0aaa859d75585a"
dependencies = [
"base64",
"cookie_store",
@@ -2820,7 +2790,6 @@ dependencies = [
"log",
"percent-encoding",
"rustls",
- "rustls-pemfile",
"rustls-pki-types",
"serde",
"serde_json",
@@ -2889,6 +2858,16 @@ version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+[[package]]
+name = "vte"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "231fdcd7ef3037e8330d8e17e61011a2c244126acc0a982f4040ac3f9f0bc077"
+dependencies = [
+ "arrayvec",
+ "memchr",
+]
+
[[package]]
name = "wasi"
version = "0.11.1+wasi-snapshot-preview1"
@@ -2896,12 +2875,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
]
[[package]]
@@ -2916,35 +2895,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
dependencies = [
"cfg-if",
"once_cell",
"rustversion",
"wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c"
dependencies = [
"cfg-if",
"js-sys",
@@ -2955,9 +2921,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2965,31 +2931,31 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
dependencies = [
+ "bumpalo",
"proc-macro2",
"quote",
"syn",
- "wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
dependencies = [
"unicode-ident",
]
[[package]]
name = "web-sys"
-version = "0.3.77"
+version = "0.3.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -3007,13 +2973,48 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "1.0.2"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
+checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
dependencies = [
"rustls-pki-types",
]
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link 0.2.1",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "windows-link"
version = "0.1.3"
@@ -3021,19 +3022,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
[[package]]
-name = "windows-sys"
-version = "0.52.0"
+name = "windows-link"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
dependencies = [
- "windows-targets 0.52.6",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link 0.2.1",
]
[[package]]
name = "windows-sys"
-version = "0.59.0"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
"windows-targets 0.52.6",
]
@@ -3047,6 +3063,15 @@ dependencies = [
"windows-targets 0.53.3",
]
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
[[package]]
name = "windows-targets"
version = "0.52.6"
@@ -3069,7 +3094,7 @@ version = "0.53.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
"windows_aarch64_gnullvm 0.53.0",
"windows_aarch64_msvc 0.53.0",
"windows_i686_gnu 0.53.0",
@@ -3178,27 +3203,24 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
[[package]]
name = "winnow"
-version = "0.7.13"
+version = "0.7.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
dependencies = [
"memchr",
]
[[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
+name = "wit-bindgen"
+version = "0.46.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags",
-]
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
[[package]]
name = "writeable"
-version = "0.6.1"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
[[package]]
name = "wyz"
@@ -3230,11 +3252,10 @@ dependencies = [
[[package]]
name = "yoke"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
dependencies = [
- "serde",
"stable_deref_trait",
"yoke-derive",
"zerofrom",
@@ -3242,9 +3263,9 @@ dependencies = [
[[package]]
name = "yoke-derive"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
dependencies = [
"proc-macro2",
"quote",
@@ -3295,9 +3316,9 @@ dependencies = [
[[package]]
name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
dependencies = [
"zeroize_derive",
]
@@ -3315,9 +3336,9 @@ dependencies = [
[[package]]
name = "zerotrie"
-version = "0.2.2"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
dependencies = [
"displaydoc",
"yoke",
@@ -3326,9 +3347,9 @@ dependencies = [
[[package]]
name = "zerovec"
-version = "0.11.4"
+version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
dependencies = [
"yoke",
"zerofrom",
@@ -3337,9 +3358,9 @@ dependencies = [
[[package]]
name = "zerovec-derive"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
dependencies = [
"proc-macro2",
"quote",
@@ -3356,7 +3377,7 @@ dependencies = [
"arbitrary",
"constant_time_eq",
"crc32fast",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
"hmac",
"indexmap",
"memchr",
diff --git a/Cargo.toml b/Cargo.toml
index 3508ddd3..95b2fc0d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,14 +1,14 @@
[workspace]
resolver = "2"
members = [
+ "crates/soar-cli",
"crates/soar-config",
+ "crates/soar-core",
"crates/soar-db",
"crates/soar-dl",
"crates/soar-package",
"crates/soar-registry",
"crates/soar-utils",
- "soar-cli",
- "soar-core"
]
[workspace.package]
@@ -22,44 +22,46 @@ categories = ["command-line-utilities"]
[workspace.dependencies]
compak = "0.1.0"
-diesel = { version = "2.3.2", features = [
+diesel = { version = "2.3.5", features = [
"64-column-tables",
"returning_clauses_for_sqlite_3_35",
+ "serde_json",
"sqlite"
] }
-diesel_migrations = { version = "2.3.0", features = ["sqlite"] }
+diesel_migrations = { version = "2.3.1", features = ["sqlite"] }
documented = "0.9.2"
fast-glob = "1.0.0"
miette = { version = "7.6.0", features = ["fancy"] }
percent-encoding = "2.3.2"
rayon = "1.11.0"
-regex = { version = "1.11.2", default-features = false, features = [
+regex = { version = "1.12.2", default-features = false, features = [
"std",
"unicode-case",
"unicode-perl"
] }
-rusqlite = { version = "0.37.0", features = ["bundled", "rusqlite-macros"] }
-serde = { version = "1.0.225", features = ["derive"] }
-serde_json = { version = "1.0.145", features = ["indexmap"] }
+serde = { version = "1.0.228", features = ["derive"] }
+serde_json = { version = "1.0.146", features = ["indexmap"] }
serial_test = "3.2.0"
+soar-cli = { path = "crates/soar-cli" }
soar-config = { path = "crates/soar-config" }
-soar-core = { path = "soar-core" }
+soar-core = { path = "crates/soar-core" }
+soar-db = { path = "crates/soar-db" }
soar-dl = { path = "crates/soar-dl" }
soar-package = { path = "crates/soar-package" }
soar-registry = { path = "crates/soar-registry" }
soar-utils = { path = "crates/soar-utils" }
-tempfile = "3.10.1"
+tempfile = "3.23.0"
thiserror = "2.0.17"
-toml = "0.9.8"
-toml_edit = "0.23.7"
-tracing = { version = "0.1.41", default-features = false }
-ureq = { version = "3.1.2", features = ["json"] }
+toml = "0.9.10"
+toml_edit = "0.23.10"
+tracing = { version = "0.1.44", default-features = false }
+ureq = { version = "3.1.4", features = ["json"] }
url = "2.5.7"
xattr = "1.6.1"
zstd = "0.13.3"
[profile.release]
-opt-level = 3
+opt-level = "z"
strip = true
lto = true
panic = "abort"
diff --git a/README.md b/README.md
index 9577c257..173c7788 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,6 @@
[doc-url]: https://soar.qaidvoid.dev
[license-shield]: https://img.shields.io/github/license/pkgforge/soar.svg
[license-url]: https://github.com/pkgforge/soar/blob/main/LICENSE
-[packages-shield]: https://img.shields.io/badge/dynamic/json?url=https://raw.githubusercontent.com/pkgforge/metadata/refs/heads/main/TOTAL_INSTALLABLE.json&query=$[6].total&label=packages&labelColor=grey&style=flat&link=https://pkgs.pkgforge.dev
-[packages-url]: https://pkgs.pkgforge.dev
[![Crates.io][crates-shield]][crates-url]
[![Discord][discord-shield]][discord-url]
@@ -29,6 +27,16 @@
Supports Static Binaries, AppImages, and other Portable formats on any *Unix-based distro
+## 📦 What is Soar?
+
+Soar is a **package manager** - it doesn't build or host packages itself. Instead, it consumes package metadata from repositories and handles downloading, installing, and managing packages on your system.
+
+**How it works:**
+- **Repositories** (like [pkgforge](https://docs.pkgforge.dev/repositories)) build and host packages, providing metadata in a [standard format](https://docs.pkgforge.dev/repositories/bincache/metadata)
+- **Soar** fetches this metadata, lets you search/install packages, and manages your local installations
+- **You** can use the default pkgforge repositories, add third-party ones, or even create your own
+
+This separation means Soar works with any compatible repository - it's not tied to a specific package source.
## 🪄 Quickstart
@@ -37,10 +45,10 @@
> - The [install script](https://github.com/pkgforge/soar/blob/main/install.sh) does this & more automatically for you.
```bash
-❯ cURL
+# cURL
curl -fsSL "https://raw.githubusercontent.com/pkgforge/soar/main/install.sh" | sh
-❯ wget
+# wget
wget -qO- "https://raw.githubusercontent.com/pkgforge/soar/main/install.sh" | sh
```
@@ -48,31 +56,32 @@ wget -qO- "https://raw.githubusercontent.com/pkgforge/soar/main/install.sh" | sh
> - Please read & verify what's inside the script before running it
> - The script is also available through https://soar.qaidvoid.dev/install.sh & https://soar.pkgforge.dev/install.sh
> - Additionally, if you want to customize your installation, please read the docs @ https://soar.qaidvoid.dev/installation.html
-> - For, extra Guide & Information on infra backends & adding more repos: https://docs.pkgforge.dev
-> - Next, Check [Configuration](https://soar.qaidvoid.dev/configuration) & [Usage](https://soar.qaidvoid.dev/package-management)
+> - For extra guide & information on infra backends & adding more repos: https://docs.pkgforge.dev
+> - Next, check [Configuration](https://soar.qaidvoid.dev/configuration) & [Usage](https://soar.qaidvoid.dev/package-management)
## 🌟 Key Features
| Feature | Description |
|:--:|:--|
-| **Universal** | Single binary, no dependencies, works on any Unix-like system with no superuser privileges. |
-| **Portable Formats** | Install static [static binaries](https://docs.pkgforge.dev/formats/binaries/static), [AppImages](https://docs.pkgforge.dev/formats/packages/appimage), and other [self-contained archives](https://docs.pkgforge.dev/formats/packages/archive) with ease. |
-| **System Integration** | Automatically adds desktop entries and system integration for a native feel. |
-| **Flexible Repository System** | Use [official](https://docs.pkgforge.dev/repositories), or [custom](https://soar.qaidvoid.dev/configuration#custom-repository-support) repositories with simple metadata. No special build format is needed. |
-| **Security First** | Enforces security through checksums and signing verification for package installations. |
-| **Fast Package Operations** | Efficient package searching, installation, and management with minimal overhead. |
+| **Universal** | Single binary, no dependencies, works on any Unix-like system without superuser privileges. |
+| **Portable Formats** | Install [static binaries](https://docs.pkgforge.dev/formats/binaries/static), [AppImages](https://docs.pkgforge.dev/formats/packages/appimage), and other [self-contained archives](https://docs.pkgforge.dev/formats/packages/archive) with ease. |
+| **System Integration** | Automatically adds desktop entries and icons for a native feel. |
+| **Repository Agnostic** | Works with any repository that provides compatible metadata. Use [official pkgforge repos](https://docs.pkgforge.dev/repositories), third-party sources, or [create your own](https://soar.qaidvoid.dev/configuration#custom-repository-support). |
+| **Security First** | Enforces security through checksums and signature verification for package installations. |
+| **Fast & Efficient** | Minimal overhead with parallel downloads and efficient package operations. |
+
+## 📀 Default Repositories
-### 📀 Default Hosts
+Soar comes pre-configured with `pkgforge` repositories. These are the default package sources, but you can add or replace them with any compatible repository.
> **Note:** _✅ --> Enabled by Default_
-| 🏆 Tier | 🤖 Host | 📦 Repos | ℹ️ Status |
+| 🏆 Tier | 🤖 Architecture | 📦 Repositories | ℹ️ Status |
|---------|---------|---------------------------|-------------------|
-| **Tier 1** | **`aarch64-Linux`** | [bincache✅](https://docs.pkgforge.dev/repositories/bincache), [pkgcache✅](https://docs.pkgforge.dev/repositories/pkgcache), [pkgforge-cargo✅](https://docs.pkgforge.dev/repositories/external/pkgforge-cargo), [pkgforge-go✅](https://docs.pkgforge.dev/repositories/external/pkgforge-go), [cargo-bins](https://docs.pkgforge.dev/repositories/external/cargo-bins), [appimage-github-io](https://docs.pkgforge.dev/repositories/external/appimage-github-io), [appimagehub](https://docs.pkgforge.dev/repositories/external/appimagehub) | Almost as many packages as `x86_64-Linux`, fully supported |
-| **Tier 1** | **`x86_64-Linux`** | [bincache✅](https://docs.pkgforge.dev/repositories/bincache), [pkgcache✅](https://docs.pkgforge.dev/repositories/pkgcache), [pkgforge-cargo✅](https://docs.pkgforge.dev/repositories/external/pkgforge-cargo), [pkgforge-go✅](https://docs.pkgforge.dev/repositories/external/pkgforge-go), [cargo-bins](https://docs.pkgforge.dev/repositories/external/cargo-bins), [ivan-hc-am](https://docs.pkgforge.dev/repositories/external/ivan-hc-am), [appimage-github-io](https://docs.pkgforge.dev/repositories/external/appimage-github-io), [appimagehub](https://docs.pkgforge.dev/repositories/external/appimagehub) | Primary target & most supported |
-| **Tier 2** | **`loongarch64-Linux`** | [pkgforge-cargo✅](https://docs.pkgforge.dev/repositories/external/pkgforge-cargo), [pkgforge-go✅](https://docs.pkgforge.dev/repositories/external/pkgforge-go) | Experimental & least supported |
-| **Tier 2** | **`riscv64-Linux`** | [bincache✅](https://docs.pkgforge.dev/repositories/bincache), [pkgcache✅](https://docs.pkgforge.dev/repositories/pkgcache), [pkgforge-cargo✅](https://docs.pkgforge.dev/repositories/external/pkgforge-cargo), [pkgforge-go✅](https://docs.pkgforge.dev/repositories/external/pkgforge-go) | Experimental, with [gradual progress](https://github.com/pkgforge/soarpkgs/issues/198) |
+| **Tier 1** | **`aarch64-Linux`** | [bincache✅](https://docs.pkgforge.dev/repositories/bincache), [pkgcache✅](https://docs.pkgforge.dev/repositories/pkgcache) | Almost as many packages as `x86_64-Linux`, fully supported |
+| **Tier 1** | **`x86_64-Linux`** | [bincache✅](https://docs.pkgforge.dev/repositories/bincache), [pkgcache✅](https://docs.pkgforge.dev/repositories/pkgcache) | Primary target & most supported |
+| **Tier 2** | **`riscv64-Linux`** | [bincache✅](https://docs.pkgforge.dev/repositories/bincache), [pkgcache✅](https://docs.pkgforge.dev/repositories/pkgcache) | Experimental, with [gradual progress](https://github.com/pkgforge/soarpkgs/issues/198) |
## 🤝 Contributing
diff --git a/soar-cli/Cargo.toml b/crates/soar-cli/Cargo.toml
similarity index 70%
rename from soar-cli/Cargo.toml
rename to crates/soar-cli/Cargo.toml
index 25732dba..21f72237 100644
--- a/soar-cli/Cargo.toml
+++ b/crates/soar-cli/Cargo.toml
@@ -19,26 +19,29 @@ path = "src/main.rs"
self = []
[dependencies]
-clap = { version = "4.5.47", features = ["cargo", "derive"] }
-indicatif = "0.18.0"
+clap = { version = "4.5.53", features = ["cargo", "derive"] }
+indicatif = "0.18.3"
+miette = { workspace = true }
minisign-verify = "0.2.4"
-nu-ansi-term = "0.50.1"
+nu-ansi-term = "0.50.3"
once_cell = "1.21.3"
rand = "0.9.2"
rayon = { workspace = true }
regex = { workspace = true }
-rusqlite = { workspace = true }
semver = "1.0.27"
serde = { workspace = true }
serde_json = { workspace = true }
soar-config = { workspace = true }
soar-core = { workspace = true }
+soar-db = { workspace = true }
soar-dl = { workspace = true }
soar-package = { workspace = true }
soar-registry = { workspace = true }
soar-utils = { workspace = true }
-tokio = { version = "1.47.1", features = ["macros", "rt-multi-thread", "sync", "time"] }
-toml = "0.9.6"
+tabled = { version = "0.20", features = ["ansi"] }
+terminal_size = "0.4"
+tokio = { version = "1.48.0", features = ["macros", "rt-multi-thread", "sync", "time"] }
+toml = "0.9.10"
tracing = { workspace = true }
-tracing-subscriber = { version = "0.3.20", default-features = false, features = ["env-filter", "fmt", "json", "nu-ansi-term"] }
+tracing-subscriber = { version = "0.3.22", default-features = false, features = ["env-filter", "fmt", "json", "nu-ansi-term"] }
ureq = { workspace = true }
diff --git a/soar-cli/build.rs b/crates/soar-cli/build.rs
similarity index 100%
rename from soar-cli/build.rs
rename to crates/soar-cli/build.rs
diff --git a/soar-cli/src/cli.rs b/crates/soar-cli/src/cli.rs
similarity index 100%
rename from soar-cli/src/cli.rs
rename to crates/soar-cli/src/cli.rs
diff --git a/soar-cli/src/download.rs b/crates/soar-cli/src/download.rs
similarity index 86%
rename from soar-cli/src/download.rs
rename to crates/soar-cli/src/download.rs
index 3bcf3847..de92cb08 100644
--- a/soar-cli/src/download.rs
+++ b/crates/soar-cli/src/download.rs
@@ -3,11 +3,8 @@ use std::{sync::Arc, time::Duration};
use indicatif::HumanBytes;
use regex::Regex;
use soar_config::config::get_config;
-use soar_core::{
- database::{models::Package, packages::PackageQueryBuilder},
- package::query::PackageQuery,
- SoarResult,
-};
+use soar_core::{database::models::Package, package::query::PackageQuery, SoarResult};
+use soar_db::repository::metadata::MetadataRepository;
use soar_dl::{
download::Download,
error::DownloadError,
@@ -149,11 +146,50 @@ pub async fn handle_direct_downloads(
None => {
// if it's not a url, try to parse it as package
let state = AppState::new();
- let repo_db = state.repo_db().await?;
+ let metadata_mgr = state.metadata_manager().await?;
let query = PackageQuery::try_from(link.as_str())?;
- let builder = PackageQueryBuilder::new(repo_db.clone());
- let builder = query.apply_filters(builder);
- let packages: Vec = builder.load()?.items;
+
+ // Query packages across all repos
+ let packages: Vec = if let Some(ref repo_name) = query.repo_name {
+ metadata_mgr
+ .query_repo(repo_name, |conn| {
+ MetadataRepository::find_filtered(
+ conn,
+ query.name.as_deref(),
+ query.pkg_id.as_deref(),
+ query.version.as_deref(),
+ None,
+ None,
+ )
+ })?
+ .unwrap_or_default()
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.clone();
+ pkg
+ })
+ .collect()
+ } else {
+ metadata_mgr.query_all_flat(|repo_name, conn| {
+ let pkgs = MetadataRepository::find_filtered(
+ conn,
+ query.name.as_deref(),
+ query.pkg_id.as_deref(),
+ query.version.as_deref(),
+ None,
+ None,
+ )?;
+ Ok(pkgs
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.to_string();
+ pkg
+ })
+ .collect())
+ })?
+ };
if packages.is_empty() {
error!("Invalid download resource '{}'", link);
diff --git a/crates/soar-cli/src/health.rs b/crates/soar-cli/src/health.rs
new file mode 100644
index 00000000..3795d3ce
--- /dev/null
+++ b/crates/soar-cli/src/health.rs
@@ -0,0 +1,169 @@
+use std::{cell::RefCell, env, path::Path, rc::Rc};
+
+use nu_ansi_term::Color::{Blue, Cyan, Green, Red, Yellow};
+use soar_config::config::get_config;
+use soar_core::{package::remove::PackageRemover, SoarResult};
+use soar_db::repository::core::CoreRepository;
+use soar_utils::{
+ error::FileSystemResult,
+ fs::walk_dir,
+ path::{desktop_dir, icons_dir},
+};
+use tabled::{
+ builder::Builder,
+ settings::{peaker::PriorityMax, themes::BorderCorrection, Panel, Style, Width},
+};
+use tracing::info;
+
+use crate::{
+ state::AppState,
+ utils::{icon_or, term_width, Colored, Icons},
+};
+
+pub async fn display_health() -> SoarResult<()> {
+ let path_env = env::var("PATH")?;
+ let bin_path = get_config().get_bin_path()?;
+ let path_ok = path_env.split(':').any(|p| Path::new(p) == bin_path);
+
+ let broken_pkgs = get_broken_packages().await?;
+ let broken_syms = get_broken_symlinks()?;
+
+ let mut builder = Builder::new();
+
+ let path_status = if path_ok {
+ format!("{} Configured", Colored(Green, icon_or(Icons::CHECK, "OK")))
+ } else {
+ format!(
+ "{} {} not in PATH",
+ Colored(Yellow, icon_or(Icons::WARNING, "!")),
+ Colored(Blue, bin_path.display())
+ )
+ };
+ builder.push_record(["PATH".to_string(), path_status]);
+
+ let pkg_status = if broken_pkgs.is_empty() {
+ format!("{} None", Colored(Green, icon_or(Icons::CHECK, "OK")))
+ } else {
+ format!(
+ "{} {} found",
+ Colored(Red, icon_or(Icons::CROSS, "!")),
+ Colored(Red, broken_pkgs.len())
+ )
+ };
+ builder.push_record(["Broken Packages".to_string(), pkg_status]);
+
+ let sym_status = if broken_syms.is_empty() {
+ format!("{} None", Colored(Green, icon_or(Icons::CHECK, "OK")))
+ } else {
+ format!(
+ "{} {} found",
+ Colored(Red, icon_or(Icons::CROSS, "!")),
+ Colored(Red, broken_syms.len())
+ )
+ };
+ builder.push_record(["Broken Symlinks".to_string(), sym_status]);
+
+ let table = builder
+ .build()
+ .with(Panel::header("System Health Check"))
+ .with(Style::rounded())
+ .with(BorderCorrection {})
+ .with(Width::wrap(term_width()).priority(PriorityMax::default()))
+ .to_string();
+
+ info!("\n{table}");
+
+ if !broken_pkgs.is_empty() {
+ info!("\nBroken packages:");
+ for pkg in &broken_pkgs {
+ info!(
+ " {} {}#{}: {}",
+ Icons::ARROW,
+ Colored(Blue, &pkg.0),
+ Colored(Cyan, &pkg.1),
+ Colored(Yellow, &pkg.2)
+ );
+ }
+ info!("Run {} to remove", Colored(Green, "soar clean --broken"));
+ }
+
+ if !broken_syms.is_empty() {
+ info!("\nBroken symlinks:");
+ for path in &broken_syms {
+ info!(" {} {}", Icons::ARROW, Colored(Yellow, path.display()));
+ }
+ info!(
+ "Run {} to remove",
+ Colored(Green, "soar clean --broken-symlinks")
+ );
+ }
+
+ Ok(())
+}
+
+async fn get_broken_packages() -> SoarResult> {
+ let state = AppState::new();
+ let diesel_db = state.diesel_core_db()?;
+
+ let broken_packages = diesel_db.with_conn(CoreRepository::list_broken)?;
+
+ Ok(broken_packages
+ .into_iter()
+ .map(|p| (p.pkg_name, p.pkg_id, p.installed_path))
+ .collect())
+}
+
+fn get_broken_symlinks() -> SoarResult> {
+ let broken_symlinks = Rc::new(RefCell::new(Vec::new()));
+
+ let broken_symlinks_clone = Rc::clone(&broken_symlinks);
+ let mut collect_action = |path: &Path| -> FileSystemResult<()> {
+ if !path.exists() {
+ broken_symlinks_clone.borrow_mut().push(path.to_path_buf());
+ }
+ Ok(())
+ };
+
+ let mut soar_files_action = |path: &Path| -> FileSystemResult<()> {
+ if let Some(filename) = path.file_stem().and_then(|s| s.to_str()) {
+ if filename.ends_with("-soar") && !path.exists() {
+ broken_symlinks_clone.borrow_mut().push(path.to_path_buf());
+ }
+ }
+ Ok(())
+ };
+
+ walk_dir(&get_config().get_bin_path()?, &mut collect_action)?;
+ walk_dir(desktop_dir(), &mut soar_files_action)?;
+ walk_dir(icons_dir(), &mut soar_files_action)?;
+
+ Ok(Rc::try_unwrap(broken_symlinks)
+ .unwrap_or_else(|rc| rc.borrow().clone().into())
+ .into_inner())
+}
+
+pub async fn remove_broken_packages() -> SoarResult<()> {
+ let state = AppState::new();
+ let diesel_db = state.diesel_core_db()?.clone();
+
+ let broken_packages = diesel_db.with_conn(CoreRepository::list_broken)?;
+
+ if broken_packages.is_empty() {
+ info!("No broken packages found.");
+ return Ok(());
+ }
+
+ for package in broken_packages {
+ let pkg_name = package.pkg_name.clone();
+ let pkg_id = package.pkg_id.clone();
+ let installed_pkg = package.into();
+ let remover = PackageRemover::new(installed_pkg, diesel_db.clone()).await;
+ remover.remove().await?;
+
+ info!("Removed {}#{}", pkg_name, pkg_id);
+ }
+
+ info!("Removed all broken packages");
+
+ Ok(())
+}
diff --git a/soar-cli/src/inspect.rs b/crates/soar-cli/src/inspect.rs
similarity index 56%
rename from soar-cli/src/inspect.rs
rename to crates/soar-cli/src/inspect.rs
index b2bbce53..4cf2878b 100644
--- a/soar-cli/src/inspect.rs
+++ b/crates/soar-cli/src/inspect.rs
@@ -1,28 +1,24 @@
-use std::{
- fmt::Display,
- fs,
- path::PathBuf,
- sync::{Arc, Mutex},
-};
+use std::{fmt::Display, fs, path::PathBuf};
use indicatif::HumanBytes;
-use rusqlite::Connection;
use soar_core::{
- database::{
- models::Package,
- packages::{FilterCondition, PackageQueryBuilder, PaginatedResponse},
- },
+ database::{connection::DieselDatabase, models::Package},
error::ErrorContext,
package::query::PackageQuery,
SoarResult,
};
+use soar_db::repository::{
+ core::{CoreRepository, SortDirection},
+ metadata::MetadataRepository,
+};
use soar_dl::http_client::SHARED_AGENT;
use tracing::{error, info};
use ureq::http::header::CONTENT_LENGTH;
use crate::{
+ progress::create_spinner,
state::AppState,
- utils::{interactive_ask, select_package_interactively},
+ utils::{display_settings, interactive_ask, select_package_interactively},
};
pub enum InspectType {
@@ -40,22 +36,22 @@ impl Display for InspectType {
}
fn get_installed_path(
- core_db: &Arc>,
+ diesel_db: &DieselDatabase,
package: &Package,
) -> SoarResult> {
- let installed_pkgs = PackageQueryBuilder::new(core_db.clone())
- .where_and("repo_name", FilterCondition::Eq(package.repo_name.clone()))
- .where_and("pkg_id", FilterCondition::Eq(package.pkg_id.clone()))
- .where_and("pkg_name", FilterCondition::Eq(package.pkg_name.clone()))
- .where_and("version", FilterCondition::Eq(package.version.clone()))
- .limit(1)
- .load_installed()?
- .items;
-
- if !installed_pkgs.is_empty() {
- let pkg = installed_pkgs.first().unwrap();
+ let installed_pkg = diesel_db.with_conn(|conn| {
+ CoreRepository::find_exact(
+ conn,
+ &package.repo_name,
+ &package.pkg_name,
+ &package.pkg_id,
+ &package.version,
+ )
+ })?;
+
+ if let Some(pkg) = installed_pkg {
if pkg.is_installed {
- return Ok(Some(PathBuf::from(pkg.installed_path.clone())));
+ return Ok(Some(PathBuf::from(pkg.installed_path)));
}
}
Ok(None)
@@ -63,29 +59,63 @@ fn get_installed_path(
pub async fn inspect_log(package: &str, inspect_type: InspectType) -> SoarResult<()> {
let state = AppState::new();
- let core_db = state.core_db()?;
- let repo_db = state.repo_db().await?;
+ let metadata_mgr = state.metadata_manager().await?;
+ let diesel_db = state.diesel_core_db()?;
let query = PackageQuery::try_from(package)?;
- let builder = PackageQueryBuilder::new(repo_db.clone());
- let builder = query.apply_filters(builder);
-
- let packages: PaginatedResponse = builder.load()?;
- if packages.items.is_empty() {
+ let packages: Vec = if let Some(ref repo_name) = query.repo_name {
+ metadata_mgr
+ .query_repo(repo_name, |conn| {
+ MetadataRepository::find_filtered(
+ conn,
+ query.name.as_deref(),
+ query.pkg_id.as_deref(),
+ query.version.as_deref(),
+ None,
+ Some(SortDirection::Asc),
+ )
+ })?
+ .unwrap_or_default()
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.clone();
+ pkg
+ })
+ .collect()
+ } else {
+ metadata_mgr.query_all_flat(|repo_name, conn| {
+ let pkgs = MetadataRepository::find_filtered(
+ conn,
+ query.name.as_deref(),
+ query.pkg_id.as_deref(),
+ query.version.as_deref(),
+ None,
+ Some(SortDirection::Asc),
+ )?;
+ Ok(pkgs
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.to_string();
+ pkg
+ })
+ .collect())
+ })?
+ };
+
+ if packages.is_empty() {
error!("Package {} not found", package);
} else {
- let selected_pkg = if packages.total > 1 {
- &select_package_interactively(
- packages.items,
- &query.name.unwrap_or(package.to_string()),
- )?
- .unwrap()
+ let selected_pkg = if packages.len() > 1 {
+ &select_package_interactively(packages, &query.name.unwrap_or(package.to_string()))?
+ .unwrap()
} else {
- packages.items.first().unwrap()
+ packages.first().unwrap()
};
- if let Some(installed_path) = get_installed_path(core_db, selected_pkg)? {
+ if let Some(installed_path) = get_installed_path(diesel_db, selected_pkg)? {
let file = if matches!(inspect_type, InspectType::BuildLog) {
installed_path.join(format!("{}.log", selected_pkg.pkg_name))
} else {
@@ -132,8 +162,20 @@ pub async fn inspect_log(package: &str, inspect_type: InspectType) -> SoarResult
url
};
+ let settings = display_settings();
+ let spinner = if settings.spinners() {
+ let s = create_spinner(&format!("Fetching build {inspect_type}..."));
+ Some(s)
+ } else {
+ None
+ };
+
let resp = SHARED_AGENT.get(url).call()?;
+ if let Some(ref s) = spinner {
+ s.finish_and_clear();
+ }
+
if !resp.status().is_success() {
error!(
"Error fetching build {inspect_type} from {} [{}]",
diff --git a/soar-cli/src/install.rs b/crates/soar-cli/src/install.rs
similarity index 65%
rename from soar-cli/src/install.rs
rename to crates/soar-cli/src/install.rs
index b1532da2..2793bc36 100644
--- a/soar-cli/src/install.rs
+++ b/crates/soar-cli/src/install.rs
@@ -11,15 +11,11 @@ use std::{
use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
use minisign_verify::{PublicKey, Signature};
-use nu_ansi_term::Color::{Blue, Green};
+use nu_ansi_term::Color::{Blue, Cyan, Green, Magenta, Red, Yellow};
use rand::{distr::Alphanumeric, Rng};
-use rusqlite::Connection;
use soar_config::{config::get_config, utils::default_install_patterns};
use soar_core::{
- database::{
- models::{InstalledPackage, Package},
- packages::{FilterCondition, PackageQueryBuilder, PaginatedResponse},
- },
+ database::{connection::DieselDatabase, models::Package},
error::{ErrorContext, SoarError},
package::{
install::{InstallTarget, PackageInstaller},
@@ -27,9 +23,17 @@ use soar_core::{
},
SoarResult,
};
+use soar_db::repository::{
+ core::{CoreRepository, SortDirection},
+ metadata::MetadataRepository,
+};
use soar_dl::types::Progress;
use soar_package::integrate_package;
use soar_utils::{hash::calculate_checksum, pattern::apply_sig_variants};
+use tabled::{
+ builder::Builder,
+ settings::{themes::BorderCorrection, Panel, Style},
+};
use tokio::sync::Semaphore;
use tracing::{error, info, warn};
@@ -37,8 +41,8 @@ use crate::{
progress::handle_install_progress,
state::AppState,
utils::{
- ask_target_action, has_desktop_integration, mangle_package_symlinks,
- select_package_interactively, Colored,
+ ask_target_action, display_settings, has_desktop_integration, icon_or,
+ mangle_package_symlinks, select_package_interactively, Colored, Icons,
},
};
@@ -68,6 +72,7 @@ pub struct InstallContext {
pub no_verify: bool,
}
+#[allow(clippy::too_many_arguments)]
pub fn create_install_context(
total_packages: usize,
parallel_limit: u32,
@@ -81,8 +86,17 @@ pub fn create_install_context(
) -> InstallContext {
let multi_progress = Arc::new(MultiProgress::new());
let total_progress_bar = multi_progress.add(ProgressBar::new(total_packages as u64));
- total_progress_bar
- .set_style(ProgressStyle::with_template("Installing {pos}/{len} {msg}").unwrap());
+ let settings = display_settings();
+ let style = if settings.icons() {
+ ProgressStyle::with_template(&format!(
+ "{} Installing {{pos}}/{{len}} {{msg}}",
+ Icons::PACKAGE
+ ))
+ .unwrap()
+ } else {
+ ProgressStyle::with_template("Installing {pos}/{len} {msg}").unwrap()
+ };
+ total_progress_bar.set_style(style);
InstallContext {
multi_progress,
@@ -121,10 +135,10 @@ pub async fn install_packages(
no_verify: bool,
) -> SoarResult<()> {
let state = AppState::new();
- let repo_db = state.repo_db().await?;
- let core_db = state.core_db()?;
+ let metadata_mgr = state.metadata_manager().await?;
+ let diesel_db = state.diesel_core_db()?.clone();
- let install_targets = resolve_packages(repo_db.clone(), core_db.clone(), packages, yes, force)?;
+ let install_targets = resolve_packages(&state, metadata_mgr, &diesel_db, packages, yes, force)?;
if install_targets.is_empty() {
info!("No packages to install");
@@ -147,54 +161,147 @@ pub async fn install_packages(
no_verify,
);
- perform_installation(install_context, install_targets, core_db.clone(), no_notes).await
+ perform_installation(install_context, install_targets, diesel_db, no_notes).await
}
fn resolve_packages(
- db: Arc>,
- core_db: Arc>,
+ state: &AppState,
+ metadata_mgr: &soar_core::database::connection::MetadataManager,
+ diesel_db: &DieselDatabase,
packages: &[String],
yes: bool,
force: bool,
) -> SoarResult> {
+ use soar_core::database::models::InstalledPackage;
+
let mut install_targets = Vec::new();
for package in packages {
let mut query = PackageQuery::try_from(package.as_str())?;
- let builder = PackageQueryBuilder::new(db.clone());
if let Some(ref pkg_id) = query.pkg_id {
if pkg_id == "all" {
- let builder = query.apply_filters(builder.clone());
- let packages: PaginatedResponse = builder.load()?;
+ let repo_pkgs: Vec = if let Some(ref repo_name) = query.repo_name {
+ metadata_mgr
+ .query_repo(repo_name, |conn| {
+ MetadataRepository::find_filtered(
+ conn,
+ query.name.as_deref(),
+ None, // no pkg_id filter for "all"
+ query.version.as_deref(),
+ None,
+ Some(SortDirection::Asc),
+ )
+ })?
+ .unwrap_or_default()
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.clone();
+ pkg
+ })
+ .collect()
+ } else {
+ metadata_mgr.query_all_flat(|repo_name, conn| {
+ let pkgs = MetadataRepository::find_filtered(
+ conn,
+ query.name.as_deref(),
+ None,
+ query.version.as_deref(),
+ None,
+ Some(SortDirection::Asc),
+ )?;
+ Ok(pkgs
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.to_string();
+ pkg
+ })
+ .collect())
+ })?
+ };
- if packages.total == 0 {
- error!("Package {} not found", query.name.unwrap());
+ if repo_pkgs.is_empty() {
+ error!("Package {} not found", query.name.as_ref().unwrap());
continue;
}
- let pkg = if packages.total > 1 {
- let pkgs = packages.items;
- &select_package_interactively(pkgs, &query.name.unwrap_or(package.clone()))?
- .unwrap()
+
+ let pkg = if repo_pkgs.len() > 1 {
+ &select_package_interactively(
+ repo_pkgs,
+ &query.name.unwrap_or(package.clone()),
+ )?
+ .unwrap()
} else {
- packages.items.first().unwrap()
+ repo_pkgs.first().unwrap()
};
query.pkg_id = Some(pkg.pkg_id.clone());
query.name = None;
}
}
- let builder = query.apply_filters(builder);
-
- let installed_packages = builder
- .clone()
- .database(core_db.clone())
- .load_installed()?
- .items;
+ let installed_packages: Vec = diesel_db
+ .with_conn(|conn| {
+ CoreRepository::list_filtered(
+ conn,
+ query.repo_name.as_deref(),
+ query.name.as_deref(),
+ query.pkg_id.as_deref(),
+ query.version.as_deref(),
+ None,
+ None,
+ None,
+ Some(SortDirection::Asc),
+ )
+ })?
+ .into_iter()
+ .map(Into::into)
+ .collect();
if query.name.is_none() && query.pkg_id.is_some() {
- let packages: PaginatedResponse = builder.load()?;
- for pkg in packages.items {
+ let repo_pkgs: Vec = if let Some(ref repo_name) = query.repo_name {
+ metadata_mgr
+ .query_repo(repo_name, |conn| {
+ MetadataRepository::find_filtered(
+ conn,
+ None,
+ query.pkg_id.as_deref(),
+ query.version.as_deref(),
+ None,
+ None,
+ )
+ })?
+ .unwrap_or_default()
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.clone();
+ pkg
+ })
+ .collect()
+ } else {
+ metadata_mgr.query_all_flat(|repo_name, conn| {
+ let pkgs = MetadataRepository::find_filtered(
+ conn,
+ None,
+ query.pkg_id.as_deref(),
+ query.version.as_deref(),
+ None,
+ None,
+ )?;
+ Ok(pkgs
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.to_string();
+ pkg
+ })
+ .collect())
+ })?
+ };
+
+ for pkg in repo_pkgs {
let existing_install = installed_packages
.iter()
.find(|ip| ip.pkg_name == pkg.pkg_name)
@@ -220,6 +327,7 @@ fn resolve_packages(
package: pkg,
existing_install,
with_pkg_id: true,
+ pinned: query.version.is_some(),
profile: None,
..Default::default()
});
@@ -232,7 +340,7 @@ fn resolve_packages(
};
if let Some(db_pkg) =
- select_package(package, builder.clear_limit(), yes, &maybe_existing)?
+ select_package(state, metadata_mgr, package, &query, yes, &maybe_existing)?
{
let is_installed = installed_packages.iter().any(|ip| ip.is_installed);
@@ -256,6 +364,7 @@ fn resolve_packages(
package: db_pkg,
existing_install,
with_pkg_id: false,
+ pinned: query.version.is_some(),
profile: None,
..Default::default()
});
@@ -267,23 +376,75 @@ fn resolve_packages(
}
fn select_package(
+ _state: &AppState,
+ metadata_mgr: &soar_core::database::connection::MetadataManager,
package_name: &str,
- builder: PackageQueryBuilder,
+ query: &PackageQuery,
yes: bool,
- existing_install: &Option,
+ existing_install: &Option,
) -> SoarResult> {
- let builder = if let Some(existing) = existing_install {
- builder
- .clear_filters()
- .where_and("r.name", FilterCondition::Eq(existing.repo_name.clone()))
- .where_and("pkg_name", FilterCondition::Eq(existing.pkg_name.clone()))
- .where_and("pkg_id", FilterCondition::Eq(existing.pkg_id.clone()))
+ // If we have an existing install, use its details to find the package
+ let packages: Vec = if let Some(existing) = existing_install {
+ metadata_mgr
+ .query_repo(&existing.repo_name, |conn| {
+ MetadataRepository::find_filtered(
+ conn,
+ Some(&existing.pkg_name),
+ Some(&existing.pkg_id),
+ None,
+ None,
+ None,
+ )
+ })?
+ .unwrap_or_default()
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = existing.repo_name.clone();
+ pkg
+ })
+ .collect()
+ } else if let Some(ref repo_name) = query.repo_name {
+ metadata_mgr
+ .query_repo(repo_name, |conn| {
+ MetadataRepository::find_filtered(
+ conn,
+ query.name.as_deref(),
+ query.pkg_id.as_deref(),
+ query.version.as_deref(),
+ None,
+ None,
+ )
+ })?
+ .unwrap_or_default()
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.clone();
+ pkg
+ })
+ .collect()
} else {
- builder
+ metadata_mgr.query_all_flat(|repo_name, conn| {
+ let pkgs = MetadataRepository::find_filtered(
+ conn,
+ query.name.as_deref(),
+ query.pkg_id.as_deref(),
+ query.version.as_deref(),
+ None,
+ None,
+ )?;
+ Ok(pkgs
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.to_string();
+ pkg
+ })
+ .collect())
+ })?
};
- let packages = builder.load()?.items;
-
match packages.len() {
0 => {
error!("Package {package_name} not found");
@@ -298,7 +459,7 @@ fn select_package(
pub async fn perform_installation(
ctx: InstallContext,
targets: Vec,
- core_db: Arc>,
+ core_db: DieselDatabase,
no_notes: bool,
) -> SoarResult<()> {
let mut handles = Vec::new();
@@ -326,6 +487,9 @@ pub async fn perform_installation(
}
let installed_indices = ctx.installed_indices.lock().unwrap();
+ let settings = display_settings();
+ let use_icons = settings.icons();
+
for (idx, target) in targets.into_iter().enumerate() {
let pkg = target.package;
let Some((install_dir, symlinks)) = installed_indices.get(&idx) else {
@@ -333,18 +497,22 @@ pub async fn perform_installation(
};
info!(
- "\n* {}#{} [Installed to: {}]",
- pkg.pkg_name,
- pkg.pkg_id,
- Colored(Blue, install_dir.display())
+ "\n{} {}#{}:{} [{}]",
+ icon_or(Icons::CHECK, "*"),
+ Colored(Blue, &pkg.pkg_name),
+ Colored(Cyan, &pkg.pkg_id),
+ Colored(Green, &pkg.repo_name),
+ Colored(Magenta, install_dir.display())
);
if !symlinks.is_empty() {
- info!(" Binaries:");
+ info!(" {} Binaries:", icon_or("📂", "-"));
for (target, link) in symlinks {
info!(
- " {} -> {}",
+ " {} {} {} {}",
+ icon_or(Icons::ARROW, "->"),
Colored(Green, link.display()),
+ icon_or("←", "<-"),
Colored(Blue, target.display())
);
}
@@ -352,18 +520,62 @@ pub async fn perform_installation(
if !no_notes {
if let Some(notes) = pkg.notes {
- info!(" Notes:\n {}", notes.join("\n "));
+ info!(
+ " {} Notes:\n {}",
+ icon_or("📝", "-"),
+ Colored(Yellow, notes.join("\n "))
+ );
}
- info!("\n");
}
}
let installed_count = ctx.installed_count.load(Ordering::Relaxed);
- if installed_count > 0 {
+ let failed_count = ctx.failed.load(Ordering::Relaxed);
+
+ if use_icons {
+ let mut builder = Builder::new();
+
+ if installed_count > 0 {
+ builder.push_record([
+ format!("{} Installed", icon_or(Icons::CHECK, "+")),
+ format!(
+ "{}/{}",
+ Colored(Green, installed_count),
+ Colored(Cyan, ctx.total_packages)
+ ),
+ ]);
+ }
+ if failed_count > 0 {
+ builder.push_record([
+ format!("{} Failed", icon_or(Icons::CROSS, "!")),
+ format!("{}", Colored(Red, failed_count)),
+ ]);
+ }
+ if installed_count == 0 && failed_count == 0 {
+ builder.push_record([
+ format!("{} Status", icon_or(Icons::WARNING, "!")),
+ "No packages installed".to_string(),
+ ]);
+ }
+
+ let table = builder
+ .build()
+ .with(Panel::header("Installation Summary"))
+ .with(Style::rounded())
+ .with(BorderCorrection {})
+ .to_string();
+
+ info!("\n{table}");
+ } else if installed_count > 0 {
info!(
- "Installed {}/{} packages",
- ctx.installed_count.load(Ordering::Relaxed),
- ctx.total_packages
+ "Installed {}/{} packages{}",
+ installed_count,
+ ctx.total_packages,
+ if failed_count > 0 {
+ format!(", {} failed", failed_count)
+ } else {
+ String::new()
+ }
);
} else {
info!("No packages installed.");
@@ -375,7 +587,7 @@ pub async fn perform_installation(
async fn spawn_installation_task(
ctx: &InstallContext,
target: InstallTarget,
- core_db: Arc>,
+ core_db: DieselDatabase,
idx: usize,
fixed_width: usize,
) -> tokio::task::JoinHandle<()> {
@@ -433,7 +645,7 @@ pub async fn install_single_package(
ctx: &InstallContext,
target: &InstallTarget,
progress_callback: Arc,
- core_db: Arc>,
+ core_db: DieselDatabase,
) -> SoarResult<(PathBuf, Vec<(PathBuf, PathBuf)>)> {
let bin_dir = get_config().get_bin_path()?;
diff --git a/crates/soar-cli/src/list.rs b/crates/soar-cli/src/list.rs
new file mode 100644
index 00000000..e218321b
--- /dev/null
+++ b/crates/soar-cli/src/list.rs
@@ -0,0 +1,673 @@
+use std::{
+ collections::{HashMap, HashSet},
+ path::PathBuf,
+};
+
+use indicatif::HumanBytes;
+use nu_ansi_term::Color::{Blue, Cyan, Green, LightRed, Magenta, Red, Yellow};
+use rayon::iter::{IntoParallelIterator, ParallelIterator};
+use soar_config::config::get_config;
+use soar_core::{
+ database::models::{InstalledPackage, Package},
+ package::query::PackageQuery,
+ SoarResult,
+};
+use soar_db::repository::{
+ core::{CoreRepository, SortDirection},
+ metadata::MetadataRepository,
+};
+use soar_utils::fs::dir_size;
+use tabled::{
+ builder::Builder,
+ settings::{peaker::PriorityMax, themes::BorderCorrection, Panel, Style, Width},
+};
+use tracing::info;
+
+use crate::{
+ state::AppState,
+ utils::{
+ display_settings, icon_or, pretty_package_size, term_width, vec_string, Colored, Icons,
+ },
+};
+
+pub async fn search_packages(
+ query: String,
+ case_sensitive: bool,
+ limit: Option,
+) -> SoarResult<()> {
+ let state = AppState::new();
+ let metadata_mgr = state.metadata_manager().await?;
+ let diesel_db = state.diesel_core_db()?;
+
+ let search_limit = limit.or(get_config().search_limit).unwrap_or(20) as i64;
+
+ let packages: Vec = metadata_mgr.query_all_flat(|repo_name, conn| {
+ let pkgs = if case_sensitive {
+ MetadataRepository::search_case_sensitive(conn, &query, Some(search_limit))?
+ } else {
+ MetadataRepository::search(conn, &query, Some(search_limit))?
+ };
+ Ok(pkgs
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.to_string();
+ pkg
+ })
+ .collect())
+ })?;
+
+ let installed_pkgs: HashMap<(String, String, String), bool> = diesel_db
+ .with_conn(|conn| {
+ CoreRepository::list_filtered(conn, None, None, None, None, None, None, None, None)
+ })?
+ .into_par_iter()
+ .map(|pkg| ((pkg.repo_name, pkg.pkg_id, pkg.pkg_name), pkg.is_installed))
+ .collect();
+
+ let total = packages.len();
+ let display_count = std::cmp::min(search_limit as usize, total);
+
+ let mut installed_count = 0;
+ let mut available_count = 0;
+
+ for package in packages.into_iter().take(display_count) {
+ let key = (
+ package.repo_name.clone(),
+ package.pkg_id.clone(),
+ package.pkg_name.clone(),
+ );
+ let state_icon = match installed_pkgs.get(&key) {
+ Some(is_installed) => {
+ if *is_installed {
+ installed_count += 1;
+ icon_or(Icons::INSTALLED, "+")
+ } else {
+ "?"
+ }
+ }
+ None => {
+ available_count += 1;
+ icon_or(Icons::NOT_INSTALLED, "-")
+ }
+ };
+
+ info!(
+ pkg_name = package.pkg_name,
+ pkg_id = package.pkg_id,
+ repo_name = package.repo_name,
+ pkg_type = package.pkg_type,
+ version = package.version,
+ version_upstream = package.version_upstream,
+ description = package.description,
+ size = package.ghcr_size.or(package.size),
+ "[{}] {}#{}:{} | {}{} | {} - {} ({})",
+ state_icon,
+ Colored(Blue, &package.pkg_name),
+ Colored(Cyan, &package.pkg_id),
+ Colored(Green, &package.repo_name),
+ Colored(LightRed, &package.version),
+ package
+ .version_upstream
+ .as_ref()
+ .filter(|_| package.version.starts_with("HEAD"))
+ .map(|upstream| format!(":{}", Colored(Yellow, &upstream)))
+ .unwrap_or_default(),
+ package
+ .pkg_type
+ .as_ref()
+ .map(|pkg_type| format!("{}", Colored(Magenta, &pkg_type)))
+ .unwrap_or_default(),
+ package.description,
+ pretty_package_size(package.ghcr_size, package.size)
+ );
+ }
+
+ let settings = display_settings();
+ if settings.icons() {
+ let mut builder = Builder::new();
+ builder.push_record([
+ format!("{} Found", Icons::PACKAGE),
+ format!(
+ "{} (showing {})",
+ Colored(Cyan, total),
+ Colored(Green, display_count)
+ ),
+ ]);
+ builder.push_record([
+ format!("{} Installed", icon_or(Icons::INSTALLED, "+")),
+ format!("{}", Colored(Green, installed_count)),
+ ]);
+ builder.push_record([
+ format!("{} Available", icon_or(Icons::NOT_INSTALLED, "-")),
+ format!("{}", Colored(Blue, available_count)),
+ ]);
+
+ let table = builder
+ .build()
+ .with(Panel::header("Search Results"))
+ .with(Style::rounded())
+ .with(BorderCorrection {})
+ .to_string();
+
+ info!("\n{table}");
+ } else {
+ info!(
+ "{}",
+ Colored(
+ Red,
+ format!(
+ "Showing {} of {} ({} installed, {} available)",
+ display_count, total, installed_count, available_count
+ )
+ )
+ );
+ }
+
+ Ok(())
+}
+
+pub async fn query_package(query_str: String) -> SoarResult<()> {
+ let state = AppState::new();
+ let metadata_mgr = state.metadata_manager().await?;
+
+ let query = PackageQuery::try_from(query_str.as_str())?;
+
+ let packages: Vec = if let Some(ref repo_name) = query.repo_name {
+ metadata_mgr
+ .query_repo(repo_name, |conn| {
+ MetadataRepository::find_filtered(
+ conn,
+ query.name.as_deref(),
+ query.pkg_id.as_deref(),
+ query.version.as_deref(),
+ None,
+ Some(SortDirection::Asc),
+ )
+ })?
+ .unwrap_or_default()
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.clone();
+ pkg
+ })
+ .collect()
+ } else {
+ metadata_mgr.query_all_flat(|repo_name, conn| {
+ let pkgs = MetadataRepository::find_filtered(
+ conn,
+ query.name.as_deref(),
+ query.pkg_id.as_deref(),
+ query.version.as_deref(),
+ None,
+ Some(SortDirection::Asc),
+ )?;
+ Ok(pkgs
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.to_string();
+ pkg
+ })
+ .collect())
+ })?
+ };
+
+ for package in packages {
+ let mut builder = Builder::new();
+
+ builder.push_record([
+ format!("{} Name", Icons::PACKAGE),
+ format!(
+ "{}#{}:{}",
+ Colored(Blue, &package.pkg_name),
+ Colored(Cyan, &package.pkg_id),
+ Colored(Green, &package.repo_name)
+ ),
+ ]);
+
+ builder.push_record(["Description".to_string(), package.description.clone()]);
+
+ let version = format!(
+ "{}{}",
+ Colored(Blue, &package.version),
+ package
+ .version_upstream
+ .as_ref()
+ .filter(|_| package.version.starts_with("HEAD"))
+ .map(|u| format!(" ({})", Colored(Yellow, u)))
+ .unwrap_or_default()
+ );
+ builder.push_record([format!("{} Version", Icons::VERSION), version]);
+
+ builder.push_record([
+ format!("{} Size", Icons::SIZE),
+ pretty_package_size(package.ghcr_size, package.size),
+ ]);
+
+ if let Some(ref cs) = package.bsum {
+ builder.push_record([
+ "Checksum".to_string(),
+ format!("{} (blake3)", Colored(Blue, cs)),
+ ]);
+ }
+
+ if let Some(ref homepages) = package.homepages {
+ builder.push_record([
+ "Homepages".to_string(),
+ homepages
+ .iter()
+ .map(|h| Colored(Blue, h).to_string())
+ .collect::>()
+ .join("\n"),
+ ]);
+ }
+
+ if let Some(ref licenses) = package.licenses {
+ builder.push_record(["Licenses".to_string(), licenses.join(", ")]);
+ }
+
+ if let Some(ref maintainers) = package.maintainers {
+ let maintainer_strs: Vec = maintainers.iter().map(|m| m.to_string()).collect();
+ builder.push_record(["Maintainers".to_string(), maintainer_strs.join(", ")]);
+ }
+
+ if let Some(ref notes) = package.notes {
+ builder.push_record(["Notes".to_string(), notes.join("\n")]);
+ }
+
+ if let Some(ref pkg_type) = package.pkg_type {
+ builder.push_record(["Type".to_string(), Colored(Magenta, pkg_type).to_string()]);
+ }
+
+ if let Some(ref action) = package.build_action {
+ let build_info = format!(
+ "{}{}",
+ Colored(Blue, action),
+ package
+ .build_id
+ .as_ref()
+ .map(|id| format!(" ({})", Colored(Yellow, id)))
+ .unwrap_or_default()
+ );
+ builder.push_record(["Build CI".to_string(), build_info]);
+ }
+
+ if let Some(ref date) = package.build_date {
+ builder.push_record(["Build Date".to_string(), date.clone()]);
+ }
+
+ if let Some(ref log) = package.build_log {
+ builder.push_record(["Build Log".to_string(), Colored(Blue, log).to_string()]);
+ }
+
+ if let Some(ref script) = package.build_script {
+ builder.push_record([
+ "Build Script".to_string(),
+ Colored(Blue, script).to_string(),
+ ]);
+ }
+
+ if let Some(ref blob) = package.ghcr_blob {
+ builder.push_record(["GHCR Blob".to_string(), Colored(Blue, blob).to_string()]);
+ } else {
+ builder.push_record([
+ "Download URL".to_string(),
+ Colored(Blue, &package.download_url).to_string(),
+ ]);
+ }
+
+ if let Some(ref pkg) = package.ghcr_pkg {
+ builder.push_record([
+ "GHCR Package".to_string(),
+ Colored(Blue, format!("https://{pkg}")).to_string(),
+ ]);
+ }
+
+ if let Some(ref webindex) = package.pkg_webpage {
+ builder.push_record(["Index".to_string(), Colored(Blue, webindex).to_string()]);
+ }
+
+ let table = builder
+ .build()
+ .with(Style::rounded())
+ .with(Width::wrap(term_width()).priority(PriorityMax::default()))
+ .to_string();
+
+ info!(
+ pkg_name = package.pkg_name,
+ pkg_id = package.pkg_id,
+ pkg_type = package.pkg_type,
+ repo_name = package.repo_name,
+ description = package.description,
+ version = package.version,
+ version_upstream = package.version_upstream,
+ bsum = package.bsum,
+ homepages = vec_string(package.homepages),
+ source_urls = vec_string(package.source_urls),
+ licenses = vec_string(package.licenses),
+ maintainers = vec_string(package.maintainers),
+ notes = vec_string(package.notes),
+ snapshots = vec_string(package.snapshots),
+ size = package.size,
+ download_url = package.download_url,
+ build_id = package.build_id,
+ build_date = package.build_date,
+ build_action = package.build_action,
+ build_log = package.build_log,
+ build_script = package.build_script,
+ ghcr_blob = package.ghcr_blob,
+ ghcr_pkg = package.ghcr_pkg,
+ pkg_webpage = package.pkg_webpage,
+ "\n{table}"
+ );
+ }
+
+ Ok(())
+}
+
+pub async fn list_packages(repo_name: Option) -> SoarResult<()> {
+ let state = AppState::new();
+ let metadata_mgr = state.metadata_manager().await?;
+ let diesel_db = state.diesel_core_db()?;
+
+ let packages: Vec = if let Some(ref repo_name) = repo_name {
+ metadata_mgr
+ .query_repo(repo_name, MetadataRepository::list_all)?
+ .unwrap_or_default()
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.clone();
+ pkg
+ })
+ .collect()
+ } else {
+ metadata_mgr.query_all_flat(|repo_name, conn| {
+ let pkgs = MetadataRepository::list_all(conn)?;
+ Ok(pkgs
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.to_string();
+ pkg
+ })
+ .collect())
+ })?
+ };
+
+ let installed_pkgs: HashMap<(String, String, String), bool> = diesel_db
+ .with_conn(|conn| {
+ CoreRepository::list_filtered(conn, None, None, None, None, None, None, None, None)
+ })?
+ .into_par_iter()
+ .map(|pkg| ((pkg.repo_name, pkg.pkg_id, pkg.pkg_name), pkg.is_installed))
+ .collect();
+
+ let total = packages.len();
+ let mut installed_count = 0;
+ let mut available_count = 0;
+
+ for package in &packages {
+ let key = (
+ package.repo_name.clone(),
+ package.pkg_id.clone(),
+ package.pkg_name.clone(),
+ );
+ let state_icon = match installed_pkgs.get(&key) {
+ Some(is_installed) => {
+ if *is_installed {
+ installed_count += 1;
+ icon_or(Icons::INSTALLED, "+")
+ } else {
+ "?"
+ }
+ }
+ None => {
+ available_count += 1;
+ icon_or(Icons::NOT_INSTALLED, "-")
+ }
+ };
+
+ info!(
+ pkg_name = package.pkg_name,
+ pkg_id = package.pkg_id,
+ repo_name = package.repo_name,
+ pkg_type = package.pkg_type,
+ version = package.version,
+ version_upstream = package.version_upstream,
+ "[{}] {}#{}:{} | {}{} | {}",
+ state_icon,
+ Colored(Blue, &package.pkg_name),
+ Colored(Cyan, &package.pkg_id),
+ Colored(Cyan, &package.repo_name),
+ Colored(LightRed, &package.version),
+ package
+ .version_upstream
+ .as_ref()
+ .filter(|_| package.version.starts_with("HEAD"))
+ .map(|upstream| format!(":{}", Colored(Yellow, &upstream)))
+ .unwrap_or_default(),
+ package
+ .pkg_type
+ .as_ref()
+ .map(|pkg_type| format!("{}", Colored(Magenta, &pkg_type)))
+ .unwrap_or_default(),
+ );
+ }
+
+ let settings = display_settings();
+ if settings.icons() {
+ let mut builder = Builder::new();
+ builder.push_record([
+ format!("{} Total", Icons::PACKAGE),
+ format!("{}", Colored(Cyan, total)),
+ ]);
+ builder.push_record([
+ format!("{} Installed", icon_or(Icons::INSTALLED, "+")),
+ format!("{}", Colored(Green, installed_count)),
+ ]);
+ builder.push_record([
+ format!("{} Available", icon_or(Icons::NOT_INSTALLED, "-")),
+ format!("{}", Colored(Blue, available_count)),
+ ]);
+
+ let table = builder
+ .build()
+ .with(Panel::header("Package List"))
+ .with(Style::rounded())
+ .with(BorderCorrection {})
+ .to_string();
+
+ info!("\n{table}");
+ } else {
+ info!(
+ "Total: {} ({} installed, {} available)",
+ total, installed_count, available_count
+ );
+ }
+
+ Ok(())
+}
+
+pub async fn list_installed_packages(repo_name: Option, count: bool) -> SoarResult<()> {
+ let state = AppState::new();
+ let diesel_db = state.diesel_core_db()?;
+
+ if count {
+ let count = diesel_db.with_conn(|conn| {
+ CoreRepository::count_distinct_installed(conn, repo_name.as_deref())
+ })?;
+ info!("{}", count);
+ return Ok(());
+ }
+
+ // Get installed packages
+ let packages: Vec = diesel_db
+ .with_conn(|conn| {
+ CoreRepository::list_filtered(
+ conn,
+ repo_name.as_deref(),
+ None,
+ None,
+ None,
+ None,
+ None,
+ None,
+ None,
+ )
+ })?
+ .into_iter()
+ .map(Into::into)
+ .collect();
+
+ let mut unique_pkgs = HashSet::new();
+ let settings = display_settings();
+ let use_icons = settings.icons();
+
+ let (installed_count, unique_count, broken_count, installed_size, broken_size) =
+ packages.iter().fold(
+ (0, 0, 0, 0, 0),
+ |(installed_count, unique_count, broken_count, installed_size, broken_size),
+ package| {
+ let installed_path = PathBuf::from(&package.installed_path);
+ let size = dir_size(&installed_path).unwrap_or(0);
+ let is_installed = package.is_installed && installed_path.exists();
+
+ let status = if is_installed {
+ String::new()
+ } else if use_icons {
+ format!(
+ " {} {}",
+ icon_or(Icons::BROKEN, "!"),
+ Colored(Red, "Broken")
+ )
+ } else {
+ Colored(Red, " [Broken]").to_string()
+ };
+
+ info!(
+ pkg_name = package.pkg_name,
+ version = package.version,
+ repo_name = package.repo_name,
+ installed_date = package.installed_date.clone(),
+ size = %package.size,
+ "{}-{}:{} ({}) ({}){}",
+ Colored(Blue, &package.pkg_name),
+ Colored(Magenta, &package.version),
+ Colored(Cyan, &package.repo_name),
+ Colored(Green, &package.installed_date.clone()),
+ HumanBytes(size),
+ status,
+ );
+
+ if is_installed {
+ let unique_count = unique_pkgs
+ .insert(format!("{}-{}", package.pkg_id, package.pkg_name))
+ as u32
+ + unique_count;
+ (
+ installed_count + 1,
+ unique_count,
+ broken_count,
+ installed_size + size,
+ broken_size,
+ )
+ } else {
+ (
+ installed_count,
+ unique_count,
+ broken_count + 1,
+ installed_size,
+ broken_size + size,
+ )
+ }
+ },
+ );
+
+ if use_icons {
+ let mut builder = Builder::new();
+
+ builder.push_record([
+ format!("{} Installed", icon_or(Icons::CHECK, "+")),
+ format!(
+ "{}{} ({})",
+ Colored(Green, installed_count),
+ if installed_count != unique_count {
+ format!(", {} distinct", Colored(Cyan, unique_count))
+ } else {
+ String::new()
+ },
+ Colored(Magenta, HumanBytes(installed_size))
+ ),
+ ]);
+
+ if broken_count > 0 {
+ builder.push_record([
+ format!("{} Broken", icon_or(Icons::CROSS, "!")),
+ format!(
+ "{} ({})",
+ Colored(Red, broken_count),
+ Colored(Magenta, HumanBytes(broken_size))
+ ),
+ ]);
+
+ let total_count = installed_count + broken_count;
+ let total_size = installed_size + broken_size;
+ builder.push_record([
+ format!("{} Total", Icons::PACKAGE),
+ format!(
+ "{} ({})",
+ Colored(Blue, total_count),
+ Colored(Magenta, HumanBytes(total_size))
+ ),
+ ]);
+ }
+
+ let table = builder
+ .build()
+ .with(Panel::header("Summary"))
+ .with(Style::rounded())
+ .with(BorderCorrection {})
+ .to_string();
+
+ info!(installed_count, unique_count, installed_size, "\n{table}");
+ } else {
+ info!(
+ installed_count,
+ unique_count,
+ installed_size,
+ "Installed: {}{} ({})",
+ installed_count,
+ if installed_count != unique_count {
+ format!(", {unique_count} distinct")
+ } else {
+ String::new()
+ },
+ HumanBytes(installed_size),
+ );
+
+ if broken_count > 0 {
+ info!(
+ broken_count,
+ broken_size,
+ "Broken: {} ({})",
+ broken_count,
+ HumanBytes(broken_size)
+ );
+
+ let total_count = installed_count + broken_count;
+ let total_size = installed_size + broken_size;
+ info!(
+ total_count,
+ total_size,
+ "Total: {} ({})",
+ total_count,
+ HumanBytes(total_size)
+ );
+ }
+ }
+
+ Ok(())
+}
diff --git a/soar-cli/src/logging.rs b/crates/soar-cli/src/logging.rs
similarity index 100%
rename from soar-cli/src/logging.rs
rename to crates/soar-cli/src/logging.rs
diff --git a/soar-cli/src/main.rs b/crates/soar-cli/src/main.rs
similarity index 96%
rename from soar-cli/src/main.rs
rename to crates/soar-cli/src/main.rs
index ee355525..c8ede814 100644
--- a/soar-cli/src/main.rs
+++ b/crates/soar-cli/src/main.rs
@@ -23,7 +23,7 @@ use soar_core::{
use soar_dl::http_client::configure_http_client;
use soar_utils::path::resolve_path;
use state::AppState;
-use tracing::{error, info, warn};
+use tracing::{info, warn};
use update::update_packages;
use ureq::Proxy;
use use_package::use_alternate_package;
@@ -387,7 +387,20 @@ async fn handle_cli() -> SoarResult<()> {
#[tokio::main]
async fn main() {
+ // Install miette's fancy error handler for beautiful error output
+ miette::set_hook(Box::new(|_| {
+ Box::new(
+ miette::MietteHandlerOpts::new()
+ .terminal_links(true)
+ .unicode(true)
+ .context_lines(2)
+ .build(),
+ )
+ }))
+ .ok();
+
if let Err(err) = handle_cli().await {
- error!("{}", err);
- };
+ // Use miette's error display for Diagnostic errors
+ eprintln!("{:?}", miette::Report::new(err));
+ }
}
diff --git a/crates/soar-cli/src/nest.rs b/crates/soar-cli/src/nest.rs
new file mode 100644
index 00000000..f7a1f24e
--- /dev/null
+++ b/crates/soar-cli/src/nest.rs
@@ -0,0 +1,45 @@
+use soar_core::{error::SoarError, utils::get_nests_db_conn, SoarResult};
+use soar_db::{models::nest::NewNest, repository::nest::NestRepository};
+
+pub async fn add_nest(name: &str, url: &str) -> SoarResult<()> {
+ let full_name = format!("nest-{name}");
+ let mut conn = get_nests_db_conn()?;
+
+ let nest = NewNest {
+ name: &full_name,
+ url,
+ };
+ NestRepository::insert(conn.conn(), &nest)
+ .map_err(|e| SoarError::Custom(format!("Failed to add nest: {}", e)))?;
+ println!("Added nest: {}", name);
+ Ok(())
+}
+
+pub async fn remove_nest(name: &str) -> SoarResult<()> {
+ let full_name = format!("nest-{name}");
+ let mut conn = get_nests_db_conn()?;
+
+ let deleted = NestRepository::delete_by_name(conn.conn(), &full_name)
+ .map_err(|e| SoarError::Custom(format!("Failed to remove nest: {}", e)))?;
+
+ if deleted == 0 {
+ return Err(SoarError::Custom(format!(
+ "No nest found with name `{name}`"
+ )));
+ }
+ println!("Removed nest: {}", name);
+ Ok(())
+}
+
+pub async fn list_nests() -> SoarResult<()> {
+ let mut conn = get_nests_db_conn()?;
+
+ let nests = NestRepository::list_all(conn.conn())
+ .map_err(|e| SoarError::Custom(format!("Failed to list nests: {}", e)))?;
+
+ for nest in nests {
+ let display_name = nest.name.strip_prefix("nest-").unwrap_or(&nest.name);
+ println!("{} - {}", display_name, nest.url);
+ }
+ Ok(())
+}
diff --git a/soar-cli/src/progress.rs b/crates/soar-cli/src/progress.rs
similarity index 71%
rename from soar-cli/src/progress.rs
rename to crates/soar-cli/src/progress.rs
index 4e265862..74d04c06 100644
--- a/soar-cli/src/progress.rs
+++ b/crates/soar-cli/src/progress.rs
@@ -2,23 +2,74 @@ use std::sync::atomic::Ordering;
use indicatif::{HumanBytes, ProgressBar, ProgressState, ProgressStyle};
use nu_ansi_term::Color::Red;
+use soar_config::display::ProgressStyle as ConfigProgressStyle;
use soar_core::database::models::Package;
use soar_dl::types::Progress;
-use crate::{install::InstallContext, utils::Colored};
+use crate::{
+ install::InstallContext,
+ utils::{display_settings, Colored},
+};
+
+const SPINNER_CHARS: &str = "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏";
pub fn create_progress_bar() -> ProgressBar {
let progress_bar = ProgressBar::new(0);
- let style = ProgressStyle::with_template(
- "{prefix} [{wide_bar:.green/white}] {bytes_per_sec:14} {computed_bytes:22}",
- )
- .unwrap()
- .with_key("computed_bytes", format_bytes)
- .progress_chars("━━");
+ let style = get_progress_style();
progress_bar.set_style(style);
progress_bar
}
+fn get_progress_style() -> ProgressStyle {
+ let settings = display_settings();
+
+ match settings.progress_style() {
+ ConfigProgressStyle::Modern => {
+ ProgressStyle::with_template(
+ "{spinner:.cyan} {prefix} [{wide_bar:.green/dim}] {bytes_per_sec:>12} {computed_bytes:>22} ETA: {eta}",
+ )
+ .unwrap()
+ .with_key("computed_bytes", format_bytes)
+ .tick_chars(SPINNER_CHARS)
+ .progress_chars("━━─")
+ }
+ ConfigProgressStyle::Classic => {
+ ProgressStyle::with_template(
+ "{prefix} [{wide_bar}] {bytes_per_sec:>12} {computed_bytes:>22}",
+ )
+ .unwrap()
+ .with_key("computed_bytes", format_bytes)
+ .progress_chars("=>-")
+ }
+ ConfigProgressStyle::Minimal => {
+ ProgressStyle::with_template(
+ "{prefix} {percent:>3}% ({computed_bytes})",
+ )
+ .unwrap()
+ .with_key("computed_bytes", format_bytes)
+ }
+ }
+}
+
+pub fn create_spinner(message: &str) -> ProgressBar {
+ let settings = display_settings();
+ let spinner = ProgressBar::new_spinner();
+
+ if settings.spinners() {
+ spinner.set_style(
+ ProgressStyle::with_template("{spinner:.cyan} {msg}")
+ .unwrap()
+ .tick_chars(SPINNER_CHARS),
+ );
+ spinner.enable_steady_tick(std::time::Duration::from_millis(80));
+ } else {
+ spinner.set_style(ProgressStyle::with_template("{msg}").unwrap());
+ }
+
+ spinner.set_message(message.to_string());
+ spinner
+}
+
fn format_bytes(state: &ProgressState, w: &mut dyn std::fmt::Write) {
write!(
w,
diff --git a/crates/soar-cli/src/remove.rs b/crates/soar-cli/src/remove.rs
new file mode 100644
index 00000000..04cf542f
--- /dev/null
+++ b/crates/soar-cli/src/remove.rs
@@ -0,0 +1,92 @@
+use soar_core::{
+ database::models::InstalledPackage,
+ package::{query::PackageQuery, remove::PackageRemover},
+ SoarResult,
+};
+use soar_db::repository::core::{CoreRepository, SortDirection};
+use tracing::{error, info, warn};
+
+use crate::{state::AppState, utils::select_package_interactively};
+
+pub async fn remove_packages(packages: &[String]) -> SoarResult<()> {
+ let state = AppState::new();
+ let diesel_db = state.diesel_core_db()?.clone();
+
+ for package in packages {
+ let mut query = PackageQuery::try_from(package.as_str())?;
+
+ if let Some(ref pkg_id) = query.pkg_id {
+ if pkg_id == "all" {
+ let installed: Vec = diesel_db
+ .with_conn(|conn| {
+ CoreRepository::list_filtered(
+ conn,
+ query.repo_name.as_deref(),
+ query.name.as_deref(),
+ None, // no pkg_id filter for "all"
+ query.version.as_deref(),
+ None,
+ None,
+ None,
+ Some(SortDirection::Asc),
+ )
+ })?
+ .into_iter()
+ .map(Into::into)
+ .collect();
+
+ if installed.is_empty() {
+ error!("Package {} is not installed", query.name.as_ref().unwrap());
+ continue;
+ }
+
+ let pkg = if installed.len() > 1 {
+ select_package_interactively(installed, query.name.as_ref().unwrap())?.unwrap()
+ } else {
+ installed.into_iter().next().unwrap()
+ };
+ query.pkg_id = Some(pkg.pkg_id.clone());
+ query.name = None;
+ }
+ }
+
+ let installed_pkgs: Vec = diesel_db
+ .with_conn(|conn| {
+ CoreRepository::list_filtered(
+ conn,
+ query.repo_name.as_deref(),
+ query.name.as_deref(),
+ query.pkg_id.as_deref(),
+ query.version.as_deref(),
+ None,
+ None,
+ None,
+ Some(SortDirection::Asc),
+ )
+ })?
+ .into_iter()
+ .map(Into::into)
+ .collect();
+
+ if installed_pkgs.is_empty() {
+ warn!("Package {} is not installed.", package);
+ continue;
+ }
+
+ for installed_pkg in installed_pkgs {
+ if query.name.is_none() && !installed_pkg.with_pkg_id {
+ continue;
+ }
+
+ let remover = PackageRemover::new(installed_pkg.clone(), diesel_db.clone()).await;
+ remover.remove().await?;
+
+ info!(
+ "Removed {}#{}",
+ installed_pkg.pkg_name, installed_pkg.pkg_id
+ );
+ }
+ }
+
+ Ok(())
+}
diff --git a/soar-cli/src/run.rs b/crates/soar-cli/src/run.rs
similarity index 72%
rename from soar-cli/src/run.rs
rename to crates/soar-cli/src/run.rs
index 5ab3f4c3..e42ca937 100644
--- a/soar-cli/src/run.rs
+++ b/crates/soar-cli/src/run.rs
@@ -1,15 +1,13 @@
use std::{fs, process::Command, sync::Arc};
use soar_core::{
- database::{
- models::Package,
- packages::{FilterCondition, PackageQueryBuilder},
- },
+ database::models::Package,
error::{ErrorContext, SoarError},
package::query::PackageQuery,
utils::get_extract_dir,
SoarResult,
};
+use soar_db::repository::metadata::MetadataRepository;
use soar_dl::{download::Download, oci::OciDownload, types::OverwriteMode};
use soar_utils::hash::calculate_checksum;
@@ -44,24 +42,48 @@ pub async fn run_package(
let output_path = cache_bin.join(package_name);
if !output_path.exists() {
- let repo_db = state.repo_db().await?;
-
- let mut builder = PackageQueryBuilder::new(repo_db.clone())
- .where_and("pkg_name", FilterCondition::Eq(package_name.clone()));
-
- if let Some(repo_name) = repo_name {
- builder = builder.where_and("repo_name", FilterCondition::Eq(repo_name.to_string()));
- }
-
- if let Some(pkg_id) = pkg_id {
- builder = builder.where_and("pkg_id", FilterCondition::Eq(pkg_id.to_string()));
- }
-
- if let Some(version) = version {
- builder = builder.where_and("version", FilterCondition::Eq(version.to_string()));
- }
-
- let packages: Vec = builder.load()?.items;
+ let metadata_mgr = state.metadata_manager().await?;
+
+ let packages: Vec = if let Some(repo_name) = repo_name {
+ metadata_mgr
+ .query_repo(repo_name, |conn| {
+ MetadataRepository::find_filtered(
+ conn,
+ Some(package_name),
+ pkg_id,
+ version,
+ None,
+ None,
+ )
+ })?
+ .unwrap_or_default()
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.to_string();
+ pkg
+ })
+ .collect()
+ } else {
+ metadata_mgr.query_all_flat(|repo_name, conn| {
+ let pkgs = MetadataRepository::find_filtered(
+ conn,
+ Some(package_name),
+ pkg_id,
+ version,
+ None,
+ None,
+ )?;
+ Ok(pkgs
+ .into_iter()
+ .map(|p| {
+ let mut pkg: Package = p.into();
+ pkg.repo_name = repo_name.to_string();
+ pkg
+ })
+ .collect())
+ })?
+ };
let package = match packages.len() {
0 => return Err(SoarError::PackageNotFound(package_name.clone())),
diff --git a/soar-cli/src/self_actions.rs b/crates/soar-cli/src/self_actions.rs
similarity index 100%
rename from soar-cli/src/self_actions.rs
rename to crates/soar-cli/src/self_actions.rs
diff --git a/crates/soar-cli/src/state.rs b/crates/soar-cli/src/state.rs
new file mode 100644
index 00000000..8feaa1d3
--- /dev/null
+++ b/crates/soar-cli/src/state.rs
@@ -0,0 +1,329 @@
+use std::{
+ fs::{self, File},
+ path::Path,
+ sync::Arc,
+};
+
+use nu_ansi_term::Color::{Blue, Green, Magenta, Red};
+use once_cell::sync::OnceCell;
+use soar_config::{
+ config::{get_config, Config},
+ repository::Repository,
+};
+use soar_core::{
+ database::connection::{DieselDatabase, MetadataManager},
+ error::{ErrorContext, SoarError},
+ utils::get_nests_db_conn,
+ SoarResult,
+};
+use soar_db::{
+ connection::DbConnection,
+ migration::DbType,
+ repository::{core::CoreRepository, metadata::MetadataRepository, nest::NestRepository},
+};
+use soar_registry::{
+ fetch_metadata, fetch_nest_metadata, write_metadata_db, MetadataContent, RemotePackage,
+};
+use tokio::sync::OnceCell as AsyncOnceCell;
+use tracing::{error, info};
+
+use crate::utils::Colored;
+
+fn handle_json_metadata>(
+ metadata: &[RemotePackage],
+ metadata_db: P,
+ repo_name: &str,
+) -> SoarResult<()> {
+ let metadata_db = metadata_db.as_ref();
+ if metadata_db.exists() {
+ fs::remove_file(metadata_db)
+ .with_context(|| format!("removing metadata file {}", metadata_db.display()))?;
+ }
+
+ let mut conn = DbConnection::open(metadata_db, DbType::Metadata)
+ .map_err(|e| SoarError::Custom(format!("opening metadata database: {}", e)))?;
+
+ MetadataRepository::import_packages(conn.conn(), metadata, repo_name)
+ .map_err(|e| SoarError::Custom(format!("importing packages: {}", e)))?;
+
+ Ok(())
+}
+
+#[derive(Clone)]
+pub struct AppState {
+ inner: Arc,
+}
+
+struct AppStateInner {
+ config: Config,
+ diesel_core_db: OnceCell,
+ metadata_manager: AsyncOnceCell,
+}
+
+impl AppState {
+ pub fn new() -> Self {
+ let config = get_config();
+
+ Self {
+ inner: Arc::new(AppStateInner {
+ config,
+ diesel_core_db: OnceCell::new(),
+ metadata_manager: AsyncOnceCell::new(),
+ }),
+ }
+ }
+
+ pub async fn sync(&self) -> SoarResult<()> {
+ self.init_repo_dbs(true).await?;
+ self.sync_nests(true).await
+ }
+
+ async fn sync_nests(&self, force: bool) -> SoarResult<()> {
+ let mut nests_db = get_nests_db_conn()?;
+ let nests = NestRepository::list_all(nests_db.conn())
+ .map_err(|e| SoarError::Custom(format!("listing nests: {}", e)))?;
+
+ let nests_repo_path = self.config().get_repositories_path()?.join("nests");
+
+ let mut tasks = Vec::new();
+
+ for nest in nests {
+ let etag = self.read_nest_etag(&nest.name);
+ let registry_nest = soar_registry::Nest {
+ id: nest.id as i64,
+ name: nest.name.clone(),
+ url: nest.url.clone(),
+ };
+ let task = tokio::task::spawn(async move {
+ fetch_nest_metadata(®istry_nest, force, etag).await
+ });
+ tasks.push((task, nest));
+ }
+
+ for (task, nest) in tasks {
+ match task
+ .await
+ .map_err(|err| SoarError::Custom(format!("Join handle error: {err}")))?
+ {
+ Ok(Some((etag, content))) => {
+ let nest_path = nests_repo_path.join(&nest.name);
+ let metadata_db_path = nest_path.join("metadata.db");
+ let nest_name = format!("nest-{}", nest.name);
+
+ match content {
+ MetadataContent::SqliteDb(db_bytes) => {
+ write_metadata_db(&db_bytes, &metadata_db_path)
+ .map_err(|e| SoarError::Custom(e.to_string()))?;
+ }
+ MetadataContent::Json(packages) => {
+ handle_json_metadata(&packages, &metadata_db_path, &nest_name)?;
+ }
+ }
+
+ let db = DieselDatabase::open_metadata(&metadata_db_path)?;
+ db.with_conn(|conn| {
+ MetadataRepository::update_repo_metadata(conn, &nest_name, &etag)
+ })?;
+ info!("[{}] Nest synced", Colored(Magenta, &nest.name))
+ }
+ Err(err) => error!("Failed to sync nest {}: {err}", nest.name),
+ _ => {}
+ }
+ }
+
+ Ok(())
+ }
+
+ async fn init_repo_dbs(&self, force: bool) -> SoarResult<()> {
+ let mut tasks = Vec::new();
+
+ for repo in &self.inner.config.repositories {
+ let repo_clone = repo.clone();
+ let etag = self.read_repo_etag(&repo_clone);
+ let task =
+ tokio::task::spawn(async move { fetch_metadata(&repo_clone, force, etag).await });
+ tasks.push((task, repo));
+ }
+
+ for (task, repo) in tasks {
+ match task
+ .await
+ .map_err(|err| SoarError::Custom(format!("Join handle error: {err}")))?
+ {
+ Ok(Some((etag, content))) => {
+ let repo_path = repo.get_path()?;
+ let metadata_db_path = repo_path.join("metadata.db");
+
+ match content {
+ MetadataContent::SqliteDb(db_bytes) => {
+ write_metadata_db(&db_bytes, &metadata_db_path)
+ .map_err(|e| SoarError::Custom(e.to_string()))?;
+ }
+ MetadataContent::Json(packages) => {
+ handle_json_metadata(&packages, &metadata_db_path, &repo.name)?;
+ }
+ }
+
+ self.validate_packages(repo, &etag).await?;
+ info!("[{}] Repository synced", Colored(Magenta, &repo.name));
+ }
+ Err(err) => error!("Failed to sync repository {}: {err}", repo.name),
+ _ => {}
+ };
+ }
+
+ Ok(())
+ }
+
+ async fn validate_packages(&self, repo: &Repository, etag: &str) -> SoarResult<()> {
+ let diesel_core_db = self.diesel_core_db()?;
+ let repo_name = repo.name.clone();
+
+ let repo_path = repo.get_path()?;
+ let metadata_db_path = repo_path.join("metadata.db");
+
+ let metadata_db = DieselDatabase::open_metadata(&metadata_db_path)?;
+
+ let installed_packages = diesel_core_db.with_conn(|conn| {
+ CoreRepository::list_filtered(
+ conn,
+ Some(&repo_name),
+ None,
+ None,
+ None,
+ None,
+ None,
+ None,
+ None,
+ )
+ })?;
+
+ for pkg in installed_packages {
+ let exists = metadata_db
+ .with_conn(|conn| MetadataRepository::exists_by_pkg_id(conn, &pkg.pkg_id))?;
+
+ if !exists {
+ let replacement = metadata_db.with_conn(|conn| {
+ MetadataRepository::find_replacement_pkg_id(conn, &pkg.pkg_id)
+ })?;
+
+ if let Some(new_pkg_id) = replacement {
+ info!(
+ "[{}] {} is replaced by {} in {}",
+ Colored(Blue, "Note"),
+ Colored(Red, &pkg.pkg_id),
+ Colored(Green, &new_pkg_id),
+ Colored(Magenta, &repo_name)
+ );
+
+ diesel_core_db.with_conn(|conn| {
+ CoreRepository::update_pkg_id(conn, &repo_name, &pkg.pkg_id, &new_pkg_id)
+ })?;
+ }
+ }
+ }
+
+ metadata_db
+ .with_conn(|conn| MetadataRepository::update_repo_metadata(conn, &repo.name, etag))?;
+
+ Ok(())
+ }
+
+ fn create_diesel_core_db(&self) -> SoarResult {
+ let core_db_file = self.config().get_db_path()?.join("soar.db");
+ if !core_db_file.exists() {
+ File::create(&core_db_file)
+ .with_context(|| format!("creating database file {}", core_db_file.display()))?;
+ }
+
+ DieselDatabase::open_core(&core_db_file)
+ }
+
+ fn create_metadata_manager(&self) -> SoarResult {
+ let mut manager = MetadataManager::new();
+
+ for repo in &self.inner.config.repositories {
+ if let Ok(repo_path) = repo.get_path() {
+ let metadata_db = repo_path.join("metadata.db");
+ if metadata_db.is_file() {
+ manager.add_repo(&repo.name, metadata_db)?;
+ }
+ }
+ }
+
+ if let Ok(mut nests_db) = get_nests_db_conn() {
+ if let Ok(nests) = NestRepository::list_all(nests_db.conn()) {
+ if let Ok(nests_repo_path) = self.config().get_repositories_path() {
+ let nests_repo_path = nests_repo_path.join("nests");
+ for nest in nests {
+ let nest_path = nests_repo_path.join(&nest.name);
+ let metadata_db = nest_path.join("metadata.db");
+ if metadata_db.is_file() {
+ let nest_name = format!("nest-{}", nest.name);
+ manager.add_repo(&nest_name, metadata_db)?;
+ }
+ }
+ }
+ }
+ }
+
+ Ok(manager)
+ }
+
+ #[inline]
+ pub fn config(&self) -> &Config {
+ &self.inner.config
+ }
+
+ /// Reads the etag from an existing metadata database.
+ fn read_repo_etag(&self, repo: &Repository) -> Option {
+ let repo_path = repo.get_path().ok()?;
+ let metadata_db = repo_path.join("metadata.db");
+
+ if !metadata_db.exists() {
+ return None;
+ }
+
+ let mut conn = DbConnection::open(&metadata_db, DbType::Metadata).ok()?;
+ MetadataRepository::get_repo_etag(conn.conn())
+ .ok()
+ .flatten()
+ }
+
+ /// Reads the etag from an existing nest metadata database.
+ fn read_nest_etag(&self, nest_name: &str) -> Option {
+ let nests_repo_path = self.config().get_repositories_path().ok()?.join("nests");
+ let nest_path = nests_repo_path.join(nest_name);
+ let metadata_db = nest_path.join("metadata.db");
+
+ if !metadata_db.exists() {
+ return None;
+ }
+
+ let mut conn = DbConnection::open(&metadata_db, DbType::Metadata).ok()?;
+ MetadataRepository::get_repo_etag(conn.conn())
+ .ok()
+ .flatten()
+ }
+
+ /// Returns the diesel-based core database connection.
+ pub fn diesel_core_db(&self) -> SoarResult<&DieselDatabase> {
+ self.inner
+ .diesel_core_db
+ .get_or_try_init(|| self.create_diesel_core_db())
+ }
+
+ /// Returns the metadata manager for querying package metadata across all repos.
+ pub async fn metadata_manager(&self) -> SoarResult<&MetadataManager> {
+ self.inner
+ .metadata_manager
+ .get_or_try_init(|| {
+ async {
+ self.init_repo_dbs(false).await?;
+ self.sync_nests(false).await?;
+ self.create_metadata_manager()
+ }
+ })
+ .await
+ }
+}
diff --git a/soar-cli/src/update.rs b/crates/soar-cli/src/update.rs
similarity index 50%
rename from soar-cli/src/update.rs
rename to crates/soar-cli/src/update.rs
index c716ab60..42031bd5 100644
--- a/soar-cli/src/update.rs
+++ b/crates/soar-cli/src/update.rs
@@ -1,46 +1,47 @@
-use std::{
- fs,
- path::Path,
- sync::{atomic::Ordering, Arc, Mutex},
-};
+use std::sync::{atomic::Ordering, Arc};
-use rusqlite::{prepare_and_bind, Connection};
+use nu_ansi_term::Color::{Cyan, Green, Red};
use soar_core::{
database::{
+ connection::DieselDatabase,
models::{InstalledPackage, Package},
- packages::{FilterCondition, PackageQueryBuilder},
},
- error::{ErrorContext, SoarError},
- package::{install::InstallTarget, query::PackageQuery},
+ error::SoarError,
+ package::{install::InstallTarget, query::PackageQuery, update::remove_old_versions},
SoarResult,
};
+use soar_db::repository::{
+ core::{CoreRepository, SortDirection},
+ metadata::MetadataRepository,
+};
+use tabled::{
+ builder::Builder,
+ settings::{themes::BorderCorrection, Panel, Style},
+};
use tracing::{error, info, warn};
use crate::{
install::{create_install_context, install_single_package, InstallContext},
progress::{self, create_progress_bar},
state::AppState,
- utils::ask_target_action,
+ utils::{ask_target_action, display_settings, icon_or, Colored, Icons},
};
fn get_existing(
package: &Package,
- core_db: Arc>,
+ diesel_db: &DieselDatabase,
) -> SoarResult> {
- let existing = PackageQueryBuilder::new(core_db)
- .where_and("repo_name", FilterCondition::Eq(package.repo_name.clone()))
- .where_and("pkg_name", FilterCondition::Eq(package.pkg_name.clone()))
- .where_and("pkg_id", FilterCondition::Eq(package.pkg_id.clone()))
- .where_and("version", FilterCondition::Eq(package.version.clone()))
- .limit(1)
- .load_installed()?
- .items;
-
- if existing.is_empty() {
- Ok(None)
- } else {
- Ok(Some(existing[0].clone()))
- }
+ let existing = diesel_db.with_conn(|conn| {
+ CoreRepository::find_exact(
+ conn,
+ &package.repo_name,
+ &package.pkg_name,
+ &package.pkg_id,
+ &package.version,
+ )
+ })?;
+
+ Ok(existing.map(Into::into))
}
pub async fn update_packages(
@@ -50,8 +51,8 @@ pub async fn update_packages(
no_verify: bool,
) -> SoarResult<()> {
let state = AppState::new();
- let core_db = state.core_db()?;
- let repo_db = state.repo_db().await?;
+ let metadata_mgr = state.metadata_manager().await?;
+ let diesel_db = state.diesel_core_db()?.clone();
let config = state.config();
let mut update_targets = Vec::new();
@@ -59,39 +60,46 @@ pub async fn update_packages(
if let Some(packages) = packages {
for package in packages {
let query = PackageQuery::try_from(package.as_str())?;
- let builder = PackageQueryBuilder::new(core_db.clone());
- let mut builder = query.apply_filters(builder.clone()).limit(1);
- let installed_pkgs = builder
- .clone()
- .where_and("is_installed", FilterCondition::Eq("1".to_string()))
- .load_installed()?
- .items;
- builder = builder.database(repo_db.clone());
- for pkg in installed_pkgs {
- builder = builder
- .where_and("repo_name", FilterCondition::Eq(pkg.repo_name.clone()))
- .where_and("version", FilterCondition::Gt(pkg.version.clone()))
- .where_and(
- &format!(
- "(version > '{}' OR version LIKE 'HEAD-%' AND substr(version, 14) > '{}')",
- pkg.version,
- if pkg.version.starts_with("HEAD-") && pkg.version.len() > 13 {
- &pkg.version[14..]
- } else {
- ""
- }
- ),
- FilterCondition::None,
+ let installed_pkgs: Vec = diesel_db
+ .with_conn(|conn| {
+ CoreRepository::list_filtered(
+ conn,
+ query.repo_name.as_deref(),
+ query.name.as_deref(),
+ query.pkg_id.as_deref(),
+ query.version.as_deref(),
+ Some(true), // is_installed
+ None,
+ Some(1),
+ Some(SortDirection::Asc),
)
- .limit(1);
- let new_pkg: Vec = builder.load()?.items;
+ })?
+ .into_iter()
+ .map(Into::into)
+ .collect();
- if !new_pkg.is_empty() {
+ for pkg in installed_pkgs {
+ let new_pkg: Option = metadata_mgr
+ .query_repo(&pkg.repo_name, |conn| {
+ MetadataRepository::find_newer_version(
+ conn,
+ &pkg.pkg_name,
+ &pkg.pkg_id,
+ &pkg.version,
+ )
+ })?
+ .flatten()
+ .map(|p| {
+ let mut package: Package = p.into();
+ package.repo_name = pkg.repo_name.clone();
+ package
+ });
+
+ if let Some(package) = new_pkg {
let with_pkg_id = pkg.with_pkg_id;
- let package = new_pkg.first().unwrap().clone();
- let existing_install = get_existing(&package, core_db.clone())?;
+ let existing_install = get_existing(&package, &diesel_db)?;
if let Some(ref existing_install) = existing_install {
if existing_install.is_installed {
continue;
@@ -102,6 +110,7 @@ pub async fn update_packages(
package,
existing_install,
with_pkg_id,
+ pinned: pkg.pinned,
profile: Some(pkg.profile),
portable: pkg.portable_path,
portable_home: pkg.portable_home,
@@ -113,38 +122,33 @@ pub async fn update_packages(
}
}
} else {
- let installed_packages = PackageQueryBuilder::new(core_db.clone())
- .where_and("is_installed", FilterCondition::Eq("1".to_string()))
- .where_and("pinned", FilterCondition::Eq(String::from("0")))
- .load_installed()?
- .items;
+ let installed_packages: Vec = diesel_db
+ .with_conn(CoreRepository::list_updatable)?
+ .into_iter()
+ .map(Into::into)
+ .collect();
for pkg in installed_packages {
- let new_pkg: Vec = PackageQueryBuilder::new(repo_db.clone())
- .where_and("repo_name", FilterCondition::Eq(pkg.repo_name.clone()))
- .where_and("pkg_name", FilterCondition::Eq(pkg.pkg_name.clone()))
- .where_and("pkg_id", FilterCondition::Eq(pkg.pkg_id.clone()))
- .where_and(
- &format!(
- "(version > '{}' OR version LIKE 'HEAD-%' AND substr(version, 14) > '{}')",
- pkg.version,
- if pkg.version.starts_with("HEAD-") && pkg.version.len() > 13 {
- &pkg.version[14..]
- } else {
- ""
- }
- ),
- FilterCondition::None,
- )
- .limit(1)
- .load()?
- .items;
-
- if !new_pkg.is_empty() {
+ let new_pkg: Option = metadata_mgr
+ .query_repo(&pkg.repo_name, |conn| {
+ MetadataRepository::find_newer_version(
+ conn,
+ &pkg.pkg_name,
+ &pkg.pkg_id,
+ &pkg.version,
+ )
+ })?
+ .flatten()
+ .map(|p| {
+ let mut package: Package = p.into();
+ package.repo_name = pkg.repo_name.clone();
+ package
+ });
+
+ if let Some(package) = new_pkg {
let with_pkg_id = pkg.with_pkg_id;
- let package = new_pkg.first().unwrap().clone();
- let existing_install = get_existing(&package, core_db.clone())?;
+ let existing_install = get_existing(&package, &diesel_db)?;
if let Some(ref existing_install) = existing_install {
if existing_install.is_installed {
continue;
@@ -155,6 +159,7 @@ pub async fn update_packages(
package,
existing_install,
with_pkg_id,
+ pinned: pkg.pinned,
profile: Some(pkg.profile),
portable: pkg.portable_path,
portable_home: pkg.portable_home,
@@ -187,7 +192,7 @@ pub async fn update_packages(
no_verify,
);
- perform_update(ctx, update_targets, core_db.clone(), keep).await?;
+ perform_update(ctx, update_targets, diesel_db, keep).await?;
Ok(())
}
@@ -195,7 +200,7 @@ pub async fn update_packages(
async fn perform_update(
ctx: InstallContext,
targets: Vec,
- core_db: Arc>,
+ diesel_db: DieselDatabase,
keep: bool,
) -> SoarResult<()> {
let mut handles = Vec::new();
@@ -205,7 +210,7 @@ async fn perform_update(
let handle = spawn_update_task(
&ctx,
target.clone(),
- core_db.clone(),
+ diesel_db.clone(),
idx,
fixed_width,
keep,
@@ -228,11 +233,57 @@ async fn perform_update(
for error in ctx.errors.lock().unwrap().iter() {
error!("{error}");
}
- info!(
- "Updated {}/{} packages",
- ctx.installed_count.load(Ordering::Relaxed),
- ctx.total_packages
- );
+
+ let updated_count = ctx.installed_count.load(Ordering::Relaxed);
+ let failed_count = ctx.failed.load(Ordering::Relaxed);
+ let settings = display_settings();
+
+ if settings.icons() {
+ let mut builder = Builder::new();
+
+ if updated_count > 0 {
+ builder.push_record([
+ format!("{} Updated", icon_or(Icons::CHECK, "+")),
+ format!(
+ "{}/{}",
+ Colored(Green, updated_count),
+ Colored(Cyan, ctx.total_packages)
+ ),
+ ]);
+ }
+ if failed_count > 0 {
+ builder.push_record([
+ format!("{} Failed", icon_or(Icons::CROSS, "!")),
+ format!("{}", Colored(Red, failed_count)),
+ ]);
+ }
+ if updated_count == 0 && failed_count == 0 {
+ builder.push_record([
+ format!("{} Status", icon_or(Icons::WARNING, "!")),
+ "No packages updated".to_string(),
+ ]);
+ }
+
+ let table = builder
+ .build()
+ .with(Panel::header("Update Summary"))
+ .with(Style::rounded())
+ .with(BorderCorrection {})
+ .to_string();
+
+ info!("\n{table}");
+ } else {
+ info!(
+ "Updated {}/{} packages{}",
+ updated_count,
+ ctx.total_packages,
+ if failed_count > 0 {
+ format!(", {} failed", failed_count)
+ } else {
+ String::new()
+ }
+ );
+ }
Ok(())
}
@@ -240,7 +291,7 @@ async fn perform_update(
async fn spawn_update_task(
ctx: &InstallContext,
target: InstallTarget,
- core_db: Arc>,
+ diesel_db: DieselDatabase,
idx: usize,
fixed_width: usize,
keep: bool,
@@ -278,7 +329,7 @@ async fn spawn_update_task(
tokio::spawn(async move {
let result =
- install_single_package(&ctx, &target, progress_callback, core_db.clone()).await;
+ install_single_package(&ctx, &target, progress_callback, diesel_db.clone()).await;
if let Err(err) = result {
match err {
@@ -287,7 +338,7 @@ async fn spawn_update_task(
warnings.push(err);
if !keep {
- let _ = remove_old_package(&target.package, core_db.clone());
+ let _ = remove_old_versions(&target.package, &diesel_db);
}
}
_ => {
@@ -300,79 +351,10 @@ async fn spawn_update_task(
total_pb.inc(1);
if !keep {
- let _ = remove_old_package(&target.package, core_db.clone());
+ let _ = remove_old_versions(&target.package, &diesel_db);
}
}
drop(permit);
})
}
-
-fn remove_old_package(package: &Package, core_db: Arc>) -> SoarResult<()> {
- let conn = core_db.lock()?;
-
- let Package {
- pkg_id,
- pkg_name,
- repo_name,
- ..
- } = package;
-
- let mut stmt = conn.prepare(
- "SELECT installed_path
- FROM packages
- WHERE
- pkg_id = ?
- AND pkg_name = ?
- AND repo_name = ?
- AND pinned = 0
- AND rowid NOT IN (
- SELECT rowid
- FROM packages
- WHERE
- pkg_id = ?
- AND pkg_name = ?
- AND repo_name = ?
- ORDER BY rowid DESC
- LIMIT 1
- )",
- )?;
-
- let paths: Vec = stmt
- .query_map(
- [pkg_id, pkg_name, repo_name, pkg_id, pkg_name, repo_name],
- |row| row.get(0),
- )?
- .filter_map(Result::ok)
- .collect();
-
- for path in paths {
- let path = Path::new(&path);
- if path.exists() {
- fs::remove_dir_all(path)
- .with_context(|| format!("removing directory {}", path.display()))?;
- }
- }
-
- let mut stmt = prepare_and_bind!(
- conn,
- "DELETE FROM packages
- WHERE rowid NOT IN (
- SELECT rowid
- FROM packages
- WHERE
- repo_name = $repo_name
- AND pkg_id = $pkg_id
- AND pkg_name = $pkg_name
- ORDER BY rowid DESC
- LIMIT 1
- )
- AND pkg_id = $pkg_id
- AND pkg_name = $pkg_name
- AND pinned = 0
- "
- );
- stmt.raw_execute()?;
-
- Ok(())
-}
diff --git a/crates/soar-cli/src/use.rs b/crates/soar-cli/src/use.rs
new file mode 100644
index 00000000..84d22ae7
--- /dev/null
+++ b/crates/soar-cli/src/use.rs
@@ -0,0 +1,159 @@
+use std::path::PathBuf;
+
+use indicatif::HumanBytes;
+use nu_ansi_term::Color::{Blue, Cyan, Magenta, Red};
+use soar_config::config::get_config;
+use soar_core::{database::models::Package, SoarResult};
+use soar_db::repository::{
+ core::{CoreRepository, SortDirection},
+ metadata::MetadataRepository,
+};
+use soar_package::{formats::common::setup_portable_dir, integrate_package};
+use tracing::info;
+
+use crate::{
+ state::AppState,
+ utils::{get_valid_selection, has_desktop_integration, mangle_package_symlinks, Colored},
+};
+
+pub async fn use_alternate_package(name: &str) -> SoarResult<()> {
+ let state = AppState::new();
+ let diesel_db = state.diesel_core_db()?;
+
+ let packages = diesel_db.with_conn(|conn| {
+ CoreRepository::list_filtered(
+ conn,
+ None,
+ Some(name),
+ None,
+ None,
+ None,
+ None,
+ None,
+ Some(SortDirection::Asc),
+ )
+ })?;
+
+ if packages.is_empty() {
+ info!("Package is not installed");
+ return Ok(());
+ }
+
+ for (idx, package) in packages.iter().enumerate() {
+ info!(
+ active = !package.unlinked,
+ pkg_name = package.pkg_name,
+ pkg_id = package.pkg_id,
+ repo_name = package.repo_name,
+ pkg_type = package.pkg_type,
+ version = package.version,
+ size = package.size,
+ "[{}] {}#{}:{} ({}-{}) ({}){}",
+ idx + 1,
+ Colored(Blue, &package.pkg_name),
+ Colored(Cyan, &package.pkg_id),
+ Colored(Cyan, &package.repo_name),
+ package
+ .pkg_type
+ .as_ref()
+ .map(|pkg_type| format!(":{}", Colored(Magenta, &pkg_type)))
+ .unwrap_or_default(),
+ Colored(Magenta, &package.version),
+ Colored(Magenta, HumanBytes(package.size as u64)),
+ package
+ .unlinked
+ .then(String::new)
+ .unwrap_or_else(|| format!(" {}", Colored(Red, "*")))
+ );
+ }
+
+ if packages.len() == 1 {
+ return Ok(());
+ }
+
+ let selection = get_valid_selection(packages.len())?;
+ let selected_package = packages.into_iter().nth(selection).unwrap();
+
+ let pkg_name = &selected_package.pkg_name;
+ let pkg_id = &selected_package.pkg_id;
+ let checksum = selected_package.checksum.as_deref();
+
+ diesel_db.transaction(|conn| {
+ CoreRepository::unlink_others_by_checksum(conn, pkg_name, pkg_id, checksum)
+ })?;
+
+ let bin_dir = get_config().get_bin_path()?;
+ let install_dir = PathBuf::from(&selected_package.installed_path);
+
+ let _ = mangle_package_symlinks(&install_dir, &bin_dir, selected_package.provides.as_deref())
+ .await?;
+
+ let metadata_mgr = state.metadata_manager().await?;
+ let pkg: Vec = metadata_mgr
+ .query_repo(&selected_package.repo_name, |conn| {
+ MetadataRepository::find_filtered(
+ conn,
+ Some(name),
+ Some(&selected_package.pkg_id),
+ None,
+ Some(1),
+ None,
+ )
+ })?
+ .unwrap_or_default()
+ .into_iter()
+ .map(|p| {
+ let mut package: Package = p.into();
+ package.repo_name = selected_package.repo_name.clone();
+ package
+ })
+ .collect();
+
+ let installed_pkg: soar_core::database::models::InstalledPackage = selected_package.into();
+
+ let has_portable = installed_pkg.portable_path.is_some()
+ || installed_pkg.portable_home.is_some()
+ || installed_pkg.portable_config.is_some()
+ || installed_pkg.portable_share.is_some()
+ || installed_pkg.portable_cache.is_some();
+
+ if !pkg.is_empty() && pkg.iter().all(has_desktop_integration) {
+ integrate_package(
+ &install_dir,
+ &installed_pkg,
+ installed_pkg.portable_path.as_deref(),
+ installed_pkg.portable_home.as_deref(),
+ installed_pkg.portable_config.as_deref(),
+ installed_pkg.portable_share.as_deref(),
+ installed_pkg.portable_cache.as_deref(),
+ )
+ .await?;
+ } else if has_portable {
+ let bin_path = install_dir.join(&installed_pkg.pkg_name);
+ setup_portable_dir(
+ &bin_path,
+ &installed_pkg,
+ installed_pkg.portable_path.as_deref(),
+ installed_pkg.portable_home.as_deref(),
+ installed_pkg.portable_config.as_deref(),
+ installed_pkg.portable_share.as_deref(),
+ installed_pkg.portable_cache.as_deref(),
+ )?;
+ }
+
+ diesel_db.transaction(|conn| {
+ CoreRepository::link_by_checksum(
+ conn,
+ &installed_pkg.pkg_name,
+ &installed_pkg.pkg_id,
+ installed_pkg.checksum.as_deref(),
+ )
+ })?;
+
+ info!(
+ "Switched to {}#{}",
+ installed_pkg.pkg_name, installed_pkg.pkg_id
+ );
+
+ Ok(())
+}
diff --git a/soar-cli/src/utils.rs b/crates/soar-cli/src/utils.rs
similarity index 89%
rename from soar-cli/src/utils.rs
rename to crates/soar-cli/src/utils.rs
index ad8c2af8..19ec1c92 100644
--- a/soar-cli/src/utils.rs
+++ b/crates/soar-cli/src/utils.rs
@@ -11,19 +11,53 @@ use std::{
use indicatif::HumanBytes;
use nu_ansi_term::Color::{self, Blue, Cyan, Green, LightRed, Magenta, Red};
use serde::Serialize;
-use soar_config::{config::get_config, repository::get_platform_repositories};
+use soar_config::{
+ config::get_config, display::DisplaySettings, repository::get_platform_repositories,
+};
use soar_core::{
- database::{
- models::{Package, PackageExt},
- packages::{PackageProvide, ProvideStrategy},
- },
+ database::models::Package,
error::{ErrorContext, SoarError},
package::install::InstallTarget,
SoarResult,
};
+use soar_db::models::types::{PackageProvide, ProvideStrategy};
+use soar_package::PackageExt;
use soar_utils::{fs::is_elf, system::platform};
use tracing::{error, info};
+pub struct Icons;
+
+impl Icons {
+ pub const ARROW: &str = "→";
+ pub const BROKEN: &str = "✗";
+ pub const CHECK: &str = "✓";
+ pub const CROSS: &str = "✗";
+ pub const INSTALLED: &str = "✓";
+ pub const NOT_INSTALLED: &str = "○";
+ pub const PACKAGE: &str = "📦";
+ pub const SIZE: &str = "💾";
+ pub const VERSION: &str = "🏷";
+ pub const WARNING: &str = "⚠";
+}
+
+pub fn icon_or<'a>(icon: &'a str, fallback: &'a str) -> &'a str {
+ if get_config().display().icons() {
+ icon
+ } else {
+ fallback
+ }
+}
+
+pub fn display_settings() -> DisplaySettings {
+ get_config().display()
+}
+
+pub fn term_width() -> usize {
+ terminal_size::terminal_size()
+ .map(|(w, _)| w.0 as usize)
+ .unwrap_or(80)
+}
+
pub static COLOR: LazyLock> = LazyLock::new(|| RwLock::new(true));
pub fn interactive_ask(ques: &str) -> SoarResult {
diff --git a/crates/soar-config/src/config.rs b/crates/soar-config/src/config.rs
index bc0cb6a7..4a67d685 100644
--- a/crates/soar-config/src/config.rs
+++ b/crates/soar-config/src/config.rs
@@ -17,6 +17,7 @@ use tracing::{info, warn};
use crate::{
annotations::{annotate_toml_array_of_tables, annotate_toml_table},
+ display::DisplaySettings,
error::{ConfigError, Result},
profile::Profile,
repository::{get_platform_repositories, Repository},
@@ -90,6 +91,9 @@ pub struct Config {
/// Sync interval for nests
pub nests_sync_interval: Option,
+
+ /// Display settings for output formatting
+ pub display: Option,
}
pub static CONFIG: LazyLock>> = LazyLock::new(|| RwLock::new(None));
@@ -225,6 +229,7 @@ impl Config {
desktop_integration: None,
sync_interval: None,
nests_sync_interval: None,
+ display: None,
}
}
@@ -287,9 +292,7 @@ impl Config {
if repo.desktop_integration.is_none() {
match repo.name.as_str() {
"bincache" => repo.desktop_integration = Some(false),
- "pkgcache" | "ivan-hc-am" | "appimage.github.io" => {
- repo.desktop_integration = Some(true)
- }
+ "pkgcache" => repo.desktop_integration = Some(true),
_ => {}
}
}
@@ -406,6 +409,10 @@ impl Config {
.is_some_and(|repo| repo.desktop_integration.unwrap_or(false))
}
+ pub fn display(&self) -> DisplaySettings {
+ self.display.clone().unwrap_or_default()
+ }
+
pub fn save(&self) -> Result<()> {
let config_path = CONFIG_PATH.read().unwrap().to_path_buf();
let serialized = toml::to_string_pretty(self)?;
@@ -493,17 +500,6 @@ mod tests {
assert!(config.repositories.iter().any(|r| r.name == "bincache"));
}
- #[test]
- fn test_default_config_external_repos() {
- let config = Config::default_config::<&str>(true, &[]);
-
- let has_external = config
- .repositories
- .iter()
- .any(|r| r.name == "ivan-hc-am" || r.name == "appimage-github-io");
- assert!(has_external || config.repositories.is_empty()); // depends on platform
- }
-
#[test]
fn test_config_resolve_missing_default_profile() {
let mut config = Config::default_config::<&str>(false, &[]);
diff --git a/crates/soar-config/src/display.rs b/crates/soar-config/src/display.rs
new file mode 100644
index 00000000..17675fb4
--- /dev/null
+++ b/crates/soar-config/src/display.rs
@@ -0,0 +1,44 @@
+use documented::{Documented, DocumentedFields};
+use serde::{Deserialize, Serialize};
+
+/// Display settings for CLI output formatting
+#[derive(Clone, Debug, Default, Deserialize, Serialize, Documented, DocumentedFields)]
+pub struct DisplaySettings {
+ /// Progress bar style: "classic", "modern", or "minimal"
+ /// Default: "modern"
+ pub progress_style: Option,
+
+ /// Show unicode icons/symbols in output
+ /// Default: true
+ pub icons: Option,
+
+ /// Show spinners for async operations
+ /// Default: true
+ pub spinners: Option,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum ProgressStyle {
+ /// Classic ASCII progress bar (=>)
+ Classic,
+ /// Modern unicode progress bar with spinner and ETA
+ #[default]
+ Modern,
+ /// Minimal percentage-only display
+ Minimal,
+}
+
+impl DisplaySettings {
+ pub fn progress_style(&self) -> ProgressStyle {
+ self.progress_style.clone().unwrap_or_default()
+ }
+
+ pub fn icons(&self) -> bool {
+ self.icons.unwrap_or(true)
+ }
+
+ pub fn spinners(&self) -> bool {
+ self.spinners.unwrap_or(true)
+ }
+}
diff --git a/crates/soar-config/src/lib.rs b/crates/soar-config/src/lib.rs
index bf870e74..1a79103d 100644
--- a/crates/soar-config/src/lib.rs
+++ b/crates/soar-config/src/lib.rs
@@ -1,5 +1,6 @@
pub mod annotations;
pub mod config;
+pub mod display;
pub mod error;
pub mod profile;
pub mod repository;
diff --git a/crates/soar-config/src/repository.rs b/crates/soar-config/src/repository.rs
index dfc30829..4600c024 100644
--- a/crates/soar-config/src/repository.rs
+++ b/crates/soar-config/src/repository.rs
@@ -106,48 +106,6 @@ pub fn get_platform_repositories() -> Vec {
is_core: true,
..DefaultRepositoryInfo::default()
},
- DefaultRepositoryInfo {
- name: "pkgforge-cargo",
- url_template: "https://meta.pkgforge.dev/external/pkgforge-cargo/{}.sdb.zstd",
- desktop_integration: Some(false),
- platforms: vec![
- "aarch64-Linux",
- "loongarch64-Linux",
- "riscv64-Linux",
- "x86_64-Linux",
- ],
- is_core: true,
- ..DefaultRepositoryInfo::default()
- },
- DefaultRepositoryInfo {
- name: "pkgforge-go",
- url_template: "https://meta.pkgforge.dev/external/pkgforge-go/{}.sdb.zstd",
- desktop_integration: Some(false),
- platforms: vec![
- "aarch64-Linux",
- "loongarch64-Linux",
- "riscv64-Linux",
- "x86_64-Linux",
- ],
- is_core: true,
- ..DefaultRepositoryInfo::default()
- },
- DefaultRepositoryInfo {
- name: "ivan-hc-am",
- url_template: "https://meta.pkgforge.dev/external/am/{}.sdb.zstd",
- desktop_integration: Some(true),
- platforms: vec!["x86_64-Linux"],
- is_core: false,
- ..DefaultRepositoryInfo::default()
- },
- DefaultRepositoryInfo {
- name: "appimage-github-io",
- url_template: "https://meta.pkgforge.dev/external/appimage.github.io/{}.sdb.zstd",
- desktop_integration: Some(true),
- platforms: vec!["aarch64-Linux", "x86_64-Linux"],
- is_core: false,
- ..DefaultRepositoryInfo::default()
- },
]
}
diff --git a/soar-core/CHANGELOG.md b/crates/soar-core/CHANGELOG.md
similarity index 100%
rename from soar-core/CHANGELOG.md
rename to crates/soar-core/CHANGELOG.md
diff --git a/soar-core/Cargo.toml b/crates/soar-core/Cargo.toml
similarity index 80%
rename from soar-core/Cargo.toml
rename to crates/soar-core/Cargo.toml
index 2b51e8a1..06958083 100644
--- a/soar-core/Cargo.toml
+++ b/crates/soar-core/Cargo.toml
@@ -11,18 +11,19 @@ readme.workspace = true
categories.workspace = true
[dependencies]
-include_dir = "0.7.4"
+chrono = "0.4"
+diesel = { workspace = true }
+miette = { workspace = true }
nix = { version = "0.30.1", features = ["ioctl", "term", "user"] }
regex = { workspace = true }
-rusqlite = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
soar-config = { workspace = true }
+soar-db = { workspace = true }
soar-dl = { workspace = true }
soar-package = { workspace = true }
-soar-registry = { workspace = true }
soar-utils = { workspace = true }
-thiserror = "2.0.16"
-toml = "0.9.6"
+thiserror = { workspace = true }
+toml = "0.9.10"
tracing = { workspace = true }
ureq = { workspace = true }
diff --git a/crates/soar-core/src/constants.rs b/crates/soar-core/src/constants.rs
new file mode 100644
index 00000000..cda636d9
--- /dev/null
+++ b/crates/soar-core/src/constants.rs
@@ -0,0 +1,10 @@
+//! Constants used throughout soar-core.
+
+/// Magic bytes for XML files.
+pub const XML_MAGIC_BYTES: [u8; 5] = [0x3c, 0x3f, 0x78, 0x6d, 0x6c];
+
+/// Linux capability for CAP_SYS_ADMIN.
+pub const CAP_SYS_ADMIN: i32 = 21;
+
+/// Linux capability for CAP_MKNOD.
+pub const CAP_MKNOD: i32 = 27;
diff --git a/crates/soar-core/src/database/connection.rs b/crates/soar-core/src/database/connection.rs
new file mode 100644
index 00000000..86337b0c
--- /dev/null
+++ b/crates/soar-core/src/database/connection.rs
@@ -0,0 +1,179 @@
+//! Database connection management.
+
+use std::{
+ path::Path,
+ sync::{Arc, Mutex},
+};
+
+use diesel::Connection as DieselConnection;
+use soar_db::{connection::DbConnection, migration::DbType};
+
+use crate::error::SoarError;
+
+type Result = std::result::Result;
+
+/// Diesel-based database connection wrapper.
+/// Provides a thread-safe wrapper around soar_db::DbConnection.
+pub struct DieselDatabase {
+ conn: Arc>,
+}
+
+impl DieselDatabase {
+ /// Opens a core database connection with migrations.
+ pub fn open_core>(path: P) -> Result {
+ let conn = DbConnection::open(path, DbType::Core)
+ .map_err(|e| SoarError::Custom(format!("opening core database: {}", e)))?;
+ Ok(Self {
+ conn: Arc::new(Mutex::new(conn)),
+ })
+ }
+
+ /// Opens a metadata database connection.
+ pub fn open_metadata>(path: P) -> Result {
+ let conn = DbConnection::open_metadata(path)
+ .map_err(|e| SoarError::Custom(format!("opening metadata database: {}", e)))?;
+ Ok(Self {
+ conn: Arc::new(Mutex::new(conn)),
+ })
+ }
+
+ /// Opens a nests database connection with migrations.
+ pub fn open_nests>(path: P) -> Result {
+ let conn = DbConnection::open(path, DbType::Nest)
+ .map_err(|e| SoarError::Custom(format!("opening nests database: {}", e)))?;
+ Ok(Self {
+ conn: Arc::new(Mutex::new(conn)),
+ })
+ }
+
+ /// Gets a mutable reference to the underlying connection.
+ /// Locks the mutex and returns a guard.
+ pub fn conn(&self) -> Result> {
+ self.conn.lock().map_err(|_| SoarError::PoisonError)
+ }
+
+ /// Executes a function with the connection.
+ pub fn with_conn(&self, f: F) -> Result
+ where
+ F: FnOnce(&mut diesel::SqliteConnection) -> diesel::QueryResult,
+ {
+ let mut conn = self.conn.lock().map_err(|_| SoarError::PoisonError)?;
+ f(conn.conn()).map_err(|e| SoarError::Custom(format!("database error: {}", e)))
+ }
+
+ /// Executes a function within a transaction.
+ pub fn transaction(&self, f: F) -> Result
+ where
+ F: FnOnce(&mut diesel::SqliteConnection) -> diesel::QueryResult,
+ {
+ let mut conn = self.conn.lock().map_err(|_| SoarError::PoisonError)?;
+ conn.conn()
+ .transaction(f)
+ .map_err(|e| SoarError::Custom(format!("transaction error: {}", e)))
+ }
+
+ /// Gets a clone of the Arc for sharing.
+ pub fn clone_arc(&self) -> Arc> {
+ self.conn.clone()
+ }
+}
+
+impl Clone for DieselDatabase {
+ fn clone(&self) -> Self {
+ Self {
+ conn: self.conn.clone(),
+ }
+ }
+}
+
+/// Manager for multiple metadata databases (one per repository).
+/// Replaces the ATTACH DATABASE pattern with separate connections.
+pub struct MetadataManager {
+ databases: Vec<(String, DieselDatabase)>,
+}
+
+impl MetadataManager {
+ pub fn new() -> Self {
+ Self {
+ databases: Vec::new(),
+ }
+ }
+
+ /// Adds a metadata database for a repository.
+ pub fn add_repo>(&mut self, repo_name: &str, path: P) -> Result<()> {
+ let db = DieselDatabase::open_metadata(path)?;
+ self.databases.push((repo_name.to_string(), db));
+ Ok(())
+ }
+
+ /// Executes a query function across all repositories and collects results.
+ pub fn query_all(&self, f: F) -> Result>
+ where
+ F: Fn(&str, &mut diesel::SqliteConnection) -> diesel::QueryResult,
+ {
+ let mut results = Vec::new();
+ for (repo_name, db) in &self.databases {
+ let result = db.with_conn(|conn| f(repo_name, conn))?;
+ results.push((repo_name.clone(), result));
+ }
+ Ok(results)
+ }
+
+ /// Queries all repositories and flattens results into a single Vec.
+ pub fn query_all_flat(&self, f: F) -> Result>
+ where
+ F: Fn(&str, &mut diesel::SqliteConnection) -> diesel::QueryResult>,
+ {
+ let mut results = Vec::new();
+ for (repo_name, db) in &self.databases {
+ let items = db.with_conn(|conn| f(repo_name, conn))?;
+ results.extend(items);
+ }
+ Ok(results)
+ }
+
+ /// Queries a specific repository.
+ pub fn query_repo(&self, repo_name: &str, f: F) -> Result>
+ where
+ F: FnOnce(&mut diesel::SqliteConnection) -> diesel::QueryResult,
+ {
+ for (name, db) in &self.databases {
+ if name == repo_name {
+ return db.with_conn(f).map(Some);
+ }
+ }
+ Ok(None)
+ }
+
+ /// Gets the first match from any repository.
+ pub fn find_first(&self, f: F) -> Result>
+ where
+ F: Fn(&str, &mut diesel::SqliteConnection) -> diesel::QueryResult>,
+ {
+ for (repo_name, db) in &self.databases {
+ if let Some(result) = db.with_conn(|conn| f(repo_name, conn))? {
+ return Ok(Some(result));
+ }
+ }
+ Ok(None)
+ }
+
+ /// Returns the number of repositories.
+ pub fn repo_count(&self) -> usize {
+ self.databases.len()
+ }
+
+ /// Returns the list of repository names.
+ pub fn repo_names(&self) -> Vec<&str> {
+ self.databases
+ .iter()
+ .map(|(name, _)| name.as_str())
+ .collect()
+ }
+}
+
+impl Default for MetadataManager {
+ fn default() -> Self {
+ Self::new()
+ }
+}
diff --git a/crates/soar-core/src/database/mod.rs b/crates/soar-core/src/database/mod.rs
new file mode 100644
index 00000000..6a9dd9b0
--- /dev/null
+++ b/crates/soar-core/src/database/mod.rs
@@ -0,0 +1,2 @@
+pub mod connection;
+pub mod models;
diff --git a/crates/soar-core/src/database/models.rs b/crates/soar-core/src/database/models.rs
new file mode 100644
index 00000000..4cbf7a00
--- /dev/null
+++ b/crates/soar-core/src/database/models.rs
@@ -0,0 +1,258 @@
+//! Database models for soar-core.
+
+use std::fmt::Display;
+
+use serde::{Deserialize, Serialize};
+use soar_db::{models::types::PackageProvide, repository::core::InstalledPackageWithPortable};
+use soar_package::PackageExt;
+
+/// Package maintainer information.
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Maintainer {
+ pub name: String,
+ pub contact: String,
+}
+
+impl Display for Maintainer {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "{} ({})", self.name, self.contact)
+ }
+}
+
+/// Remote package metadata from repository.
+#[derive(Debug, Clone, Default)]
+pub struct Package {
+ pub id: u64,
+ pub repo_name: String,
+ pub disabled: Option,
+ pub disabled_reason: Option,
+ pub pkg_id: String,
+ pub pkg_name: String,
+ pub pkg_family: Option,
+ pub pkg_type: Option,
+ pub pkg_webpage: Option,
+ pub app_id: Option,
+ pub description: String,
+ pub version: String,
+ pub version_upstream: Option,
+ pub licenses: Option>,
+ pub download_url: String,
+ pub size: Option,
+ pub ghcr_pkg: Option,
+ pub ghcr_size: Option,
+ pub ghcr_files: Option>,
+ pub ghcr_blob: Option,
+ pub ghcr_url: Option,
+ pub bsum: Option,
+ pub homepages: Option>,
+ pub notes: Option>,
+ pub source_urls: Option>,
+ pub tags: Option>,
+ pub categories: Option>,
+ pub icon: Option,
+ pub desktop: Option,
+ pub appstream: Option,
+ pub build_id: Option,
+ pub build_date: Option,
+ pub build_action: Option,
+ pub build_script: Option,
+ pub build_log: Option,
+ pub provides: Option>,
+ pub snapshots: Option>,
+ pub repology: Option>,
+ pub maintainers: Option>,
+ pub replaces: Option>,
+ pub soar_syms: bool,
+ pub deprecated: bool,
+ pub desktop_integration: Option,
+ pub portable: Option,
+ pub recurse_provides: Option,
+}
+
+impl PackageExt for Package {
+ fn pkg_name(&self) -> &str {
+ &self.pkg_name
+ }
+
+ fn pkg_id(&self) -> &str {
+ &self.pkg_id
+ }
+
+ fn version(&self) -> &str {
+ &self.version
+ }
+
+ fn repo_name(&self) -> &str {
+ &self.repo_name
+ }
+}
+
+/// Installed package record.
+#[derive(Debug, Clone)]
+pub struct InstalledPackage {
+ pub id: u64,
+ pub repo_name: String,
+ pub pkg_id: String,
+ pub pkg_name: String,
+ pub pkg_type: Option,
+ pub version: String,
+ pub size: u64,
+ pub checksum: Option,
+ pub installed_path: String,
+ pub installed_date: String,
+ pub profile: String,
+ pub pinned: bool,
+ pub is_installed: bool,
+ pub with_pkg_id: bool,
+ pub detached: bool,
+ pub unlinked: bool,
+ pub provides: Option>,
+ pub portable_path: Option,
+ pub portable_home: Option,
+ pub portable_config: Option,
+ pub portable_share: Option,
+ pub portable_cache: Option,
+ pub install_patterns: Option>,
+}
+
+impl PackageExt for InstalledPackage {
+ fn pkg_name(&self) -> &str {
+ &self.pkg_name
+ }
+
+ fn pkg_id(&self) -> &str {
+ &self.pkg_id
+ }
+
+ fn version(&self) -> &str {
+ &self.version
+ }
+
+ fn repo_name(&self) -> &str {
+ &self.repo_name
+ }
+}
+
+/// Conversion from soar-db InstalledPackageWithPortable to soar-core InstalledPackage.
+impl From for InstalledPackage {
+ fn from(pkg: InstalledPackageWithPortable) -> Self {
+ Self {
+ id: pkg.id as u64,
+ repo_name: pkg.repo_name,
+ pkg_id: pkg.pkg_id,
+ pkg_name: pkg.pkg_name,
+ pkg_type: pkg.pkg_type,
+ version: pkg.version,
+ size: pkg.size as u64,
+ checksum: pkg.checksum,
+ installed_path: pkg.installed_path,
+ installed_date: pkg.installed_date,
+ profile: pkg.profile,
+ pinned: pkg.pinned,
+ is_installed: pkg.is_installed,
+ with_pkg_id: pkg.with_pkg_id,
+ detached: pkg.detached,
+ unlinked: pkg.unlinked,
+ provides: pkg.provides,
+ portable_path: pkg.portable_path,
+ portable_home: pkg.portable_home,
+ portable_config: pkg.portable_config,
+ portable_share: pkg.portable_share,
+ portable_cache: pkg.portable_cache,
+ install_patterns: pkg.install_patterns,
+ }
+ }
+}
+
+/// Conversion from soar-db core Package to soar-core InstalledPackage.
+impl From for InstalledPackage {
+ fn from(pkg: soar_db::repository::core::InstalledPackage) -> Self {
+ Self {
+ id: pkg.id as u64,
+ repo_name: pkg.repo_name,
+ pkg_id: pkg.pkg_id,
+ pkg_name: pkg.pkg_name,
+ pkg_type: pkg.pkg_type,
+ version: pkg.version,
+ size: pkg.size as u64,
+ checksum: pkg.checksum,
+ installed_path: pkg.installed_path,
+ installed_date: pkg.installed_date,
+ profile: pkg.profile,
+ pinned: pkg.pinned,
+ is_installed: pkg.is_installed,
+ with_pkg_id: pkg.with_pkg_id,
+ detached: pkg.detached,
+ unlinked: pkg.unlinked,
+ provides: pkg.provides,
+ portable_path: None,
+ portable_home: None,
+ portable_config: None,
+ portable_share: None,
+ portable_cache: None,
+ install_patterns: pkg.install_patterns,
+ }
+ }
+}
+
+/// Conversion from soar-db metadata Package to soar-core Package.
+impl From for Package {
+ fn from(pkg: soar_db::models::metadata::Package) -> Self {
+ Self {
+ id: pkg.id as u64,
+ repo_name: String::new(), // Set by caller
+ disabled: None,
+ disabled_reason: None,
+ pkg_id: pkg.pkg_id,
+ pkg_name: pkg.pkg_name,
+ pkg_family: None,
+ pkg_type: pkg.pkg_type,
+ pkg_webpage: pkg.pkg_webpage,
+ app_id: pkg.app_id,
+ description: pkg.description.unwrap_or_default(),
+ version: pkg.version,
+ version_upstream: pkg.version_upstream,
+ licenses: pkg.licenses,
+ download_url: pkg.download_url,
+ size: pkg.size.map(|s| s as u64),
+ ghcr_pkg: pkg.ghcr_pkg,
+ ghcr_size: pkg.ghcr_size.map(|s| s as u64),
+ ghcr_files: None,
+ ghcr_blob: pkg.ghcr_blob,
+ ghcr_url: pkg.ghcr_url,
+ bsum: pkg.bsum,
+ homepages: pkg.homepages,
+ notes: pkg.notes,
+ source_urls: pkg.source_urls,
+ tags: pkg.tags,
+ categories: pkg.categories,
+ icon: pkg.icon,
+ desktop: pkg.desktop,
+ appstream: pkg.appstream,
+ build_id: pkg.build_id,
+ build_date: pkg.build_date,
+ build_action: pkg.build_action,
+ build_script: pkg.build_script,
+ build_log: pkg.build_log,
+ provides: pkg.provides,
+ snapshots: pkg.snapshots,
+ repology: None,
+ maintainers: None,
+ replaces: pkg.replaces,
+ soar_syms: pkg.soar_syms,
+ deprecated: false,
+ desktop_integration: pkg.desktop_integration,
+ portable: pkg.portable,
+ recurse_provides: pkg.recurse_provides,
+ }
+ }
+}
+
+/// Conversion from soar-db PackageWithRepo to soar-core Package.
+impl From for Package {
+ fn from(pkg_with_repo: soar_db::models::metadata::PackageWithRepo) -> Self {
+ let mut pkg: Package = pkg_with_repo.package.into();
+ pkg.repo_name = pkg_with_repo.repo_name;
+ pkg
+ }
+}
diff --git a/soar-core/src/error.rs b/crates/soar-core/src/error.rs
similarity index 50%
rename from soar-core/src/error.rs
rename to crates/soar-core/src/error.rs
index adbc96b4..a8866491 100644
--- a/soar-core/src/error.rs
+++ b/crates/soar-core/src/error.rs
@@ -1,84 +1,139 @@
+//! Error types for soar-core.
+
use std::error::Error;
+use miette::Diagnostic;
use soar_config::error::ConfigError;
use soar_utils::error::{FileSystemError, HashError, PathError};
use thiserror::Error;
-#[derive(Error, Debug)]
+/// Core error type for soar package manager operations.
+#[derive(Error, Diagnostic, Debug)]
pub enum SoarError {
#[error(transparent)]
+ #[diagnostic(transparent)]
Config(#[from] ConfigError),
#[error("System error: {0}")]
+ #[diagnostic(code(soar::system), help("Check system permissions and resources"))]
Errno(#[from] nix::errno::Errno),
- #[error("Environment variable error: {0}")]
+ #[error("Environment variable '{0}' not set")]
+ #[diagnostic(
+ code(soar::env_var),
+ help("Set the required environment variable before running")
+ )]
VarError(#[from] std::env::VarError),
- #[error("{0}")]
+ #[error(transparent)]
+ #[diagnostic(transparent)]
FileSystemError(#[from] FileSystemError),
- #[error("{0}")]
+ #[error(transparent)]
+ #[diagnostic(transparent)]
HashError(#[from] HashError),
- #[error("{0}")]
+ #[error(transparent)]
+ #[diagnostic(transparent)]
PathError(#[from] PathError),
- #[error("IO error while {action}: {source}")]
+ #[error("IO error while {action}")]
+ #[diagnostic(code(soar::io), help("Check file permissions and disk space"))]
IoError {
action: String,
+ #[source]
source: std::io::Error,
},
#[error("System time error: {0}")]
+ #[diagnostic(code(soar::time))]
SystemTimeError(#[from] std::time::SystemTimeError),
#[error("TOML serialization error: {0}")]
+ #[diagnostic(code(soar::toml), help("Check your configuration syntax"))]
TomlError(#[from] toml::ser::Error),
- #[error("SQLite database error: {0}")]
- RusqliteError(#[from] rusqlite::Error),
-
#[error("Database operation failed: {0}")]
+ #[diagnostic(
+ code(soar::database),
+ help("Try running 'soar sync' to refresh the database")
+ )]
DatabaseError(String),
- #[error("HTTP request error: {0:?}")]
+ #[error("HTTP request failed")]
+ #[diagnostic(
+ code(soar::network),
+ help("Check your internet connection and try again")
+ )]
UreqError(#[from] ureq::Error),
- #[error("Download failed: {0}")]
+ #[error(transparent)]
+ #[diagnostic(transparent)]
DownloadError(#[from] soar_dl::error::DownloadError),
- #[error("Package error: {0}")]
+ #[error(transparent)]
+ #[diagnostic(transparent)]
PackageError(#[from] soar_package::PackageError),
#[error("Package integration failed: {0}")]
+ #[diagnostic(
+ code(soar::integration),
+ help("Check if the package format is supported")
+ )]
PackageIntegrationFailed(String),
- #[error("Package {0} not found")]
+ #[error("Package '{0}' not found")]
+ #[diagnostic(
+ code(soar::package_not_found),
+ help("Run 'soar sync' to update package list, or check the package name")
+ )]
PackageNotFound(String),
#[error("Failed to fetch from remote source: {0}")]
+ #[diagnostic(
+ code(soar::fetch),
+ help("Check your internet connection and repository URL")
+ )]
FailedToFetchRemote(String),
#[error("Invalid path specified")]
+ #[diagnostic(
+ code(soar::invalid_path),
+ help("Provide a valid file or directory path")
+ )]
InvalidPath,
#[error("Thread lock poison error")]
+ #[diagnostic(
+ code(soar::poison),
+ help("This is an internal error, please report it")
+ )]
PoisonError,
#[error("Invalid checksum detected")]
+ #[diagnostic(
+ code(soar::checksum),
+ help("The downloaded file may be corrupted. Try downloading again.")
+ )]
InvalidChecksum,
#[error("Invalid package query: {0}")]
+ #[diagnostic(
+ code(soar::invalid_query),
+ help("Use format: name#pkg_id@version:repo (e.g., 'curl', 'curl#bin', 'curl@8.0.0')")
+ )]
InvalidPackageQuery(String),
#[error("{0}")]
+ #[diagnostic(code(soar::error))]
Custom(String),
#[error("{0}")]
+ #[diagnostic(code(soar::warning), severity(warning))]
Warning(String),
#[error("Regex compilation error: {0}")]
+ #[diagnostic(code(soar::regex), help("Check your regex pattern syntax"))]
RegexError(#[from] regex::Error),
}
@@ -96,13 +151,6 @@ impl SoarError {
.map_or_else(|| e.to_string(), |source| source.to_string())
)
}
- Self::RusqliteError(e) => {
- format!(
- "Root cause: {}",
- e.source()
- .map_or_else(|| e.to_string(), |source| source.to_string())
- )
- }
Self::Config(err) => err.to_string(),
_ => self.to_string(),
}
@@ -115,14 +163,15 @@ impl From> for SoarError {
}
}
+/// Trait for adding context to IO errors.
pub trait ErrorContext {
- fn with_context(self, context: C) -> Result
+ fn with_context(self, context: C) -> std::result::Result
where
C: FnOnce() -> String;
}
impl ErrorContext for std::io::Result {
- fn with_context(self, context: C) -> Result
+ fn with_context(self, context: C) -> std::result::Result
where
C: FnOnce() -> String,
{
diff --git a/soar-core/src/lib.rs b/crates/soar-core/src/lib.rs
similarity index 100%
rename from soar-core/src/lib.rs
rename to crates/soar-core/src/lib.rs
diff --git a/soar-core/src/package/install.rs b/crates/soar-core/src/package/install.rs
similarity index 60%
rename from soar-core/src/package/install.rs
rename to crates/soar-core/src/package/install.rs
index b930a7dd..81a341de 100644
--- a/soar-core/src/package/install.rs
+++ b/crates/soar-core/src/package/install.rs
@@ -1,13 +1,17 @@
use std::{
env, fs,
path::{Path, PathBuf},
- sync::{Arc, Mutex},
thread::sleep,
time::Duration,
};
-use rusqlite::{params, prepare_and_bind, Connection};
+use chrono::Utc;
+use serde_json::json;
use soar_config::config::get_config;
+use soar_db::{
+ models::types::ProvideStrategy,
+ repository::core::{CoreRepository, InstalledPackageWithPortable, NewInstalledPackage},
+};
use soar_dl::{
download::Download,
error::DownloadError,
@@ -23,10 +27,7 @@ use soar_utils::{
};
use crate::{
- database::{
- models::{InstalledPackage, Package},
- packages::{FilterCondition, PackageQueryBuilder, ProvideStrategy},
- },
+ database::{connection::DieselDatabase, models::Package},
error::{ErrorContext, SoarError},
utils::get_extract_dir,
SoarResult,
@@ -35,8 +36,8 @@ use crate::{
pub struct PackageInstaller {
package: Package,
install_dir: PathBuf,
- progress_callback: Option>,
- db: Arc>,
+ progress_callback: Option>,
+ db: DieselDatabase,
with_pkg_id: bool,
globs: Vec,
}
@@ -44,8 +45,9 @@ pub struct PackageInstaller {
#[derive(Clone, Default)]
pub struct InstallTarget {
pub package: Package,
- pub existing_install: Option,
+ pub existing_install: Option,
pub with_pkg_id: bool,
+ pub pinned: bool,
pub profile: Option,
pub portable: Option,
pub portable_home: Option,
@@ -58,8 +60,8 @@ impl PackageInstaller {
pub async fn new>(
target: &InstallTarget,
install_dir: P,
- progress_callback: Option>,
- db: Arc>,
+ progress_callback: Option>,
+ db: DieselDatabase,
with_pkg_id: bool,
globs: Vec,
) -> SoarResult {
@@ -68,41 +70,43 @@ impl PackageInstaller {
let profile = get_config().default_profile.clone();
if target.existing_install.is_none() {
- let conn = db.lock()?;
- let Package {
- ref repo_name,
- ref pkg,
- ref pkg_id,
- ref pkg_name,
- ref pkg_type,
- ref version,
- ref ghcr_size,
- ref size,
- ..
- } = package;
+ let repo_name = &package.repo_name;
+ let pkg_id = &package.pkg_id;
+ let pkg_name = &package.pkg_name;
+ let pkg_type = package.pkg_type.as_deref();
+ let version = &package.version;
+ let size = package.ghcr_size.unwrap_or(package.size.unwrap_or(0)) as i64;
let installed_path = install_dir.to_string_lossy();
- let size = ghcr_size.unwrap_or(size.unwrap_or(0));
- let install_patterns = serde_json::to_string(&globs).unwrap();
- let mut stmt = prepare_and_bind!(
- conn,
- "INSERT INTO packages (
- repo_name, pkg, pkg_id, pkg_name, pkg_type, version, size,
- installed_path, installed_date, with_pkg_id, profile, install_patterns
- )
- VALUES
- (
- $repo_name, $pkg, $pkg_id, $pkg_name, $pkg_type, $version, $size,
- $installed_path, datetime(), $with_pkg_id, $profile, $install_patterns
- )"
- );
- stmt.raw_execute()?;
+ let installed_date = Utc::now().format("%Y-%m-%d %H:%M:%S").to_string();
+
+ let new_package = NewInstalledPackage {
+ repo_name,
+ pkg_id,
+ pkg_name,
+ pkg_type,
+ version,
+ size,
+ checksum: None,
+ installed_path: &installed_path,
+ installed_date: &installed_date,
+ profile: &profile,
+ pinned: target.pinned,
+ is_installed: false,
+ with_pkg_id,
+ detached: false,
+ unlinked: false,
+ provides: None,
+ install_patterns: Some(json!(globs)),
+ };
+
+ db.with_conn(|conn| CoreRepository::insert(conn, &new_package))?;
}
Ok(Self {
package: package.clone(),
install_dir,
progress_callback,
- db: db.clone(),
+ db,
with_pkg_id,
globs,
})
@@ -229,59 +233,39 @@ impl PackageInstaller {
portable_share: Option<&str>,
portable_cache: Option<&str>,
) -> SoarResult<()> {
- let mut conn = self.db.lock()?;
let package = &self.package;
- let Package {
- repo_name,
- pkg_name,
- pkg_id,
- version,
- ghcr_size,
- size,
- bsum,
- ..
- } = package;
- let provides = serde_json::to_string(&package.provides).unwrap();
- let size = ghcr_size.unwrap_or(size.unwrap_or(0));
+ let repo_name = &package.repo_name;
+ let pkg_name = &package.pkg_name;
+ let pkg_id = &package.pkg_id;
+ let version = &package.version;
+ let size = package.ghcr_size.unwrap_or(package.size.unwrap_or(0)) as i64;
+ let checksum = package.bsum.as_deref();
+ let provides = package.provides.clone();
let with_pkg_id = self.with_pkg_id;
- let tx = conn.transaction()?;
-
- let record_id: u32 = {
- tx.query_row(
- r#"
- UPDATE packages
- SET
- version = ?,
- size = ?,
- installed_date = datetime(),
- is_installed = true,
- provides = ?,
- with_pkg_id = ?,
- checksum = ?
- WHERE
- repo_name = ?
- AND pkg_name = ?
- AND pkg_id = ?
- AND pinned = false
- AND version = ?
- RETURNING id
- "#,
- params![
- version,
- size,
- provides,
- with_pkg_id,
- bsum,
- repo_name,
- pkg_name,
- pkg_id,
- version,
- ],
- |row| row.get(0),
+ let installed_date = Utc::now().format("%Y-%m-%d %H:%M:%S").to_string();
+
+ let record_id: Option = self.db.with_conn(|conn| {
+ CoreRepository::record_installation(
+ conn,
+ repo_name,
+ pkg_name,
+ pkg_id,
+ version,
+ size,
+ provides,
+ with_pkg_id,
+ checksum,
+ &installed_date,
)
- .unwrap_or_default()
- };
+ })?;
+
+ let record_id = record_id.ok_or_else(|| {
+ SoarError::Custom(format!(
+ "Failed to record installation for {}#{}: package not found in database",
+ pkg_name, pkg_id
+ ))
+ })?;
if portable.is_some()
|| portable_home.is_some()
@@ -292,19 +276,12 @@ impl PackageInstaller {
let base_dir = env::current_dir()
.map_err(|_| SoarError::Custom("Error retrieving current directory".into()))?;
- let [portable, portable_home, portable_config, portable_share, portable_cache] = [
- portable,
- portable_home,
- portable_config,
- portable_share,
- portable_cache,
- ]
- .map(|opt| {
+ let resolve_path = |opt: Option<&str>| -> Option {
opt.map(|p| {
if p.is_empty() {
String::new()
} else {
- let path = PathBuf::from(&p);
+ let path = PathBuf::from(p);
let absolute = if path.is_absolute() {
path
} else {
@@ -313,78 +290,38 @@ impl PackageInstaller {
absolute.to_string_lossy().into_owned()
}
})
- });
-
- // try to update existing record first
- let mut stmt = prepare_and_bind!(
- tx,
- "UPDATE portable_package
- SET
- portable_path = $portable,
- portable_home = $portable_home,
- portable_config = $portable_config,
- portable_share = $portable_share,
- portable_cache = $portable_cache
- WHERE
- package_id = $record_id
- "
- );
- let updated = stmt.raw_execute()?;
-
- // if no record were updated, add a new record
- if updated == 0 {
- let mut stmt = prepare_and_bind!(
- tx,
- "INSERT INTO portable_package
- (
- package_id, portable_path, portable_home, portable_config,
- portable_share, portable_cache
- )
- VALUES
- (
- $record_id, $portable, $portable_home, $portable_config,
- $portable_share, $portable_cache
+ };
+
+ let portable_path = resolve_path(portable);
+ let portable_home = resolve_path(portable_home);
+ let portable_config = resolve_path(portable_config);
+ let portable_share = resolve_path(portable_share);
+ let portable_cache = resolve_path(portable_cache);
+
+ self.db.with_conn(|conn| {
+ CoreRepository::upsert_portable(
+ conn,
+ record_id,
+ portable_path.as_deref(),
+ portable_home.as_deref(),
+ portable_config.as_deref(),
+ portable_share.as_deref(),
+ portable_cache.as_deref(),
)
- "
- );
- stmt.raw_execute()?;
- }
+ })?;
}
if !unlinked {
- let mut stmt = prepare_and_bind!(
- tx,
- "UPDATE packages
- SET
- unlinked = true
- WHERE
- pkg_name = $pkg_name
- AND (
- pkg_id != $pkg_id
- OR
- version != $version
- )"
- );
- stmt.raw_execute()?;
- }
+ self.db
+ .with_conn(|conn| CoreRepository::unlink_others(conn, pkg_name, pkg_id, version))?;
- tx.commit()?;
- drop(conn);
+ let alternate_packages: Vec =
+ self.db.with_conn(|conn| {
+ CoreRepository::find_alternates(conn, pkg_name, pkg_id, version)
+ })?;
- if !unlinked {
- // FIXME: alternate package could be the same package but different version
- // or different package but same version
- //
- // this makes assumption that the pkg_id and version both are different
- let alternate_packages = PackageQueryBuilder::new(self.db.clone())
- .where_and("pkg_name", FilterCondition::Eq(pkg_name.to_owned()))
- .where_and("pkg_id", FilterCondition::Ne(pkg_id.to_owned()))
- .where_and("version", FilterCondition::Ne(version.to_owned()))
- .load_installed()?
- .items;
-
- for package in alternate_packages {
- let installed_path = PathBuf::from(&package.installed_path);
+ for alt_pkg in alternate_packages {
+ let installed_path = PathBuf::from(&alt_pkg.installed_path);
let mut remove_action = |path: &Path| -> FileSystemResult<()> {
if let Ok(real_path) = fs::read_link(path) {
@@ -406,7 +343,7 @@ impl PackageInstaller {
};
walk_dir(icons_dir(), &mut remove_action)?;
- if let Some(provides) = package.provides {
+ if let Some(ref provides) = alt_pkg.provides {
for provide in provides {
if let Some(ref target) = provide.target {
let is_symlink = matches!(
diff --git a/soar-core/src/package/mod.rs b/crates/soar-core/src/package/mod.rs
similarity index 75%
rename from soar-core/src/package/mod.rs
rename to crates/soar-core/src/package/mod.rs
index 4ad62ded..2d3fd600 100644
--- a/soar-core/src/package/mod.rs
+++ b/crates/soar-core/src/package/mod.rs
@@ -1,3 +1,4 @@
pub mod install;
pub mod query;
pub mod remove;
+pub mod update;
diff --git a/soar-core/src/package/query.rs b/crates/soar-core/src/package/query.rs
similarity index 69%
rename from soar-core/src/package/query.rs
rename to crates/soar-core/src/package/query.rs
index b0e347cb..9ae8df93 100644
--- a/soar-core/src/package/query.rs
+++ b/crates/soar-core/src/package/query.rs
@@ -2,11 +2,10 @@ use std::sync::OnceLock;
use regex::Regex;
-use crate::{
- database::packages::{FilterCondition, PackageQueryBuilder},
- error::SoarError,
-};
+use crate::error::SoarError;
+/// Parsed package query string.
+/// Supports format: `name#pkg_id@version:repo`
#[derive(Debug)]
pub struct PackageQuery {
pub name: Option,
@@ -15,26 +14,6 @@ pub struct PackageQuery {
pub version: Option,
}
-impl PackageQuery {
- pub fn apply_filters(&self, mut builder: PackageQueryBuilder) -> PackageQueryBuilder {
- if let Some(ref repo_name) = self.repo_name {
- builder = builder.where_and("repo_name", FilterCondition::Eq(repo_name.clone()));
- }
- if let Some(ref name) = self.name {
- builder = builder.where_and("pkg_name", FilterCondition::Eq(name.clone()));
- }
- if let Some(ref pkg_id) = self.pkg_id {
- if pkg_id != "all" {
- builder = builder.where_and("pkg_id", FilterCondition::Eq(pkg_id.clone()));
- }
- }
- if let Some(ref version) = self.version {
- builder = builder.where_and("version", FilterCondition::Eq(version.clone()));
- }
- builder
- }
-}
-
impl TryFrom<&str> for PackageQuery {
type Error = SoarError;
diff --git a/soar-core/src/package/remove.rs b/crates/soar-core/src/package/remove.rs
similarity index 80%
rename from soar-core/src/package/remove.rs
rename to crates/soar-core/src/package/remove.rs
index e99e873a..33a32ec7 100644
--- a/soar-core/src/package/remove.rs
+++ b/crates/soar-core/src/package/remove.rs
@@ -2,26 +2,25 @@ use std::{
ffi::OsString,
fs,
path::{Path, PathBuf},
- sync::{Arc, Mutex},
};
-use rusqlite::{params, Connection};
use soar_config::config::get_config;
+use soar_db::{models::types::ProvideStrategy, repository::core::CoreRepository};
use soar_utils::{error::FileSystemResult, fs::walk_dir, path::desktop_dir};
use crate::{
- database::{models::InstalledPackage, packages::ProvideStrategy},
+ database::{connection::DieselDatabase, models::InstalledPackage},
error::ErrorContext,
SoarResult,
};
pub struct PackageRemover {
package: InstalledPackage,
- db: Arc>,
+ db: DieselDatabase,
}
impl PackageRemover {
- pub async fn new(package: InstalledPackage, db: Arc>) -> Self {
+ pub async fn new(package: InstalledPackage, db: DieselDatabase) -> Self {
Self {
package,
db,
@@ -29,9 +28,6 @@ impl PackageRemover {
}
pub async fn remove(&self) -> SoarResult<()> {
- let mut conn = self.db.lock()?;
- let tx = conn.transaction()?;
-
// to prevent accidentally removing required files by other package,
// remove only if the installation was successful
if self.package.is_installed {
@@ -95,23 +91,11 @@ impl PackageRemover {
}
};
- {
- let mut stmt = tx.prepare(
- r#"
- DELETE FROM packages WHERE id = ?
- "#,
- )?;
- stmt.execute(params![self.package.id])?;
-
- let mut stmt = tx.prepare(
- r#"
- DELETE FROM portable_package WHERE package_id = ?
- "#,
- )?;
- stmt.execute(params![self.package.id])?;
- }
-
- tx.commit()?;
+ let package_id = self.package.id as i32;
+ self.db.transaction(|conn| {
+ CoreRepository::delete_portable(conn, package_id)?;
+ CoreRepository::delete(conn, package_id)
+ })?;
Ok(())
}
diff --git a/crates/soar-core/src/package/update.rs b/crates/soar-core/src/package/update.rs
new file mode 100644
index 00000000..a95c06ec
--- /dev/null
+++ b/crates/soar-core/src/package/update.rs
@@ -0,0 +1,38 @@
+use std::{fs, path::Path};
+
+use soar_db::repository::core::CoreRepository;
+
+use crate::{
+ database::{connection::DieselDatabase, models::Package},
+ error::ErrorContext,
+ SoarResult,
+};
+
+/// Removes old versions of a package after a successful update.
+///
+/// This function finds all installed versions of the package (by pkg_id, pkg_name, repo_name)
+/// that are older than the current version and removes them from disk and database.
+pub fn remove_old_versions(package: &Package, db: &DieselDatabase) -> SoarResult<()> {
+ let Package {
+ pkg_id,
+ pkg_name,
+ repo_name,
+ ..
+ } = package;
+
+ let old_packages = db.with_conn(|conn| {
+ CoreRepository::get_old_package_paths(conn, pkg_id, pkg_name, repo_name)
+ })?;
+
+ for (_id, installed_path) in &old_packages {
+ let path = Path::new(installed_path);
+ if path.exists() {
+ fs::remove_dir_all(path)
+ .with_context(|| format!("removing old package directory {}", path.display()))?;
+ }
+ }
+
+ db.with_conn(|conn| CoreRepository::delete_old_packages(conn, pkg_id, pkg_name, repo_name))?;
+
+ Ok(())
+}
diff --git a/soar-core/src/utils.rs b/crates/soar-core/src/utils.rs
similarity index 77%
rename from soar-core/src/utils.rs
rename to crates/soar-core/src/utils.rs
index d9f83296..a373e63f 100644
--- a/soar-core/src/utils.rs
+++ b/crates/soar-core/src/utils.rs
@@ -1,10 +1,12 @@
+//! Utility functions for soar-core.
+
use std::{
fs,
path::{Path, PathBuf},
};
-use rusqlite::Connection;
-use soar_config::config::{get_config, Config};
+use soar_config::config::get_config;
+use soar_db::{connection::DbConnection, migration::DbType};
use soar_utils::{
error::FileSystemResult,
fs::{safe_remove, walk_dir},
@@ -13,13 +15,13 @@ use soar_utils::{
use tracing::info;
use crate::{
- database::migration,
error::{ErrorContext, SoarError},
SoarResult,
};
type Result = std::result::Result;
+/// Sets up required directories for soar operation.
pub fn setup_required_paths() -> Result<()> {
let config = get_config();
let bin_path = config.get_bin_path()?;
@@ -46,6 +48,7 @@ pub fn setup_required_paths() -> Result<()> {
Ok(())
}
+/// Cleans up the cache directory.
pub fn cleanup_cache() -> Result<()> {
let cache_path = get_config().get_cache_path()?;
if cache_path.exists() {
@@ -60,13 +63,14 @@ pub fn cleanup_cache() -> Result<()> {
}
fn remove_action(path: &Path) -> FileSystemResult<()> {
- if !path.exists() {
+ if path.is_symlink() && !path.exists() {
safe_remove(path)?;
info!("Removed broken symlink: {}", path.display());
}
Ok(())
}
+/// Removes broken symlinks from bin, desktop, and icons directories.
pub fn remove_broken_symlinks() -> Result<()> {
let mut soar_files_action = |path: &Path| -> FileSystemResult<()> {
if let Some(filename) = path.file_stem().and_then(|s| s.to_str()) {
@@ -84,16 +88,17 @@ pub fn remove_broken_symlinks() -> Result<()> {
Ok(())
}
+/// Gets the extract directory path for a given base directory.
pub fn get_extract_dir>(base_dir: P) -> PathBuf {
let base_dir = base_dir.as_ref();
base_dir.join("SOAR_AUTOEXTRACT")
}
-pub fn get_nests_db_conn(config: &Config) -> SoarResult {
+/// Opens a connection to the nests database with migrations applied.
+pub fn get_nests_db_conn() -> SoarResult {
+ let config = get_config();
let path = config.get_db_path()?.join("nests.db");
- let conn = Connection::open(&path)?;
- migration::run_nests(conn)
- .map_err(|e| SoarError::Custom(format!("creating nests migration: {}", e)))?;
- let conn = Connection::open(&path)?;
+ let conn = DbConnection::open(&path, DbType::Nest)
+ .map_err(|e| SoarError::Custom(format!("opening nests database: {}", e)))?;
Ok(conn)
}
diff --git a/crates/soar-db/Cargo.toml b/crates/soar-db/Cargo.toml
index ad67c525..1c36d672 100644
--- a/crates/soar-db/Cargo.toml
+++ b/crates/soar-db/Cargo.toml
@@ -13,5 +13,9 @@ categories.workspace = true
[dependencies]
diesel = { workspace = true }
diesel_migrations = { workspace = true }
+miette = { workspace = true }
+regex = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
+soar-registry = { workspace = true }
+thiserror = { workspace = true }
diff --git a/crates/soar-db/migrations/core/2025-10-19-024753-0000_create_packages/up.sql b/crates/soar-db/migrations/core/2025-10-19-024753-0000_create_packages/up.sql
index 006d402d..ef3afab7 100644
--- a/crates/soar-db/migrations/core/2025-10-19-024753-0000_create_packages/up.sql
+++ b/crates/soar-db/migrations/core/2025-10-19-024753-0000_create_packages/up.sql
@@ -1,7 +1,6 @@
CREATE TABLE packages (
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
repo_name TEXT NOT NULL,
- pkg TEXT COLLATE NOCASE,
pkg_id TEXT NOT NULL COLLATE NOCASE,
pkg_name TEXT NOT NULL COLLATE NOCASE,
pkg_type TEXT COLLATE NOCASE,
diff --git a/crates/soar-db/migrations/metadata/2025-10-19-095216-0000_create_packages/up.sql b/crates/soar-db/migrations/metadata/2025-10-19-095216-0000_create_packages/up.sql
index 69715c5e..bac81419 100644
--- a/crates/soar-db/migrations/metadata/2025-10-19-095216-0000_create_packages/up.sql
+++ b/crates/soar-db/migrations/metadata/2025-10-19-095216-0000_create_packages/up.sql
@@ -1,6 +1,5 @@
CREATE TABLE packages (
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- rank INT,
pkg_id TEXT NOT NULL COLLATE NOCASE,
pkg_name TEXT NOT NULL COLLATE NOCASE,
pkg_type TEXT COLLATE NOCASE,
@@ -16,7 +15,7 @@ CREATE TABLE packages (
ghcr_size BIGINT,
ghcr_blob TEXT,
ghcr_url TEXT,
- checksum TEXT,
+ bsum TEXT,
icon TEXT,
desktop TEXT,
appstream TEXT,
diff --git a/crates/soar-db/src/connection.rs b/crates/soar-db/src/connection.rs
new file mode 100644
index 00000000..926a5d3b
--- /dev/null
+++ b/crates/soar-db/src/connection.rs
@@ -0,0 +1,226 @@
+//! Database connection management.
+//!
+//! This module provides connection management for the soar database system.
+//! It supports multiple database types:
+//!
+//! - **Core database**: Tracks installed packages
+//! - **Metadata databases**: One per repository, contains package metadata
+//! - **Nests database**: Tracks nest configurations
+
+use std::{collections::HashMap, path::Path};
+
+use diesel::{sql_query, Connection, ConnectionError, RunQueryDsl, SqliteConnection};
+
+use crate::migration::{apply_migrations, migrate_json_to_jsonb, DbType};
+
+/// Database connection wrapper with migration support.
+pub struct DbConnection {
+ conn: SqliteConnection,
+}
+
+impl DbConnection {
+ /// Opens a database connection and runs migrations.
+ ///
+ /// # Arguments
+ ///
+ /// * `path` - Path to the SQLite database file
+ /// * `db_type` - Type of database for selecting correct migrations
+ ///
+ /// # Errors
+ ///
+ /// Returns an error if the connection fails or migrations fail.
+ pub fn open>(path: P, db_type: DbType) -> Result {
+ let path_str = path.as_ref().to_string_lossy();
+ let mut conn = SqliteConnection::establish(&path_str)?;
+
+ sql_query("PRAGMA journal_mode = WAL;")
+ .execute(&mut conn)
+ .map_err(|e| ConnectionError::BadConnection(e.to_string()))?;
+
+ apply_migrations(&mut conn, &db_type)
+ .map_err(|e| ConnectionError::BadConnection(e.to_string()))?;
+
+ // Migrate text JSON to JSONB for databases we manage (Core, Nest)
+ // Metadata databases are generated externally and migrated on fetch
+ if matches!(db_type, DbType::Core | DbType::Nest) {
+ migrate_json_to_jsonb(&mut conn, db_type)
+ .map_err(|e| ConnectionError::BadConnection(e.to_string()))?;
+ }
+
+ Ok(Self {
+ conn,
+ })
+ }
+
+ /// Opens a database connection without running migrations.
+ ///
+ /// Use this when you know the database is already migrated.
+ pub fn open_without_migrations>(path: P) -> Result {
+ let path_str = path.as_ref().to_string_lossy();
+ let mut conn = SqliteConnection::establish(&path_str)?;
+
+ // WAL mode for better concurrent access
+ sql_query("PRAGMA journal_mode = WAL;")
+ .execute(&mut conn)
+ .map_err(|e| ConnectionError::BadConnection(e.to_string()))?;
+
+ Ok(Self {
+ conn,
+ })
+ }
+
+ /// Opens a metadata database and migrates JSON text columns to JSONB.
+ ///
+ /// This is used for metadata databases that are generated externally (e.g., by rusqlite)
+ /// and may contain JSON stored as text instead of JSONB binary format.
+ ///
+ /// Does NOT run schema migrations since the schema is managed externally.
+ pub fn open_metadata>(path: P) -> Result {
+ let path_str = path.as_ref().to_string_lossy();
+ let mut conn = SqliteConnection::establish(&path_str)?;
+
+ // WAL mode for better concurrent access
+ sql_query("PRAGMA journal_mode = WAL;")
+ .execute(&mut conn)
+ .map_err(|e| ConnectionError::BadConnection(e.to_string()))?;
+
+ // Migrate text JSON to JSONB binary format
+ migrate_json_to_jsonb(&mut conn, DbType::Metadata)
+ .map_err(|e| ConnectionError::BadConnection(e.to_string()))?;
+
+ Ok(Self {
+ conn,
+ })
+ }
+
+ /// Gets a mutable reference to the underlying connection.
+ pub fn conn(&mut self) -> &mut SqliteConnection {
+ &mut self.conn
+ }
+}
+
+impl std::ops::Deref for DbConnection {
+ type Target = SqliteConnection;
+
+ fn deref(&self) -> &Self::Target {
+ &self.conn
+ }
+}
+
+impl std::ops::DerefMut for DbConnection {
+ fn deref_mut(&mut self) -> &mut Self::Target {
+ &mut self.conn
+ }
+}
+
+/// Manages database connections for the soar package manager.
+///
+/// This struct manages separate connections for:
+/// - The core database (installed packages)
+/// - Multiple metadata databases (one per repository)
+/// - The nests database (nest configurations)
+///
+/// # Example
+///
+/// ```ignore
+/// use soar_db::connection::DatabaseManager;
+///
+/// let manager = DatabaseManager::new("/path/to/db")?;
+///
+/// // Access installed packages
+/// let installed = manager.core().list_installed()?;
+///
+/// // Access repository metadata
+/// if let Some(metadata_conn) = manager.metadata("pkgforge") {
+/// let packages = metadata_conn.search("firefox")?;
+/// }
+/// ```
+pub struct DatabaseManager {
+ /// Core database connection (installed packages).
+ core: DbConnection,
+ /// Metadata database connections, keyed by repository name.
+ metadata: HashMap,
+ /// Nests database connection.
+ nests: DbConnection,
+}
+
+impl DatabaseManager {
+ /// Creates a new database manager with the given base directory.
+ ///
+ /// # Arguments
+ ///
+ /// * `base_dir` - Base directory for database files
+ ///
+ /// The following databases will be created/opened:
+ /// - `{base_dir}/core.db` - Installed packages
+ /// - `{base_dir}/nests.db` - Nest configurations
+ ///
+ /// Metadata databases are added separately via `add_metadata_db`.
+ pub fn new>(base_dir: P) -> Result {
+ let base = base_dir.as_ref();
+
+ let core_path = base.join("core.db");
+ let nests_path = base.join("nests.db");
+
+ let core = DbConnection::open(&core_path, DbType::Core)?;
+ let nests = DbConnection::open(&nests_path, DbType::Nest)?;
+
+ Ok(Self {
+ core,
+ metadata: HashMap::new(),
+ nests,
+ })
+ }
+
+ /// Adds or opens a metadata database for a repository.
+ ///
+ /// This method opens the metadata database and migrates any JSON text columns
+ /// to JSONB binary format. It does NOT run schema migrations since metadata
+ /// databases are generated externally (e.g., by rusqlite).
+ ///
+ /// # Arguments
+ ///
+ /// * `repo_name` - Name of the repository
+ /// * `path` - Path to the metadata database file
+ pub fn add_metadata_db>(
+ &mut self,
+ repo_name: &str,
+ path: P,
+ ) -> Result<(), ConnectionError> {
+ let conn = DbConnection::open_metadata(path)?;
+ self.metadata.insert(repo_name.to_string(), conn);
+ Ok(())
+ }
+
+ /// Gets a mutable reference to the core database connection.
+ pub fn core(&mut self) -> &mut DbConnection {
+ &mut self.core
+ }
+
+ /// Gets a mutable reference to a metadata database connection.
+ ///
+ /// Returns `None` if no metadata database exists for the given repository.
+ pub fn metadata(&mut self, repo_name: &str) -> Option<&mut DbConnection> {
+ self.metadata.get_mut(repo_name)
+ }
+
+ /// Gets an iterator over all metadata database connections.
+ pub fn all_metadata(&mut self) -> impl Iterator- {
+ self.metadata.iter_mut()
+ }
+
+ /// Gets a mutable reference to the nests database connection.
+ pub fn nests(&mut self) -> &mut DbConnection {
+ &mut self.nests
+ }
+
+ /// Returns the names of all loaded metadata databases.
+ pub fn metadata_names(&self) -> impl Iterator
- {
+ self.metadata.keys()
+ }
+
+ /// Removes a metadata database connection.
+ pub fn remove_metadata_db(&mut self, repo_name: &str) -> Option {
+ self.metadata.remove(repo_name)
+ }
+}
diff --git a/crates/soar-db/src/error.rs b/crates/soar-db/src/error.rs
new file mode 100644
index 00000000..942b75ca
--- /dev/null
+++ b/crates/soar-db/src/error.rs
@@ -0,0 +1,75 @@
+//! Error types for soar-db.
+
+use miette::Diagnostic;
+use thiserror::Error;
+
+/// Database error type for soar-db operations.
+#[derive(Error, Diagnostic, Debug)]
+pub enum DbError {
+ #[error("Database connection failed: {0}")]
+ #[diagnostic(
+ code(soar_db::connection),
+ help("Check if the database file exists and is accessible")
+ )]
+ ConnectionError(String),
+
+ #[error("Database query failed: {0}")]
+ #[diagnostic(
+ code(soar_db::query),
+ help("Try running 'soar sync' to refresh the database")
+ )]
+ QueryError(String),
+
+ #[error("Database migration failed: {0}")]
+ #[diagnostic(
+ code(soar_db::migration),
+ help("The database schema may be corrupted. Try removing and re-syncing.")
+ )]
+ MigrationError(String),
+
+ #[error("Package not found: {0}")]
+ #[diagnostic(
+ code(soar_db::not_found),
+ help("Run 'soar sync' to update package list, or check the package name")
+ )]
+ NotFound(String),
+
+ #[error("Package already installed: {0}")]
+ #[diagnostic(
+ code(soar_db::already_installed),
+ help("Use 'soar update' to update the package, or 'soar remove' first")
+ )]
+ AlreadyInstalled(String),
+
+ #[error("Database integrity error: {0}")]
+ #[diagnostic(
+ code(soar_db::integrity),
+ help("The database may be corrupted. Try removing and re-syncing.")
+ )]
+ IntegrityError(String),
+
+ #[error("IO error: {0}")]
+ #[diagnostic(code(soar_db::io), help("Check file permissions and disk space"))]
+ IoError(#[from] std::io::Error),
+}
+
+impl From for DbError {
+ fn from(err: diesel::result::Error) -> Self {
+ match err {
+ diesel::result::Error::NotFound => DbError::NotFound("Record not found".to_string()),
+ diesel::result::Error::DatabaseError(_, info) => {
+ DbError::QueryError(info.message().to_string())
+ }
+ other => DbError::QueryError(other.to_string()),
+ }
+ }
+}
+
+impl From for DbError {
+ fn from(err: diesel::result::ConnectionError) -> Self {
+ DbError::ConnectionError(err.to_string())
+ }
+}
+
+/// Result type alias for soar-db operations.
+pub type Result = std::result::Result;
diff --git a/crates/soar-db/src/lib.rs b/crates/soar-db/src/lib.rs
index cd3b7e75..800fce00 100644
--- a/crates/soar-db/src/lib.rs
+++ b/crates/soar-db/src/lib.rs
@@ -1,51 +1,53 @@
-use diesel::{
- sql_query, sql_types::Text, Connection, ConnectionError, RunQueryDsl as _, SqliteConnection,
-};
-
+//! Database layer for the soar package manager.
+//!
+//! This crate provides database management for soar, including:
+//!
+//! - **Connection management**: Separate connections for core, metadata, and nests databases
+//! - **Models**: Diesel ORM models for all database tables
+//! - **Repositories**: Type-safe CRUD operations using the repository pattern
+//! - **Migrations**: Automatic schema migrations using diesel_migrations
+//!
+//! # Database Architecture
+//!
+//! Soar uses three types of SQLite databases:
+//!
+//! - **Core database** (`core.db`): Tracks installed packages
+//! - **Metadata databases** (one per repository): Contains package metadata
+//! - **Nests database** (`nests.db`): Stores nest configurations
+//!
+//! # Example
+//!
+//! ```ignore
+//! use soar_db::connection::DatabaseManager;
+//! use soar_db::repository::core::CoreRepository;
+//! use soar_db::repository::metadata::MetadataRepository;
+//!
+//! // Create database manager
+//! let mut manager = DatabaseManager::new("/path/to/db")?;
+//!
+//! // Add repository metadata
+//! manager.add_metadata_db("pkgforge", "/path/to/pkgforge.db")?;
+//!
+//! // Query installed packages (DbConnection derefs to SqliteConnection)
+//! let installed = CoreRepository::list_all(manager.core())?;
+//!
+//! // Search for packages
+//! if let Some(metadata) = manager.metadata("pkgforge") {
+//! let packages = MetadataRepository::search(metadata, "firefox")?;
+//! }
+//! ```
+
+pub mod connection;
+pub mod error;
pub mod migration;
pub mod models;
+pub mod repository;
pub mod schema;
-pub struct Database {
- pub conn: SqliteConnection,
-}
-
-impl Database {
- pub fn new(path: &str) -> Result {
- let conn = SqliteConnection::establish(path)?;
- Ok(Database {
- conn,
- })
- }
-
- pub fn new_multi(paths: &[&str]) -> Result {
- let mut conn = SqliteConnection::establish(paths[0])?;
- sql_query("PRAGMA case_sensitive_like = ON;")
- .execute(&mut conn)
- .map_err(|err| ConnectionError::BadConnection(err.to_string()))?;
- for (idx, path) in paths.iter().enumerate().skip(1) {
- sql_query(format!("ATTACH DATABASE ?1 AS shard{}", idx))
- .bind::(path)
- .execute(&mut conn)
- .map_err(|err| ConnectionError::BadConnection(err.to_string()))?;
- }
-
- Ok(Database {
- conn,
- })
- }
-}
-
-impl std::ops::Deref for Database {
- type Target = SqliteConnection;
-
- fn deref(&self) -> &Self::Target {
- &self.conn
- }
-}
-
-impl std::ops::DerefMut for Database {
- fn deref_mut(&mut self) -> &mut Self::Target {
- &mut self.conn
- }
+/// Helper macro to convert `Option` to `Option>`.
+#[macro_export]
+macro_rules! json_vec {
+ ($val:expr) => {
+ $val.map(|v| serde_json::from_value(v).unwrap_or_default())
+ };
}
diff --git a/crates/soar-db/src/migration.rs b/crates/soar-db/src/migration.rs
index b667bca5..deeda28f 100644
--- a/crates/soar-db/src/migration.rs
+++ b/crates/soar-db/src/migration.rs
@@ -7,6 +7,7 @@ pub const CORE_MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations/co
pub const METADATA_MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations/metadata");
pub const NEST_MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations/nest");
+#[derive(Clone, Copy)]
pub enum DbType {
Core,
Metadata,
@@ -23,13 +24,13 @@ fn get_migrations(db_type: &DbType) -> EmbeddedMigrations {
pub fn apply_migrations(
conn: &mut SqliteConnection,
- db_type: DbType,
+ db_type: &DbType,
) -> Result<(), Box> {
loop {
- match conn.run_pending_migrations(get_migrations(&db_type)) {
+ match conn.run_pending_migrations(get_migrations(db_type)) {
Ok(_) => break,
Err(e) if e.to_string().contains("already exists") => {
- mark_first_pending(conn, &db_type)?;
+ mark_first_pending(conn, db_type)?;
}
Err(e) => return Err(e),
}
@@ -51,3 +52,96 @@ fn mark_first_pending(
Ok(())
}
+
+/// Migrate text JSON columns to JSONB binary format.
+///
+/// This is needed when migrating from rusqlite (which stores JSON as text)
+/// to diesel (which uses SQLite's native JSONB format).
+///
+/// Handles both:
+/// - Text type columns (typeof = 'text')
+/// - Blob columns containing text JSON (starts with '[' or '{')
+///
+/// # Performance Note
+///
+/// This runs on every database open but is essentially a no-op after the first
+/// successful migration. The WHERE clause only matches rows with text-based JSON,
+/// so once all rows are converted to JSONB binary format, no rows will be updated.
+///
+/// TODO: Remove this migration in a future version (v0.10 or v1.0) once users
+/// have had sufficient time to migrate their databases.
+pub fn migrate_json_to_jsonb(
+ conn: &mut SqliteConnection,
+ db_type: DbType,
+) -> Result> {
+ // Check for text type OR blob containing text JSON (starts with '[' or '{')
+ // Use hex comparison for blobs: 5B = '[', 7B = '{'
+ let json_condition = |col: &str| {
+ format!(
+ "{col} IS NOT NULL AND (typeof({col}) = 'text' OR (typeof({col}) = 'blob' AND hex(substr({col}, 1, 1)) IN ('5B', '7B')))"
+ )
+ };
+
+ let queries: Vec = match db_type {
+ DbType::Core => {
+ vec![
+ format!(
+ "UPDATE packages SET provides = jsonb(provides) WHERE {}",
+ json_condition("provides")
+ ),
+ format!(
+ "UPDATE packages SET install_patterns = jsonb(install_patterns) WHERE {}",
+ json_condition("install_patterns")
+ ),
+ ]
+ }
+ DbType::Metadata => {
+ vec![
+ format!(
+ "UPDATE packages SET licenses = jsonb(licenses) WHERE {}",
+ json_condition("licenses")
+ ),
+ format!(
+ "UPDATE packages SET homepages = jsonb(homepages) WHERE {}",
+ json_condition("homepages")
+ ),
+ format!(
+ "UPDATE packages SET notes = jsonb(notes) WHERE {}",
+ json_condition("notes")
+ ),
+ format!(
+ "UPDATE packages SET source_urls = jsonb(source_urls) WHERE {}",
+ json_condition("source_urls")
+ ),
+ format!(
+ "UPDATE packages SET tags = jsonb(tags) WHERE {}",
+ json_condition("tags")
+ ),
+ format!(
+ "UPDATE packages SET categories = jsonb(categories) WHERE {}",
+ json_condition("categories")
+ ),
+ format!(
+ "UPDATE packages SET provides = jsonb(provides) WHERE {}",
+ json_condition("provides")
+ ),
+ format!(
+ "UPDATE packages SET snapshots = jsonb(snapshots) WHERE {}",
+ json_condition("snapshots")
+ ),
+ format!(
+ "UPDATE packages SET replaces = jsonb(replaces) WHERE {}",
+ json_condition("replaces")
+ ),
+ ]
+ }
+ DbType::Nest => vec![],
+ };
+
+ let mut total = 0;
+ for query in queries {
+ total += sql_query(&query).execute(conn)?;
+ }
+
+ Ok(total)
+}
diff --git a/crates/soar-db/src/models/core.rs b/crates/soar-db/src/models/core.rs
index b554a08e..c5c593de 100644
--- a/crates/soar-db/src/models/core.rs
+++ b/crates/soar-db/src/models/core.rs
@@ -1,17 +1,12 @@
-use diesel::prelude::*;
+use diesel::{prelude::*, sqlite::Sqlite};
+use serde_json::Value;
-use crate::{
- models::types::{JsonValue, PackageProvide},
- schema::core::*,
-};
+use crate::{json_vec, models::types::PackageProvide, schema::core::*};
-#[derive(Debug, Queryable, Selectable)]
-#[diesel(table_name = packages)]
-#[diesel(check_for_backend(diesel::sqlite::Sqlite))]
+#[derive(Debug, Selectable)]
pub struct Package {
pub id: i32,
pub repo_name: String,
- pub pkg: Option,
pub pkg_id: String,
pub pkg_name: String,
pub pkg_type: Option,
@@ -26,8 +21,54 @@ pub struct Package {
pub with_pkg_id: bool,
pub detached: bool,
pub unlinked: bool,
- pub provides: Option>>,
- pub install_patterns: Option>>,
+ pub provides: Option>,
+ pub install_patterns: Option>,
+}
+
+impl Queryable for Package {
+ type Row = (
+ i32,
+ String,
+ String,
+ String,
+ Option,
+ String,
+ i64,
+ Option,
+ String,
+ String,
+ String,
+ bool,
+ bool,
+ bool,
+ bool,
+ bool,
+ Option,
+ Option,
+ );
+
+ fn build(row: Self::Row) -> diesel::deserialize::Result {
+ Ok(Self {
+ id: row.0,
+ repo_name: row.1,
+ pkg_id: row.2,
+ pkg_name: row.3,
+ pkg_type: row.4,
+ version: row.5,
+ size: row.6,
+ checksum: row.7,
+ installed_path: row.8,
+ installed_date: row.9,
+ profile: row.10,
+ pinned: row.11,
+ is_installed: row.12,
+ with_pkg_id: row.13,
+ detached: row.14,
+ unlinked: row.15,
+ provides: json_vec!(row.16),
+ install_patterns: json_vec!(row.17),
+ })
+ }
}
#[derive(Debug, Queryable, Selectable)]
@@ -46,7 +87,6 @@ pub struct PortablePackage {
#[diesel(table_name = packages)]
pub struct NewPackage<'a> {
pub repo_name: &'a str,
- pub pkg: Option<&'a str>,
pub pkg_id: &'a str,
pub pkg_name: &'a str,
pub pkg_type: Option<&'a str>,
@@ -61,8 +101,8 @@ pub struct NewPackage<'a> {
pub with_pkg_id: bool,
pub detached: bool,
pub unlinked: bool,
- pub provides: Option>>,
- pub install_patterns: Option>>,
+ pub provides: Option,
+ pub install_patterns: Option,
}
#[derive(Default, Insertable)]
diff --git a/crates/soar-db/src/models/metadata.rs b/crates/soar-db/src/models/metadata.rs
index eb00f85f..289315f9 100644
--- a/crates/soar-db/src/models/metadata.rs
+++ b/crates/soar-db/src/models/metadata.rs
@@ -1,16 +1,11 @@
-use diesel::prelude::*;
+use diesel::{prelude::*, sqlite::Sqlite};
+use serde_json::Value;
-use crate::{
- models::types::{JsonValue, PackageProvide},
- schema::metadata::*,
-};
+use crate::{json_vec, models::types::PackageProvide, schema::metadata::*};
-#[derive(Debug, Queryable, Selectable)]
-#[diesel(table_name = packages)]
-#[diesel(check_for_backend(diesel::sqlite::Sqlite))]
+#[derive(Debug, Clone, Selectable)]
pub struct Package {
pub id: i32,
- pub rank: Option,
pub pkg_id: String,
pub pkg_name: String,
pub pkg_type: Option,
@@ -19,36 +14,137 @@ pub struct Package {
pub description: Option,
pub version: String,
pub version_upstream: Option,
- pub licenses: Option>>,
+ pub licenses: Option>,
pub download_url: String,
pub size: Option,
pub ghcr_pkg: Option,
pub ghcr_size: Option,
pub ghcr_blob: Option,
pub ghcr_url: Option,
- pub checksum: Option,
+ pub bsum: Option,
pub icon: Option,
pub desktop: Option,
pub appstream: Option,
- pub homepages: Option>>,
- pub notes: Option>>,
- pub source_urls: Option>>,
- pub tags: Option>>,
- pub categories: Option>>,
+ pub homepages: Option>,
+ pub notes: Option>,
+ pub source_urls: Option