diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index c5c7b40..57536ff 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -80,6 +80,7 @@ jobs:
container: ${{ matrix.container && matrix.container.image || null }}
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json
steps:
- name: enable windows longpaths
diff --git a/.gitignore b/.gitignore
index 1a4595e..ec9de82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/target
+/scripts
*.log
diff --git a/Cargo.lock b/Cargo.lock
index 4f31d75..e4cb7a9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,6 +28,19 @@ dependencies = [
"cpufeatures 0.3.0",
]
+[[package]]
+name = "ahash"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+dependencies = [
+ "cfg-if",
+ "const-random",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
[[package]]
name = "aho-corasick"
version = "1.1.4"
@@ -114,12 +127,33 @@ version = "1.0.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+[[package]]
+name = "approx"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
+dependencies = [
+ "num-traits",
+]
+
[[package]]
name = "arraydeque"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
+
[[package]]
name = "assert-json-diff"
version = "2.0.2"
@@ -130,6 +164,15 @@ dependencies = [
"serde_json",
]
+[[package]]
+name = "astral-tl"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d90933ffb0f97e2fc2e0de21da9d3f20597b804012d199843a6fe7c2810d28f3"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "async-trait"
version = "0.1.89"
@@ -216,9 +259,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.11.1"
+version = "2.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
+checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
dependencies = [
"serde_core",
]
@@ -311,6 +354,12 @@ dependencies = [
"syn 2.0.117",
]
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
[[package]]
name = "byteorder-lite"
version = "0.1.0"
@@ -353,6 +402,12 @@ dependencies = [
"shlex",
]
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
[[package]]
name = "cfg-if"
version = "1.0.4"
@@ -449,6 +504,12 @@ dependencies = [
"tracing-error",
]
+[[package]]
+name = "color_quant"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+
[[package]]
name = "colorchoice"
version = "1.0.5"
@@ -557,6 +618,15 @@ version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+[[package]]
+name = "core_maths"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77745e017f5edba1a9c1d854f6f3a52dac8a12dd5af5d2f54aecf61e43d80d30"
+dependencies = [
+ "libm",
+]
+
[[package]]
name = "cpubits"
version = "0.1.0"
@@ -590,6 +660,12 @@ dependencies = [
"cfg-if",
]
+[[package]]
+name = "critical-section"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
+
[[package]]
name = "crossbeam-channel"
version = "0.5.15"
@@ -630,7 +706,7 @@ version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
"crossterm_winapi",
"mio",
"parking_lot",
@@ -647,7 +723,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
"crossterm_winapi",
"derive_more",
"document-features",
@@ -701,7 +777,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf"
dependencies = [
"lab",
- "phf",
+ "phf 0.11.3",
]
[[package]]
@@ -782,6 +858,12 @@ dependencies = [
"syn 2.0.117",
]
+[[package]]
+name = "data-url"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376"
+
[[package]]
name = "deadpool"
version = "0.12.3"
@@ -866,6 +948,12 @@ dependencies = [
"syn 2.0.117",
]
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
[[package]]
name = "digest"
version = "0.10.7"
@@ -1062,6 +1150,18 @@ dependencies = [
"vt-push-parser",
]
+[[package]]
+name = "fastnbt"
+version = "2.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c075c8f2b92819bec6af26321830809f47574c72fd5b53ce81436bbac54bcea"
+dependencies = [
+ "byteorder",
+ "cesu8",
+ "serde",
+ "serde_bytes",
+]
+
[[package]]
name = "fastrand"
version = "2.4.1"
@@ -1117,6 +1217,12 @@ dependencies = [
"zlib-rs",
]
+[[package]]
+name = "float-cmp"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+
[[package]]
name = "fnv"
version = "1.0.7"
@@ -1135,6 +1241,29 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+[[package]]
+name = "fontconfig-parser"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbc773e24e02d4ddd8395fd30dc147524273a83e54e0f312d986ea30de5f5646"
+dependencies = [
+ "roxmltree 0.20.0",
+]
+
+[[package]]
+name = "fontdb"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "457e789b3d1202543297a350643cf459f836cade38934e7a4cf6a39e7cde2905"
+dependencies = [
+ "fontconfig-parser",
+ "log",
+ "memmap2",
+ "slotmap",
+ "tinyvec",
+ "ttf-parser",
+]
+
[[package]]
name = "form_urlencoded"
version = "1.2.2"
@@ -1144,6 +1273,16 @@ dependencies = [
"percent-encoding",
]
+[[package]]
+name = "fs2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
[[package]]
name = "fsevent-sys"
version = "4.1.0"
@@ -1273,6 +1412,15 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "getopts"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe4fbac503b8d1f88e6676011885f34b7174f46e59956bba534ba83abded4df"
+dependencies = [
+ "unicode-width",
+]
+
[[package]]
name = "getrandom"
version = "0.2.17"
@@ -1327,6 +1475,16 @@ dependencies = [
"syn 2.0.117",
]
+[[package]]
+name = "gif"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee8cfcc411d9adbbaba82fb72661cc1bcca13e8bba98b364e62b2dba8f960159"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
[[package]]
name = "gimli"
version = "0.32.3"
@@ -1389,6 +1547,11 @@ name = "hashbrown"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash 0.2.0",
+]
[[package]]
name = "hashlink"
@@ -1426,6 +1589,44 @@ dependencies = [
"digest 0.11.2",
]
+[[package]]
+name = "html-escape"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c1ff2d1cbf39efe5af0900ced8a069b5e61557a17544eb0c4a50239937389e"
+
+[[package]]
+name = "html-to-markdown-rs"
+version = "3.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72131a643f3b9c379f5080626f1e7774b6abef974424f3f01fd952fcd23b60f3"
+dependencies = [
+ "ahash",
+ "astral-tl",
+ "base64",
+ "bitflags 2.13.1",
+ "html-escape",
+ "html5ever",
+ "lru",
+ "memchr",
+ "once_cell",
+ "phf 0.14.0",
+ "regex",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.18",
+]
+
+[[package]]
+name = "html5ever"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8"
+dependencies = [
+ "log",
+ "markup5ever",
+]
+
[[package]]
name = "http"
version = "1.4.0"
@@ -1698,11 +1899,32 @@ checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
dependencies = [
"bytemuck",
"byteorder-lite",
+ "color_quant",
+ "gif",
+ "image-webp",
"moxcms",
"num-traits",
"png",
+ "zune-core",
+ "zune-jpeg",
+]
+
+[[package]]
+name = "image-webp"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3"
+dependencies = [
+ "byteorder-lite",
+ "quick-error",
]
+[[package]]
+name = "imagesize"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09e54e57b4c48b40f7aec75635392b12b3421fa26fe8b4332e63138ed278459c"
+
[[package]]
name = "indenter"
version = "0.3.4"
@@ -1736,7 +1958,7 @@ version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd5b3eaf1a28b758ac0faa5a4254e8ab2705605496f1b1f3fbbc3988ad73d199"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
"inotify-sys",
"libc",
]
@@ -1834,6 +2056,15 @@ dependencies = [
"either",
]
+[[package]]
+name = "itertools"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc"
+dependencies = [
+ "either",
+]
+
[[package]]
name = "itoa"
version = "1.0.18"
@@ -1972,6 +2203,18 @@ dependencies = [
"libc",
]
+[[package]]
+name = "kurbo"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b60dfc32f652b926df6192e55525b16d186c69d47876c3ead4da5cc9f8450e2"
+dependencies = [
+ "arrayvec",
+ "euclid",
+ "polycool",
+ "smallvec",
+]
+
[[package]]
name = "lab"
version = "0.11.0"
@@ -2036,7 +2279,7 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f50e8f47623268b5407192d26876c4d7f89d686ca130fdc53bced4814cd29f8"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
]
[[package]]
@@ -2080,11 +2323,11 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
[[package]]
name = "lru"
-version = "0.16.4"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39"
+checksum = "0b6180140927ee907000b0aa540091f6ea512ead4447c92b8fc35bc72788a5a6"
dependencies = [
- "hashbrown 0.16.1",
+ "hashbrown 0.17.0",
]
[[package]]
@@ -2112,6 +2355,17 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "markup5ever"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7122d987ec5f704ee56f6e5b41a7d93722e9aae27ae07cafa4036c4d3f9757de"
+dependencies = [
+ "log",
+ "tendril",
+ "web_atoms",
+]
+
[[package]]
name = "matchers"
version = "0.2.0"
@@ -2127,6 +2381,15 @@ version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+[[package]]
+name = "memmap2"
+version = "0.9.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "memmem"
version = "0.1.1"
@@ -2200,13 +2463,19 @@ dependencies = [
"pxfm",
]
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+
[[package]]
name = "nix"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
"cfg-if",
"cfg_aliases",
"libc",
@@ -2229,7 +2498,7 @@ version = "8.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
"fsevent-sys",
"inotify",
"kqueue",
@@ -2247,7 +2516,7 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
]
[[package]]
@@ -2438,6 +2707,7 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6"
dependencies = [
+ "approx",
"bytemuck",
"fast-srgb8",
"libm",
@@ -2550,8 +2820,29 @@ version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
dependencies = [
- "phf_macros",
- "phf_shared",
+ "phf_macros 0.11.3",
+ "phf_shared 0.11.3",
+]
+
+[[package]]
+name = "phf"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+dependencies = [
+ "phf_shared 0.13.1",
+ "serde",
+]
+
+[[package]]
+name = "phf"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "010378780309880b08997fae13be7834dba947d36393bd372f2b1556deb2a2f6"
+dependencies = [
+ "phf_macros 0.14.0",
+ "phf_shared 0.14.0",
+ "serde",
]
[[package]]
@@ -2560,8 +2851,18 @@ version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
dependencies = [
- "phf_generator",
- "phf_shared",
+ "phf_generator 0.11.3",
+ "phf_shared 0.11.3",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
+dependencies = [
+ "phf_generator 0.13.1",
+ "phf_shared 0.13.1",
]
[[package]]
@@ -2570,18 +2871,51 @@ version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
dependencies = [
- "phf_shared",
+ "phf_shared 0.11.3",
"rand 0.8.6",
]
+[[package]]
+name = "phf_generator"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
+dependencies = [
+ "fastrand",
+ "phf_shared 0.13.1",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aeb62e0959d5a1bebc965f4d15d9e2b7cea002b6b0f5ba8cde6cc26738467100"
+dependencies = [
+ "fastrand",
+ "phf_shared 0.14.0",
+]
+
[[package]]
name = "phf_macros"
version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
dependencies = [
- "phf_generator",
- "phf_shared",
+ "phf_generator 0.11.3",
+ "phf_shared 0.11.3",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fa8d0ca26d424d27630da600c6624696e7dec8bf7b3b492b383c5dc49e5e085"
+dependencies = [
+ "phf_generator 0.14.0",
+ "phf_shared 0.14.0",
"proc-macro2",
"quote",
"syn 2.0.117",
@@ -2596,6 +2930,30 @@ dependencies = [
"siphasher",
]
+[[package]]
+name = "phf_shared"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6fd9027e2d9319be6349febd1db4e8d02aa544921200c9b777720ac34a3aa89"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pico-args"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+
[[package]]
name = "pin-project-lite"
version = "0.2.17"
@@ -2614,13 +2972,22 @@ version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
"crc32fast",
"fdeflate",
"flate2",
"miniz_oxide",
]
+[[package]]
+name = "polycool"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50596ddc09eb5ad5f75cacd40209568e66df71baf86e1499a0e99c4cff12a5a6"
+dependencies = [
+ "arrayvec",
+]
+
[[package]]
name = "portable-atomic"
version = "1.13.1"
@@ -2667,8 +3034,24 @@ dependencies = [
]
[[package]]
-name = "prettyplease"
-version = "0.2.37"
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
+[[package]]
+name = "pretty_assertions"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
+dependencies = [
+ "diff",
+ "yansi",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
dependencies = [
@@ -2716,6 +3099,25 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "pulldown-cmark"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9f068eba8e7071c5f9511831b44f32c740d5adf574e990f946ddb53db2f314e"
+dependencies = [
+ "bitflags 2.13.1",
+ "getopts",
+ "memchr",
+ "pulldown-cmark-escape",
+ "unicase",
+]
+
+[[package]]
+name = "pulldown-cmark-escape"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae"
+
[[package]]
name = "pxfm"
version = "0.1.29"
@@ -2742,6 +3144,12 @@ dependencies = [
"wide",
]
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
[[package]]
name = "quinn"
version = "0.11.9"
@@ -2894,14 +3302,15 @@ dependencies = [
[[package]]
name = "ratatui"
-version = "0.30.0"
+version = "0.30.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1ce67fb8ba4446454d1c8dbaeda0557ff5e94d39d5e5ed7f10a65eb4c8266bc"
+checksum = "3274ba0a2c5e1bcad2a2005d20f4dc59dad26b2eb0940fb094500dba4099d57d"
dependencies = [
"instability",
"ratatui-core",
"ratatui-crossterm",
"ratatui-macros",
+ "ratatui-termina",
"ratatui-termion",
"ratatui-termwiz",
"ratatui-widgets",
@@ -2910,17 +3319,18 @@ dependencies = [
[[package]]
name = "ratatui-core"
-version = "0.1.0"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef8dea09a92caaf73bff7adb70b76162e5937524058a7e5bff37869cbbec293"
+checksum = "cbb175c433c8e28a809d1f5773a2ae96e68c0ce40db865cbab1020bf33ae479c"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
"compact_str",
- "hashbrown 0.16.1",
- "indoc",
- "itertools",
+ "critical-section",
+ "hashbrown 0.17.0",
+ "itertools 0.14.0",
"kasuari",
"lru",
+ "palette",
"serde",
"strum",
"thiserror 2.0.18",
@@ -2931,9 +3341,9 @@ dependencies = [
[[package]]
name = "ratatui-crossterm"
-version = "0.1.0"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "577c9b9f652b4c121fb25c6a391dd06406d3b092ba68827e6d2f09550edc54b3"
+checksum = "567584a3b0e6a8203c23de40b4861497266725eb5363dbfd18a1edd603cca9f0"
dependencies = [
"cfg-if",
"crossterm 0.28.1",
@@ -2944,9 +3354,9 @@ dependencies = [
[[package]]
name = "ratatui-image"
-version = "10.0.6"
+version = "11.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c57add959ab80c9a92be620fa6f8e4a64f7c014829250ba78862e8d81a903cb5"
+checksum = "e000b7a22eae639460bc6ec8bb1cc689ecae5b0ed21935cd7d7dd52d38270c86"
dependencies = [
"base64-simd",
"icy_sixel",
@@ -2954,25 +3364,37 @@ dependencies = [
"rand 0.8.6",
"ratatui",
"rustix 0.38.44",
+ "self_cell",
"thiserror 1.0.69",
"windows",
]
[[package]]
name = "ratatui-macros"
-version = "0.7.0"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f1342a13e83e4bb9d0b793d0ea762be633f9582048c892ae9041ef39c936f4"
+checksum = "ed7dc68daa7498a43e4d68e0eb078427e10c38fbcfbb1e42d955f1fa2140d814"
dependencies = [
"ratatui-core",
"ratatui-widgets",
]
[[package]]
-name = "ratatui-termion"
+name = "ratatui-termina"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cade85a8591fbc911e147951422f0d6fd40f4948b271b6216c7dc01838996f8"
+checksum = "c0bf912d9e66f057a759d92e386a280ea886b352ab757d6ac4d653c7ed2c43c2"
+dependencies = [
+ "instability",
+ "ratatui-core",
+ "termina",
+]
+
+[[package]]
+name = "ratatui-termion"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87c732202fa5a71a9da0991013f0853e53f87048f45198e3a1ca3ee722accc2f"
dependencies = [
"instability",
"ratatui-core",
@@ -2981,9 +3403,9 @@ dependencies = [
[[package]]
name = "ratatui-termwiz"
-version = "0.1.0"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f76fe0bd0ed4295f0321b1676732e2454024c15a35d01904ddb315afd3d545c"
+checksum = "faf03e0380b7744054d6cb74224fe3adf062a029754933f575ca1e3b4c2ce977"
dependencies = [
"ratatui-core",
"termwiz",
@@ -3014,15 +3436,15 @@ dependencies = [
[[package]]
name = "ratatui-widgets"
-version = "0.3.0"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7dbfa023cd4e604c2553483820c5fe8aa9d71a42eea5aa77c6e7f35756612db"
+checksum = "66e3d19bcc9130ca376277d93b60767ff121ace3be06f5f95f81dd68956407d1"
dependencies = [
- "bitflags 2.11.1",
- "hashbrown 0.16.1",
+ "bitflags 2.13.1",
+ "hashbrown 0.17.0",
"indoc",
"instability",
- "itertools",
+ "itertools 0.14.0",
"line-clipping",
"ratatui-core",
"serde",
@@ -3058,7 +3480,7 @@ version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
]
[[package]]
@@ -3105,9 +3527,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.12.3"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d"
dependencies = [
"aho-corasick",
"memchr",
@@ -3117,9 +3539,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.14"
+version = "0.4.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad"
dependencies = [
"aho-corasick",
"memchr",
@@ -3128,9 +3550,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.10"
+version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
[[package]]
name = "relative-path"
@@ -3179,6 +3601,32 @@ dependencies = [
"webpki-roots",
]
+[[package]]
+name = "resvg"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9be183ad6a216aa96f33e4c8033b0988b8b3ea6fd2359d19af5bac4643fd8e81"
+dependencies = [
+ "gif",
+ "image-webp",
+ "log",
+ "pico-args",
+ "rgb",
+ "svgtypes",
+ "tiny-skia",
+ "usvg",
+ "zune-jpeg",
+]
+
+[[package]]
+name = "rgb"
+version = "0.8.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b34b781b31e5d73e9fbc8689c70551fd1ade9a19e3e28cfec8580a79290cc4"
+dependencies = [
+ "bytemuck",
+]
+
[[package]]
name = "ring"
version = "0.17.14"
@@ -3206,6 +3654,10 @@ dependencies = [
"dirs",
"dirs-next",
"fast-strip-ansi",
+ "fastnbt",
+ "flate2",
+ "fs2",
+ "html-to-markdown-rs",
"image",
"insta",
"libcasr",
@@ -3214,15 +3666,19 @@ dependencies = [
"notify",
"oauth2",
"open",
+ "pulldown-cmark",
"ratatui",
"ratatui-image",
"ratatui-textarea",
"ratatui-themekit",
"regex",
"reqwest",
- "rstest",
+ "resvg",
+ "rstest 0.23.0",
"serde",
"serde_json",
+ "sha1 0.10.7",
+ "sha2",
"tachyonfx",
"tempfile",
"thiserror 2.0.18",
@@ -3233,10 +3689,12 @@ dependencies = [
"tracing-appender",
"tracing-subscriber",
"tui-logger",
+ "tui-markdown",
"tui-popup",
"tui-prompts",
"tui-scrollview",
"tui-widget-list",
+ "unicode-segmentation",
"which",
"wiremock",
"zip",
@@ -3248,7 +3706,7 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4147b952f3f819eca0e99527022f7d6a8d05f111aeb0a62960c74eb283bec8fc"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
"once_cell",
"serde",
"serde_derive",
@@ -3256,6 +3714,21 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "roxmltree"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
+
+[[package]]
+name = "roxmltree"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1964b10c76125c36f8afe190065a4bf9a87bf324842c05701330bba9f1cacbb"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "rstest"
version = "0.23.0"
@@ -3264,10 +3737,21 @@ checksum = "0a2c585be59b6b5dd66a9d2084aa1d8bd52fbdb806eafdeffb52791147862035"
dependencies = [
"futures",
"futures-timer",
- "rstest_macros",
+ "rstest_macros 0.23.0",
"rustc_version",
]
+[[package]]
+name = "rstest"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5a3193c063baaa2a95a33f03035c8a72b83d97a54916055ba22d35ed3839d49"
+dependencies = [
+ "futures-timer",
+ "futures-util",
+ "rstest_macros 0.26.1",
+]
+
[[package]]
name = "rstest_macros"
version = "0.23.0"
@@ -3286,6 +3770,24 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "rstest_macros"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c845311f0ff7951c5506121a9ad75aec44d083c31583b2ea5a30bcb0b0abba0"
+dependencies = [
+ "cfg-if",
+ "glob",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "relative-path",
+ "rustc_version",
+ "syn 2.0.117",
+ "unicode-ident",
+]
+
[[package]]
name = "rust-ini"
version = "0.21.3"
@@ -3323,7 +3825,7 @@ version = "0.38.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
"errno",
"libc",
"linux-raw-sys 0.4.15",
@@ -3336,7 +3838,7 @@ version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
"errno",
"libc",
"linux-raw-sys 0.12.1",
@@ -3384,6 +3886,24 @@ version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+[[package]]
+name = "rustybuzz"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702"
+dependencies = [
+ "bitflags 2.13.1",
+ "bytemuck",
+ "core_maths",
+ "log",
+ "smallvec",
+ "ttf-parser",
+ "unicode-bidi-mirroring",
+ "unicode-ccc",
+ "unicode-properties",
+ "unicode-script",
+]
+
[[package]]
name = "ryu"
version = "1.0.23"
@@ -3414,6 +3934,12 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+[[package]]
+name = "self_cell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ab42ca02749e120097e328d91d415325bdf43b1c72c4c8badf37375fe40a813"
+
[[package]]
name = "semver"
version = "1.0.28"
@@ -3442,6 +3968,16 @@ dependencies = [
"typeid",
]
+[[package]]
+name = "serde_bytes"
+version = "0.11.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8"
+dependencies = [
+ "serde",
+ "serde_core",
+]
+
[[package]]
name = "serde_core"
version = "1.0.228"
@@ -3507,6 +4043,17 @@ dependencies = [
"serde",
]
+[[package]]
+name = "sha1"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a978451301f4db1d02937a4ab3ccce137717b81826e79b7d49ffe3244a13c3b8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.2.17",
+ "digest 0.10.7",
+]
+
[[package]]
name = "sha1"
version = "0.11.0"
@@ -3587,6 +4134,15 @@ version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
+[[package]]
+name = "simplecss"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a9c6883ca9c3c7c90e888de77b7a5c849c779d25d74a1269b0218b14e8b136c"
+dependencies = [
+ "log",
+]
+
[[package]]
name = "siphasher"
version = "1.0.2"
@@ -3599,6 +4155,15 @@ version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+[[package]]
+name = "slotmap"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038"
+dependencies = [
+ "version_check",
+]
+
[[package]]
name = "smallvec"
version = "1.15.1"
@@ -3627,6 +4192,39 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+[[package]]
+name = "strict-num"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
+dependencies = [
+ "float-cmp",
+]
+
+[[package]]
+name = "string_cache"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901"
+dependencies = [
+ "new_debug_unreachable",
+ "parking_lot",
+ "phf_shared 0.13.1",
+ "precomputed-hash",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69"
+dependencies = [
+ "phf_generator 0.13.1",
+ "phf_shared 0.13.1",
+ "proc-macro2",
+ "quote",
+]
+
[[package]]
name = "strsim"
version = "0.11.1"
@@ -3635,18 +4233,18 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "strum"
-version = "0.27.2"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
+checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd"
dependencies = [
"strum_macros",
]
[[package]]
name = "strum_macros"
-version = "0.27.2"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
+checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664"
dependencies = [
"heck",
"proc-macro2",
@@ -3660,6 +4258,16 @@ version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+[[package]]
+name = "svgtypes"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "695b5790b3131dafa99b3bbfd25a216edb3d216dad9ca208d4657bfb8f2abc3d"
+dependencies = [
+ "kurbo",
+ "siphasher",
+]
+
[[package]]
name = "symlink"
version = "0.1.0"
@@ -3742,6 +4350,28 @@ dependencies = [
"windows-sys 0.61.2",
]
+[[package]]
+name = "tendril"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fed54709c5b3a53d09bb1c113ea4f5ceafd1e772ddcb0030a82e1d56c087b08"
+dependencies = [
+ "new_debug_unreachable",
+]
+
+[[package]]
+name = "termina"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9048a889effe34a5cddee0af7f53285198b16dca3be510858d38dfdb3e62a04e"
+dependencies = [
+ "bitflags 2.13.1",
+ "parking_lot",
+ "rustix 1.1.4",
+ "signal-hook",
+ "windows-sys 0.61.2",
+]
+
[[package]]
name = "terminfo"
version = "0.9.0"
@@ -3750,8 +4380,8 @@ checksum = "d4ea810f0692f9f51b382fff5893887bb4580f5fa246fde546e0b13e7fcee662"
dependencies = [
"fnv",
"nom",
- "phf",
- "phf_codegen",
+ "phf 0.11.3",
+ "phf_codegen 0.11.3",
]
[[package]]
@@ -3782,7 +4412,7 @@ checksum = "4676b37242ccbd1aabf56edb093a4827dc49086c0ffd764a5705899e0f35f8f7"
dependencies = [
"anyhow",
"base64",
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
"fancy-regex",
"filedescriptor",
"finl_unicode",
@@ -3798,7 +4428,7 @@ dependencies = [
"ordered-float 4.6.0",
"pest",
"pest_derive",
- "phf",
+ "phf 0.11.3",
"serde",
"sha2",
"signal-hook",
@@ -3918,6 +4548,32 @@ dependencies = [
"crunchy",
]
+[[package]]
+name = "tiny-skia"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47ffee5eaaf5527f630fb0e356b90ebdec84d5d18d937c5e440350f88c5a91ea"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "bytemuck",
+ "cfg-if",
+ "log",
+ "png",
+ "tiny-skia-path",
+]
+
+[[package]]
+name = "tiny-skia-path"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edca365c3faccca67d06593c5980fa6c57687de727a03131735bb85f01fdeeb9"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "strict-num",
+]
+
[[package]]
name = "tinystr"
version = "0.8.3"
@@ -4066,7 +4722,7 @@ version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
"bytes",
"futures-util",
"http",
@@ -4180,6 +4836,15 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+[[package]]
+name = "ttf-parser"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
+dependencies = [
+ "core_maths",
+]
+
[[package]]
name = "tui-logger"
version = "0.18.2"
@@ -4197,6 +4862,20 @@ dependencies = [
"unicode-segmentation",
]
+[[package]]
+name = "tui-markdown"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c95afc7b66008823dea2614a800d944e18990690db47517efc66cd01ff9cee"
+dependencies = [
+ "itertools 0.15.0",
+ "pretty_assertions",
+ "pulldown-cmark",
+ "ratatui-core",
+ "rstest 0.26.1",
+ "tracing",
+]
+
[[package]]
name = "tui-popup"
version = "0.7.4"
@@ -4217,7 +4896,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2237609b6d31db3635072e3c2a0a501ab546ce4bbdc96cf1a62c2e7ce0ac7e0f"
dependencies = [
"crossterm 0.29.0",
- "itertools",
+ "itertools 0.14.0",
"ratatui-core",
"ratatui-macros",
"ratatui-widgets",
@@ -4269,12 +4948,48 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
+[[package]]
+name = "unicase"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
+
+[[package]]
+name = "unicode-bidi-mirroring"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfa6e8c60bb66d49db113e0125ee8711b7647b5579dc7f5f19c42357ed039fe"
+
+[[package]]
+name = "unicode-ccc"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce61d488bcdc9bc8b5d1772c404828b17fc481c0a582b5581e95fb233aef503e"
+
[[package]]
name = "unicode-ident"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+[[package]]
+name = "unicode-properties"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
+
+[[package]]
+name = "unicode-script"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee"
+
[[package]]
name = "unicode-segmentation"
version = "1.13.2"
@@ -4287,11 +5002,17 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16b380a1238663e5f8a691f9039c73e1cdae598a30e9855f541d29b08b53e9a5"
dependencies = [
- "itertools",
+ "itertools 0.14.0",
"unicode-segmentation",
"unicode-width",
]
+[[package]]
+name = "unicode-vo"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
+
[[package]]
name = "unicode-width"
version = "0.2.2"
@@ -4329,6 +5050,34 @@ version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+[[package]]
+name = "usvg"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d46cf96c5f498d36b7a9693bc6a7075c0bb9303189d61b2249b0dc3d309c07de"
+dependencies = [
+ "base64",
+ "data-url",
+ "flate2",
+ "fontdb",
+ "imagesize",
+ "kurbo",
+ "log",
+ "pico-args",
+ "roxmltree 0.21.1",
+ "rustybuzz",
+ "simplecss",
+ "siphasher",
+ "strict-num",
+ "svgtypes",
+ "tiny-skia-path",
+ "ttf-parser",
+ "unicode-bidi",
+ "unicode-script",
+ "unicode-vo",
+ "xmlwriter",
+]
+
[[package]]
name = "utf8_iter"
version = "1.0.4"
@@ -4539,7 +5288,7 @@ version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
"hashbrown 0.15.5",
"indexmap",
"semver",
@@ -4565,6 +5314,18 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "web_atoms"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "075474b12bcb3d2e3d4546580e9de478eeeead668a1761e2a8860c836b7ef297"
+dependencies = [
+ "phf 0.13.1",
+ "phf_codegen 0.13.1",
+ "string_cache",
+ "string_cache_codegen",
+]
+
[[package]]
name = "webpki-roots"
version = "1.0.7"
@@ -4574,6 +5335,12 @@ dependencies = [
"rustls-pki-types",
]
+[[package]]
+name = "weezl"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
+
[[package]]
name = "wezterm-bidi"
version = "0.2.3"
@@ -5082,7 +5849,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
dependencies = [
"anyhow",
- "bitflags 2.11.1",
+ "bitflags 2.13.1",
"indexmap",
"log",
"serde",
@@ -5127,6 +5894,12 @@ dependencies = [
"tap",
]
+[[package]]
+name = "xmlwriter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
+
[[package]]
name = "yaml-rust2"
version = "0.10.4"
@@ -5138,6 +5911,12 @@ dependencies = [
"hashlink",
]
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
[[package]]
name = "yoke"
version = "0.8.2"
@@ -5260,7 +6039,7 @@ dependencies = [
"memchr",
"pbkdf2",
"ppmd-rust",
- "sha1",
+ "sha1 0.11.0",
"time",
"typed-path",
"zeroize",
@@ -5319,3 +6098,18 @@ dependencies = [
"cc",
"pkg-config",
]
+
+[[package]]
+name = "zune-core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9"
+
+[[package]]
+name = "zune-jpeg"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
+dependencies = [
+ "zune-core",
+]
diff --git a/Cargo.toml b/Cargo.toml
index bbe1bad..b1457b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,6 +14,7 @@ categories = ["command-line-utilities", "games"]
[package.metadata.wix]
upgrade-guid = "BEC08BE4-6A8F-4C1D-A1B4-B1AC963000AE"
path-guid = "E5863AC2-13FC-45C8-B79D-55338F371A8A"
+include = ["pkg/wix/main.wxs"]
license = false
eula = false
@@ -30,27 +31,34 @@ config = "0.15.6"
crossterm = "0.29.0"
dirs-next = "2.0.0"
log = "0.4"
-ratatui = { version = "0.30.0", features = ["serde"] }
+ratatui = { version = "0.30.0", features = ["serde", "unstable-rendered-line-info"] }
ratatui-themekit = { version = "0.6", features = ["serde"] }
ratatui-textarea = { version = "0.9.1", features = ["crossterm"] }
+tui-markdown = { version = "0.3.7", default-features = false }
+pulldown-cmark = { version = "0.13.4", default-features = false }
+html-to-markdown-rs = { version = "3.9.0", features = ["visitor"] }
+resvg = "0.47"
reqwest = { version = "0.12", default-features = false, features = ["json", "stream", "rustls-tls"] }
serde = { version = "1.0.217", features = ["derive"] }
serde_json = "1.0"
+sha1 = "0.10"
+sha2 = "0.10"
toml = "1.1.2"
tachyonfx = "0.25"
throbber-widgets-tui = "0.11"
thiserror = "2"
-tokio = { version = "1", features = ["full"] }
+tokio = { version = "1", features = ["full", "test-util"] }
tracing = "0.1"
tracing-appender = "0.2"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+unicode-segmentation = "1"
tui-popup = "0.7"
tui-prompts = "0.6"
tui-logger = { version = "0.18", features = ["tracing-support"] }
tui-scrollview = "0.6"
tui-widget-list = "0.15"
-ratatui-image = { version = "10.0.6", default-features = false, features = ["crossterm"] }
-image = { version = "0.25", default-features = false, features = ["png"] }
+ratatui-image = { version = "11.0.6", default-features = false, features = ["crossterm"] }
+image = { version = "0.25", default-features = false, features = ["gif", "jpeg", "png", "webp"] }
zip = "8.5.1"
minecraft-msa-auth = "0.4.0"
oauth2 = "5.0.0"
@@ -61,6 +69,9 @@ notify = "8"
regex = "1"
fast-strip-ansi = "0.13"
libcasr = "2.13"
+fs2 = "0.4"
+fastnbt = "2.6.2"
+flate2 = "1.1.9"
[profile.release]
@@ -69,7 +80,6 @@ lto = true
opt-level = "s"
strip = true
-# The profile that 'dist' will build with
[profile.dist]
inherits = "release"
lto = "thin"
@@ -79,4 +89,4 @@ tempfile = "3"
insta = "1"
wiremock = "0.6"
rstest = "0.23"
-image = { version = "0.25", default-features = false, features = ["png"] }
+image = { version = "0.25", default-features = false, features = ["png", "webp"] }
diff --git a/README.md b/README.md
index d8fdeaa..bcf74be 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ it does everything you'd expect from a launcher.
### modpacks and accounts
-`Modrinth`, `MultiMC`, and `GTNH` modpacks format is supported. Import it from a file, URL, or just the slug. Able to use multiple Microsoft accounts and offline accounts aswell.
+Browse Modrinth and CurseForge modpacks or import Modrinth, CurseForge, MultiMC, Prism, and GTNH packs directly. Direct imports accept a file, Modrinth URL, or project slug. Source builds enable CurseForge when `CURSEFORGE_API_KEY` is set at compile time. Able to use multiple Microsoft accounts and offline accounts aswell.
---
diff --git a/assets/config.toml b/assets/config.toml
index 053d70e..88bf449 100644
--- a/assets/config.toml
+++ b/assets/config.toml
@@ -23,3 +23,17 @@ error_fly_out_ms = 300
# don’t let this blow up endlessly
max_error_events = 50
+
+[content]
+# ask before choosing when the same file exists on multiple providers
+ask_on_provider_conflict = true
+# preferred for duplicate discovery results and automatic conflict resolution
+# accepts "modrinth" or "curseforge"
+preferred_provider = "modrinth"
+# only show results from the preferred provider instead of filling from both
+preferred_provider_only = false
+# retry unchanged files that were not found after this many hours
+unmatched_retry_hours = 24
+# avoid hashing enormous external packs during automatic provider matching;
+# set to 0 to remove the limit
+max_fingerprint_size_mib = 512
diff --git a/dist-workspace.toml b/dist-workspace.toml
index 414a8fd..4561c87 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -26,4 +26,4 @@ hosting = "github"
# Whether to install an updater program
install-updater = false
# Allow custom edits to the generated CI file
-allow-dirty = ["ci"]
+allow-dirty = ["ci", "msi"]
diff --git a/docs/content-dependency-plan.md b/docs/content-dependency-plan.md
new file mode 100644
index 0000000..22e2243
--- /dev/null
+++ b/docs/content-dependency-plan.md
@@ -0,0 +1,84 @@
+# Managed mod dependencies
+
+## Summary
+
+Discovery installs should understand provider-declared mod dependencies. Modrinth
+and CurseForge dependency metadata is normalized into one internal model, while
+modpacks continue to use their existing pack manifests and resource packs and
+shaders remain unchanged.
+
+## Dependency handling
+
+- Recursively resolve required dependencies before downloading anything.
+- For project-only requirements, select the newest compatible stable release for
+ the instance's Minecraft version and loader, falling back to beta and then
+ alpha.
+- Honor exact Modrinth version requirements and fail clearly when the version is
+ incompatible.
+- Deduplicate shared dependencies and reject cycles, incompatible installed
+ projects, and conflicting exact-version requirements.
+- Keep an installed dependency unless the provider requires another exact
+ version.
+- Recognize dependencies installed from the other provider only through an exact
+ fingerprint match.
+- Do not install optional dependencies. Ignore embedded or included files because
+ they are already packaged.
+- Resolve the complete operation before downloading, stage every download, and
+ update files and the content manifest together. Failed operations must restore
+ replaced files and remove staged downloads.
+- Extend the existing install confirmation with the dependencies that will be
+ installed and any installed dependencies that will be replaced.
+
+## Tracking, updates, and removal
+
+- Store required dependency edges, exact provider aliases, and whether a file was
+ installed automatically in the content manifest with backward-compatible
+ defaults.
+- Existing files remain user-managed. Directly installing or changing an
+ automatic dependency promotes it to user-managed content.
+- Recalculate dependencies when a parent mod changes version.
+- Keep the normal content-delete confirmation. If the removal leaves
+ automatically installed dependencies with no remaining dependents, only
+ include projects categorized exclusively as libraries. Missing categories or
+ any additional functional category keep the dependency installed.
+- Keep shared dependencies while any installed mod requires them.
+- Warn and require a stronger confirmation when directly removing a dependency
+ that installed mods still require, but allow the user to continue.
+
+## Provider and UI changes
+
+- Add normalized dependency relations and release type to the provider-neutral
+ version model.
+- Add exact-version lookup to the provider interface.
+- Run dependency resolution while the existing version popup is in its loading
+ state, then reuse its confirmation view for the installation summary.
+- Show optional dependency counts without presenting them as installed content.
+- Keep installation progress in the normal overview status area.
+
+## Tests
+
+- Provider parsing for every dependency relation and release channel.
+- Transitive dependencies, shared libraries, cycles, conflicting versions,
+ incompatible projects, installed matches, and cross-provider fingerprints.
+- Backward-compatible manifest loading, explicit promotion, updates, shared
+ references, and orphan cleanup.
+- Staged installation rollback and successful multi-file commits.
+- TUI interaction and snapshots for dependency summaries, replacements, orphan
+ cleanup, and required-library warnings.
+- Focused tests, the full deterministic suite, Clippy with warnings denied, and
+ the repository snapshot check.
+
+## Discovery roadmap
+
+- [x] Managed mods, resource packs, and shaders
+- [x] Modrinth and built-in CurseForge discovery
+- [x] Modpack browsing and import
+- [x] Search, endless scrolling, and page jumping
+- [x] Provider project pages and version selection
+- [x] Managed mod dependencies
+- [x] Datapack discovery
+- [x] Compatible update checks for managed content and discovered modpacks
+- [x] Atomic bulk updates for mods, resource packs, shaders, and per-world datapacks
+- [x] Rollback-safe managed modpack updates that preserve user files
+- [x] Reinstall and arbitrary modpack version controls using the shared refresh engine
+- [ ] Settings tab rework
diff --git a/wix/main.wxs b/pkg/wix/main.wxs
similarity index 95%
rename from wix/main.wxs
rename to pkg/wix/main.wxs
index 8d18f36..0ded670 100644
--- a/wix/main.wxs
+++ b/pkg/wix/main.wxs
@@ -170,7 +170,7 @@
The product icon is the graphic that appears in the Add/Remove
Programs control panel for the application.
-->
-
+
@@ -210,7 +210,7 @@
The banner BMP dimensions are 493 x 58 pixels.
-->
-
+
-
+
diff --git a/src/auth/accounts.rs b/src/auth/accounts.rs
index a3f2107..300a697 100644
--- a/src/auth/accounts.rs
+++ b/src/auth/accounts.rs
@@ -192,188 +192,5 @@ pub fn create_offline_account(username: &str) -> Account {
}
#[cfg(test)]
-mod tests {
- use super::*;
-
- #[test]
- fn offline_uuid_is_valid_format() {
- let uuid = offline_uuid("Steve");
- let parts: Vec<&str> = uuid.split('-').collect();
- assert_eq!(parts.len(), 5, "UUID must have 5 dash-separated parts");
- assert_eq!(parts[0].len(), 8);
- assert_eq!(parts[1].len(), 4);
- assert_eq!(parts[2].len(), 4);
- assert_eq!(parts[3].len(), 4);
- assert_eq!(parts[4].len(), 12);
- }
-
- #[test]
- fn offline_uuid_version_3_marker() {
- let uuid = offline_uuid("Steve");
- assert!(uuid.split('-').nth(2).unwrap().starts_with('3'));
- }
-
- #[test]
- fn offline_uuid_variant_bit_set() {
- let uuid = offline_uuid("Steve");
- let part3 = uuid.split('-').nth(3).unwrap();
- let first_nibble = u8::from_str_radix(&part3[..1], 16).unwrap();
- assert!((0x8..=0xb).contains(&first_nibble));
- }
-
- #[test]
- fn offline_uuid_deterministic() {
- assert_eq!(offline_uuid("Steve"), offline_uuid("Steve"));
- assert_eq!(offline_uuid("Alex"), offline_uuid("Alex"));
- }
-
- #[test]
- fn offline_uuid_different_for_different_names() {
- assert_ne!(offline_uuid("Steve"), offline_uuid("Alex"));
- }
-
- #[test]
- fn create_offline_account_fields() {
- let acc = create_offline_account("TestPlayer");
- assert_eq!(acc.username, "TestPlayer");
- assert_eq!(acc.account_type, AccountType::Offline);
- assert!(!acc.active);
- assert!(acc.refresh_token.is_none());
- // pin the uuid to the deterministic offline_uuid output so a regression
- // in the uuid derivation (e.g. salt change) would fail this test, not
- // just a non-empty-string check that any garbage would pass.
- assert_eq!(acc.uuid, offline_uuid("TestPlayer"));
- }
-
- fn make_store(dir: &std::path::Path) -> AccountStore {
- AccountStore {
- accounts: Vec::new(),
- path: dir.join("accounts.json"),
- }
- }
-
- fn microsoft_account(name: &str) -> Account {
- Account {
- uuid: format!("00000000-0000-0000-0000-{:012}", name.len()),
- username: name.to_owned(),
- account_type: AccountType::Microsoft,
- active: false,
- refresh_token: Some("refresh".to_owned()),
- cached_mc_token: None,
- cached_mc_token_expires_at: None,
- }
- }
-
- #[test]
- fn store_add_first_becomes_active() {
- let tmp = tempfile::tempdir().unwrap();
- let mut store = make_store(tmp.path());
- store.add(create_offline_account("Alice"));
- assert_eq!(store.accounts.len(), 1);
- assert!(store.accounts[0].active);
- }
-
- #[test]
- fn store_add_second_stays_inactive() {
- let tmp = tempfile::tempdir().unwrap();
- let mut store = make_store(tmp.path());
- store.add(create_offline_account("Alice"));
- store.add(create_offline_account("Bob"));
- assert_eq!(store.accounts.len(), 2);
- assert!(store.accounts[0].active);
- assert!(!store.accounts[1].active);
- }
-
- #[test]
- fn store_add_duplicate_uuid_replaces() {
- let tmp = tempfile::tempdir().unwrap();
- let mut store = make_store(tmp.path());
- store.add(create_offline_account("Alice"));
- let mut dup = create_offline_account("Alice");
- dup.username = "AliceRenamed".to_owned();
- dup.uuid = store.accounts[0].uuid.clone();
- store.add(dup);
- assert_eq!(store.accounts.len(), 1);
- assert_eq!(store.accounts[0].username, "AliceRenamed");
- }
-
- #[test]
- fn store_active_account_none_when_empty() {
- let tmp = tempfile::tempdir().unwrap();
- let store = make_store(tmp.path());
- assert!(store.active_account().is_none());
- }
-
- #[test]
- fn store_has_microsoft_account_when_one_exists() {
- let tmp = tempfile::tempdir().unwrap();
- let mut store = make_store(tmp.path());
- store.add(create_offline_account("Offline"));
- assert!(!store.has_microsoft_account());
-
- store.add(microsoft_account("Owner"));
- assert!(store.has_microsoft_account());
- }
-
- #[test]
- fn store_active_account_returns_active() {
- let tmp = tempfile::tempdir().unwrap();
- let mut store = make_store(tmp.path());
- store.add(create_offline_account("Alice"));
- store.add(create_offline_account("Bob"));
- let active = store.active_account().unwrap();
- assert_eq!(active.username, "Alice");
- }
-
- #[test]
- fn store_set_active_changes_active() {
- let tmp = tempfile::tempdir().unwrap();
- let mut store = make_store(tmp.path());
- store.add(create_offline_account("Alice"));
- store.add(create_offline_account("Bob"));
- store.set_active(1);
- assert!(!store.accounts[0].active);
- assert!(store.accounts[1].active);
- }
-
- #[test]
- fn store_remove_activates_first_remaining() {
- let tmp = tempfile::tempdir().unwrap();
- let mut store = make_store(tmp.path());
- store.add(create_offline_account("Alice"));
- store.add(create_offline_account("Bob"));
- store.remove(0);
- assert_eq!(store.accounts.len(), 1);
- assert_eq!(store.accounts[0].username, "Bob");
- assert!(store.accounts[0].active);
- }
-
- #[test]
- fn store_remove_out_of_bounds_noop() {
- let tmp = tempfile::tempdir().unwrap();
- let mut store = make_store(tmp.path());
- store.add(create_offline_account("Alice"));
- store.remove(5);
- assert_eq!(store.accounts.len(), 1);
- }
-
- #[test]
- fn store_save_and_reload() {
- let tmp = tempfile::tempdir().unwrap();
- let mut store = make_store(tmp.path());
- store.add(create_offline_account("Alice"));
- store.add(create_offline_account("Bob"));
- store.save();
-
- let reloaded = AccountStore {
- accounts: serde_json::from_str(
- &std::fs::read_to_string(tmp.path().join("accounts.json")).unwrap(),
- )
- .unwrap(),
- path: tmp.path().join("accounts.json"),
- };
- assert_eq!(reloaded.accounts.len(), 2);
- assert_eq!(reloaded.accounts[0].username, "Alice");
- assert!(reloaded.accounts[0].active);
- }
-}
+#[path = "tests/accounts.rs"]
+mod tests;
diff --git a/src/auth/oauth.rs b/src/auth/oauth.rs
index ab4b9bb..87ebae6 100644
--- a/src/auth/oauth.rs
+++ b/src/auth/oauth.rs
@@ -34,6 +34,19 @@ struct McProfile {
name: String,
}
+fn normalize_profile_uuid(id: &str) -> Option {
+ (id.len() == 32 && id.bytes().all(|byte| byte.is_ascii_hexdigit())).then(|| {
+ format!(
+ "{}-{}-{}-{}-{}",
+ &id[..8],
+ &id[8..12],
+ &id[12..16],
+ &id[16..20],
+ &id[20..32],
+ )
+ })
+}
+
// shared slot so the TUI can poll for the device code to show the user
pub static DEVICE_CODE_DISPLAY: LazyLock>>> =
LazyLock::new(|| Arc::new(Mutex::new(None)));
@@ -61,7 +74,7 @@ async fn run_full_oauth_flow() -> Result<(String, Option), String> {
user_code: details.user_code().secret().to_owned(),
verification_uri: details.verification_uri().to_string(),
});
- crate::tui::request_redraw();
+ crate::feedback::request_redraw();
}
let token = oauth_client
@@ -86,7 +99,7 @@ pub fn start_microsoft_auth() -> Arc>> {
let outcome = run_full_auth_flow().await;
if let Ok(mut slot) = result_clone.lock() {
*slot = Some(outcome);
- crate::tui::request_redraw();
+ crate::feedback::request_redraw();
}
});
@@ -136,17 +149,9 @@ async fn exchange_and_build_account(
};
// mojang returns uuids without dashes
- let uuid = if profile.id.len() == 32 {
- format!(
- "{}-{}-{}-{}-{}",
- &profile.id[..8],
- &profile.id[8..12],
- &profile.id[12..16],
- &profile.id[16..20],
- &profile.id[20..32],
- )
- } else {
- profile.id.clone()
+ let uuid = match normalize_profile_uuid(&profile.id) {
+ Some(uuid) => uuid,
+ None => return AuthResult::Error("Profile returned an invalid UUID".to_owned()),
};
AuthResult::Success(Account {
@@ -237,41 +242,5 @@ pub async fn refresh_and_get_token(
}
#[cfg(test)]
-mod tests {
- use super::*;
-
- fn microsoft_account(cached_mc_token_expires_at: Option) -> Account {
- Account {
- uuid: "00000000-0000-0000-0000-000000000000".to_owned(),
- username: "TestPlayer".to_owned(),
- account_type: AccountType::Microsoft,
- active: true,
- refresh_token: Some("refresh".to_owned()),
- cached_mc_token: Some("cached".to_owned()),
- cached_mc_token_expires_at,
- }
- }
-
- #[test]
- fn cached_mc_token_is_valid_before_refresh_margin() {
- let now = 1_000;
- let account = microsoft_account(Some(now + MC_TOKEN_CACHE_REFRESH_MARGIN_SECS + 1));
-
- assert_eq!(valid_cached_mc_token(&account, now), Some("cached"));
- }
-
- #[test]
- fn cached_mc_token_expires_inside_refresh_margin() {
- let now = 1_000;
- let account = microsoft_account(Some(now + MC_TOKEN_CACHE_REFRESH_MARGIN_SECS));
-
- assert!(valid_cached_mc_token(&account, now).is_none());
- }
-
- #[test]
- fn cached_mc_token_requires_expiry() {
- let account = microsoft_account(None);
-
- assert!(valid_cached_mc_token(&account, 1_000).is_none());
- }
-}
+#[path = "tests/oauth.rs"]
+mod tests;
diff --git a/src/auth/tests/accounts.rs b/src/auth/tests/accounts.rs
new file mode 100644
index 0000000..de9745e
--- /dev/null
+++ b/src/auth/tests/accounts.rs
@@ -0,0 +1,184 @@
+use super::*;
+
+impl AccountStore {
+ pub(crate) fn empty_for_test(path: PathBuf) -> Self {
+ Self {
+ accounts: Vec::new(),
+ path,
+ }
+ }
+}
+
+#[test]
+fn offline_uuid_has_valid_v3_shape() {
+ let uuid = offline_uuid("Steve");
+ let parts: Vec<&str> = uuid.split('-').collect();
+ assert_eq!(parts.len(), 5, "UUID must have 5 dash-separated parts");
+ assert_eq!(parts[0].len(), 8);
+ assert_eq!(parts[1].len(), 4);
+ assert_eq!(parts[2].len(), 4);
+ assert_eq!(parts[3].len(), 4);
+ assert_eq!(parts[4].len(), 12);
+ assert!(parts[2].starts_with('3'));
+ let first_nibble = u8::from_str_radix(&parts[3][..1], 16).unwrap();
+ assert!((0x8..=0xb).contains(&first_nibble));
+}
+
+#[test]
+fn offline_uuid_is_pinned_for_known_names() {
+ assert_eq!(
+ offline_uuid("Steve"),
+ "7e0a3689-ed7c-347c-87cc-3689ed7c47cc"
+ );
+ assert_eq!(offline_uuid("Alex"), "a13d42a3-454f-3e39-a392-42a3454fe392");
+}
+
+#[test]
+fn offline_uuid_different_for_different_names() {
+ assert_ne!(offline_uuid("Steve"), offline_uuid("Alex"));
+}
+
+#[test]
+fn create_offline_account_fields() {
+ let acc = create_offline_account("TestPlayer");
+ assert_eq!(acc.username, "TestPlayer");
+ assert_eq!(acc.account_type, AccountType::Offline);
+ assert!(!acc.active);
+ assert!(acc.refresh_token.is_none());
+ // pin the uuid to the deterministic offline_uuid output so a regression
+ // in the uuid derivation (e.g. salt change) would fail this test, not
+ // just a non-empty-string check that any garbage would pass.
+ assert_eq!(acc.uuid, offline_uuid("TestPlayer"));
+}
+
+fn make_store(dir: &std::path::Path) -> AccountStore {
+ AccountStore {
+ accounts: Vec::new(),
+ path: dir.join("accounts.json"),
+ }
+}
+
+fn microsoft_account(name: &str) -> Account {
+ Account {
+ uuid: format!("00000000-0000-0000-0000-{:012}", name.len()),
+ username: name.to_owned(),
+ account_type: AccountType::Microsoft,
+ active: false,
+ refresh_token: Some("refresh".to_owned()),
+ cached_mc_token: None,
+ cached_mc_token_expires_at: None,
+ }
+}
+
+#[test]
+fn store_add_first_becomes_active() {
+ let tmp = tempfile::tempdir().unwrap();
+ let mut store = make_store(tmp.path());
+ store.add(create_offline_account("Alice"));
+ assert_eq!(store.accounts.len(), 1);
+ assert!(store.accounts[0].active);
+}
+
+#[test]
+fn store_add_second_stays_inactive() {
+ let tmp = tempfile::tempdir().unwrap();
+ let mut store = make_store(tmp.path());
+ store.add(create_offline_account("Alice"));
+ store.add(create_offline_account("Bob"));
+ assert_eq!(store.accounts.len(), 2);
+ assert!(store.accounts[0].active);
+ assert!(!store.accounts[1].active);
+}
+
+#[test]
+fn store_add_duplicate_uuid_replaces() {
+ let tmp = tempfile::tempdir().unwrap();
+ let mut store = make_store(tmp.path());
+ store.add(create_offline_account("Alice"));
+ let mut dup = create_offline_account("Alice");
+ dup.username = "AliceRenamed".to_owned();
+ dup.uuid = store.accounts[0].uuid.clone();
+ store.add(dup);
+ assert_eq!(store.accounts.len(), 1);
+ assert_eq!(store.accounts[0].username, "AliceRenamed");
+}
+
+#[test]
+fn store_active_account_none_when_empty() {
+ let tmp = tempfile::tempdir().unwrap();
+ let store = make_store(tmp.path());
+ assert!(store.active_account().is_none());
+}
+
+#[test]
+fn store_has_microsoft_account_when_one_exists() {
+ let tmp = tempfile::tempdir().unwrap();
+ let mut store = make_store(tmp.path());
+ store.add(create_offline_account("Offline"));
+ assert!(!store.has_microsoft_account());
+
+ store.add(microsoft_account("Owner"));
+ assert!(store.has_microsoft_account());
+}
+
+#[test]
+fn store_active_account_returns_active() {
+ let tmp = tempfile::tempdir().unwrap();
+ let mut store = make_store(tmp.path());
+ store.add(create_offline_account("Alice"));
+ store.add(create_offline_account("Bob"));
+ let active = store.active_account().unwrap();
+ assert_eq!(active.username, "Alice");
+}
+
+#[test]
+fn store_set_active_changes_active() {
+ let tmp = tempfile::tempdir().unwrap();
+ let mut store = make_store(tmp.path());
+ store.add(create_offline_account("Alice"));
+ store.add(create_offline_account("Bob"));
+ store.set_active(1);
+ assert!(!store.accounts[0].active);
+ assert!(store.accounts[1].active);
+}
+
+#[test]
+fn store_remove_activates_first_remaining() {
+ let tmp = tempfile::tempdir().unwrap();
+ let mut store = make_store(tmp.path());
+ store.add(create_offline_account("Alice"));
+ store.add(create_offline_account("Bob"));
+ store.remove(0);
+ assert_eq!(store.accounts.len(), 1);
+ assert_eq!(store.accounts[0].username, "Bob");
+ assert!(store.accounts[0].active);
+}
+
+#[test]
+fn store_remove_out_of_bounds_noop() {
+ let tmp = tempfile::tempdir().unwrap();
+ let mut store = make_store(tmp.path());
+ store.add(create_offline_account("Alice"));
+ store.remove(5);
+ assert_eq!(store.accounts.len(), 1);
+}
+
+#[test]
+fn store_save_and_reload() {
+ let tmp = tempfile::tempdir().unwrap();
+ let mut store = make_store(tmp.path());
+ store.add(create_offline_account("Alice"));
+ store.add(create_offline_account("Bob"));
+ store.save();
+
+ let reloaded = AccountStore {
+ accounts: serde_json::from_str(
+ &std::fs::read_to_string(tmp.path().join("accounts.json")).unwrap(),
+ )
+ .unwrap(),
+ path: tmp.path().join("accounts.json"),
+ };
+ assert_eq!(reloaded.accounts.len(), 2);
+ assert_eq!(reloaded.accounts[0].username, "Alice");
+ assert!(reloaded.accounts[0].active);
+}
diff --git a/src/auth/tests/oauth.rs b/src/auth/tests/oauth.rs
new file mode 100644
index 0000000..ef8f05e
--- /dev/null
+++ b/src/auth/tests/oauth.rs
@@ -0,0 +1,52 @@
+use super::*;
+
+fn microsoft_account(cached_mc_token_expires_at: Option) -> Account {
+ Account {
+ uuid: "00000000-0000-0000-0000-000000000000".to_owned(),
+ username: "TestPlayer".to_owned(),
+ account_type: AccountType::Microsoft,
+ active: true,
+ refresh_token: Some("refresh".to_owned()),
+ cached_mc_token: Some("cached".to_owned()),
+ cached_mc_token_expires_at,
+ }
+}
+
+#[test]
+fn cached_mc_token_is_valid_before_refresh_margin() {
+ let now = 1_000;
+ let account = microsoft_account(Some(now + MC_TOKEN_CACHE_REFRESH_MARGIN_SECS + 1));
+
+ assert_eq!(valid_cached_mc_token(&account, now), Some("cached"));
+}
+
+#[test]
+fn cached_mc_token_expires_inside_refresh_margin() {
+ let now = 1_000;
+ let account = microsoft_account(Some(now + MC_TOKEN_CACHE_REFRESH_MARGIN_SECS));
+
+ assert!(valid_cached_mc_token(&account, now).is_none());
+}
+
+#[test]
+fn cached_mc_token_requires_expiry() {
+ let account = microsoft_account(None);
+
+ assert!(valid_cached_mc_token(&account, 1_000).is_none());
+}
+
+#[test]
+fn profile_uuid_is_normalized_without_slicing_unicode() {
+ assert_eq!(
+ normalize_profile_uuid("0123456789abcdef0123456789abcdef"),
+ Some("01234567-89ab-cdef-0123-456789abcdef".to_owned())
+ );
+
+ let unicode_id = format!("{}é{}", "a".repeat(7), "b".repeat(23));
+ assert_eq!(unicode_id.len(), 32);
+ assert_eq!(normalize_profile_uuid(&unicode_id), None);
+ assert_eq!(
+ normalize_profile_uuid("not-a-valid-minecraft-profile-id"),
+ None
+ );
+}
diff --git a/src/cli/account.rs b/src/cli/account.rs
index 4e61a98..b9032d4 100644
--- a/src/cli/account.rs
+++ b/src/cli/account.rs
@@ -19,22 +19,6 @@ pub async fn handle_account(matches: &ArgMatches) -> CliResult {
}
}
-// trait indirection so a mock store can be swapped in for tests
-trait AccountStoreLike {
- fn has_microsoft_account(&self) -> bool;
- fn add_account(&mut self, account: Account);
-}
-
-impl AccountStoreLike for AccountStore {
- fn has_microsoft_account(&self) -> bool {
- AccountStore::has_microsoft_account(self)
- }
-
- fn add_account(&mut self, account: Account) {
- self.add(account);
- }
-}
-
fn list_accounts() -> CliResult {
let store = AccountStore::load();
let rows = store
@@ -109,7 +93,7 @@ async fn add_microsoft_account() -> CliResult {
}
}
-fn add_offline_account(store: &mut T, username: &str) -> CliResult {
+fn add_offline_account(store: &mut AccountStore, username: &str) -> CliResult {
let username = username.trim();
if username.is_empty() {
return Err(io::Error::other("offline username cannot be empty").into());
@@ -121,7 +105,7 @@ fn add_offline_account(store: &mut T, username: &str) -> Cl
.into());
}
- store.add_account(crate::auth::create_offline_account(username));
+ store.add(crate::auth::create_offline_account(username));
Ok(())
}
@@ -160,63 +144,5 @@ fn find_account_index(accounts: &[Account], username: &str) -> Option {
use super::utils::{confirm, required_arg};
#[cfg(test)]
-mod tests {
- use super::{AccountStoreLike, add_offline_account};
- use crate::auth::{Account, AccountType};
-
- #[derive(Default)]
- struct MockStore {
- accounts: Vec,
- }
-
- impl AccountStoreLike for MockStore {
- fn has_microsoft_account(&self) -> bool {
- self.accounts
- .iter()
- .any(|account| account.account_type == AccountType::Microsoft)
- }
-
- fn add_account(&mut self, account: Account) {
- self.accounts.push(account);
- }
- }
-
- fn microsoft_account() -> Account {
- Account {
- uuid: "00000000-0000-0000-0000-000000000001".to_owned(),
- username: "Owner".to_owned(),
- account_type: AccountType::Microsoft,
- active: false,
- refresh_token: Some("refresh".to_owned()),
- cached_mc_token: None,
- cached_mc_token_expires_at: None,
- }
- }
-
- #[test]
- fn creates_offline_account_after_microsoft_account_exists() {
- let mut store = MockStore::default();
- store.add_account(microsoft_account());
- add_offline_account(&mut store, "Steve").expect("offline account should be added");
-
- assert_eq!(store.accounts.len(), 2);
- assert_eq!(store.accounts[1].username, "Steve");
- assert_eq!(store.accounts[1].account_type, AccountType::Offline);
- }
-
- #[test]
- fn rejects_offline_account_before_microsoft_account_exists() {
- let mut store = MockStore::default();
- let err = add_offline_account(&mut store, "Steve")
- .expect_err("offline account should require a microsoft account");
-
- assert!(err.to_string().contains("Microsoft account"));
- assert!(store.accounts.is_empty());
- }
-
- #[test]
- fn rejects_empty_offline_username() {
- let mut store = MockStore::default();
- assert!(add_offline_account(&mut store, " ").is_err());
- }
-}
+#[path = "tests/account.rs"]
+mod tests;
diff --git a/src/cli/content.rs b/src/cli/content.rs
index dc5781a..fb65f8d 100644
--- a/src/cli/content.rs
+++ b/src/cli/content.rs
@@ -8,7 +8,7 @@ use clap::ArgMatches;
use super::utils::{require_instance, required_arg};
use crate::cli::output::print_table;
-use crate::instance::ContentEntry;
+use crate::instance::content::entry::ContentEntry;
type CliResult = Result<(), Box>;
type Scanner = fn(&Path, &str) -> Vec;
@@ -106,7 +106,7 @@ fn toggle_entry(
return Ok(());
}
- crate::instance::content::mods::toggle_entry(entry)?;
+ crate::instance::content::entry::toggle_entry(entry)?;
println!(
"{}d '{}'.",
if should_enable { "Enable" } else { "Disable" },
@@ -116,33 +116,5 @@ fn toggle_entry(
}
#[cfg(test)]
-mod tests {
- use super::find_entry_by_stem;
- use crate::instance::ContentEntry;
- use std::path::PathBuf;
-
- fn entry(file_stem: &str) -> ContentEntry {
- ContentEntry {
- file_stem: file_stem.to_string(),
- name: file_stem.to_string(),
- description: String::new(),
- enabled: true,
- icon_bytes: None,
- path: PathBuf::from(file_stem),
- icon_lines: None,
- }
- }
-
- #[test]
- fn matches_by_stem_case_insensitively() {
- let entries = vec![entry("Sodium"), entry("Lithium")];
- let found = find_entry_by_stem(&entries, "sOdIuM").expect("entry should match");
- assert_eq!(found.file_stem, "Sodium");
- }
-
- #[test]
- fn returns_none_for_missing_stem() {
- let entries = vec![entry("Sodium")];
- assert!(find_entry_by_stem(&entries, "iris").is_none());
- }
-}
+#[path = "tests/content.rs"]
+mod tests;
diff --git a/src/cli/import.rs b/src/cli/import.rs
index b08a1df..f4d46ab 100644
--- a/src/cli/import.rs
+++ b/src/cli/import.rs
@@ -39,18 +39,7 @@ pub async fn handle_import(matches: &ArgMatches) -> CliResult {
.await
.map_err(|e| format!("Failed to fetch versions: {e}"))?;
- if versions.is_empty() {
- return Err("No versions found for this modpack".into());
- }
-
- let version = if let Some(version_name) = override_version {
- versions
- .iter()
- .find(|v| v.version_number == *version_name || v.name == *version_name)
- .ok_or_else(|| format!("Version '{version_name}' not found"))?
- } else {
- &versions[0]
- };
+ let version = select_version(&versions, override_version.map(String::as_str))?;
println!(
"Using version {} ({})",
@@ -58,7 +47,7 @@ pub async fn handle_import(matches: &ArgMatches) -> CliResult {
version.game_versions.first().unwrap_or(&"?".to_string())
);
- let tmp_dir = manager.meta_dir.join("tmp");
+ let tmp_dir = crate::storage::MetadataPaths::new(&manager.meta_dir).temporary();
std::fs::create_dir_all(&tmp_dir)?;
modrinth::download_mrpack(&client, version, &tmp_dir)
.await
@@ -79,7 +68,7 @@ pub async fn handle_import(matches: &ArgMatches) -> CliResult {
version.game_versions.first().unwrap_or(&"?".to_string())
);
- let tmp_dir = manager.meta_dir.join("tmp");
+ let tmp_dir = crate::storage::MetadataPaths::new(&manager.meta_dir).temporary();
std::fs::create_dir_all(&tmp_dir)?;
modrinth::download_mrpack(&client, &version, &tmp_dir)
.await
@@ -110,3 +99,26 @@ pub async fn handle_import(matches: &ArgMatches) -> CliResult {
println!("Instance '{}' created successfully.", config.name);
Ok(())
}
+
+fn select_version<'a>(
+ versions: &'a [modrinth::VersionInfo],
+ requested: Option<&str>,
+) -> Result<&'a modrinth::VersionInfo, String> {
+ requested.map_or_else(
+ || {
+ versions
+ .first()
+ .ok_or_else(|| "No versions found for this modpack".to_owned())
+ },
+ |name| {
+ versions
+ .iter()
+ .find(|version| version.version_number == name || version.name == name)
+ .ok_or_else(|| format!("Version '{name}' not found"))
+ },
+ )
+}
+
+#[cfg(test)]
+#[path = "tests/import.rs"]
+mod tests;
diff --git a/src/cli/instance.rs b/src/cli/instance.rs
index f5f2435..62c181d 100644
--- a/src/cli/instance.rs
+++ b/src/cli/instance.rs
@@ -7,8 +7,8 @@ use clap::ArgMatches;
use super::utils::{confirm, required_arg};
use crate::cli::output::{format_datetime, print_table};
+use crate::instance::runtime::RunState;
use crate::instance::{InstanceManager, ModLoader};
-use crate::running::RunState;
type CliResult = Result<(), Box>;
const LOCAL_CONFIG_PROFILE: &str = "instance default";
@@ -136,14 +136,14 @@ async fn launch_instance(matches: &ArgMatches) -> CliResult {
let meta_dir = crate::config::SETTINGS.paths.resolve_meta_dir();
let config = manager.load_one(name)?;
- crate::instance::launch::launch(&config, &instances_dir, &meta_dir)
+ crate::instance::launch::launch(&config, &instances_dir, &meta_dir, None)
.await
.map_err(|error| io::Error::other(format!("Launch failed: {}", error)))?;
// poll until the game process exits. in CLI mode this blocks here
// so the user gets a proper exit code at the end.
loop {
- match crate::running::get(name) {
+ match crate::instance::runtime::get(name) {
Some(RunState::Crashed(Some(code))) => {
println!("Game exited with status {}", code);
break;
@@ -354,21 +354,5 @@ fn apply_config_update(
}
#[cfg(test)]
-mod tests {
- use super::parse_resolution;
-
- #[test]
- fn parses_valid_resolution() {
- assert_eq!(
- parse_resolution("1920x1080").expect("should parse"),
- (1920, 1080)
- );
- }
-
- #[test]
- fn rejects_invalid_resolution_format() {
- assert!(parse_resolution("1920").is_err());
- assert!(parse_resolution("1920xa").is_err());
- assert!(parse_resolution("0x1080").is_err());
- }
-}
+#[path = "tests/instance.rs"]
+mod tests;
diff --git a/src/cli/log.rs b/src/cli/log.rs
index 862469a..dfd75e2 100644
--- a/src/cli/log.rs
+++ b/src/cli/log.rs
@@ -20,7 +20,7 @@ pub async fn handle_log(matches: &ArgMatches) -> CliResult {
fn list_logs(instance: &str) -> CliResult {
let instances_dir = crate::config::SETTINGS.paths.resolve_instances_dir();
require_instance(&instances_dir, instance)?;
- let rows = crate::instance::log_files::scan_log_files(&instances_dir, instance)
+ let rows = crate::instance::logs::files::scan_log_files(&instances_dir, instance)
.into_iter()
.map(|entry| {
let size = std::fs::metadata(&entry.path)
@@ -42,7 +42,7 @@ async fn show_log(matches: &ArgMatches) -> CliResult {
require_instance(&instances_dir, instance)?;
let path = resolve_log_path(&instances_dir, instance, file)?;
- let lines = crate::instance::log_files::read_log_file(&path);
+ let lines = crate::instance::logs::files::read_log_file(&path);
for line in &lines {
println!("{}", line);
}
@@ -53,7 +53,7 @@ async fn show_log(matches: &ArgMatches) -> CliResult {
let mut last_len = lines.len();
loop {
tokio::time::sleep(Duration::from_millis(500)).await;
- let new_lines = crate::instance::log_files::read_log_file(&path);
+ let new_lines = crate::instance::logs::files::read_log_file(&path);
for line in new_lines.iter().skip(last_len) {
println!("{}", line);
}
@@ -71,14 +71,14 @@ pub(crate) fn resolve_log_path(
file: Option<&str>,
) -> Result {
if let Some(name) = file {
- let path = crate::instance::log_files::log_dir(instances_dir, instance).join(name);
+ let path = crate::instance::logs::files::log_dir(instances_dir, instance).join(name);
if !path.exists() {
return Err(io::Error::other(format!("log '{}' not found", name)));
}
return Ok(path);
}
- crate::instance::log_files::scan_log_files(instances_dir, instance)
+ crate::instance::logs::files::scan_log_files(instances_dir, instance)
.into_iter()
.next()
.map(|entry| entry.path)
@@ -88,36 +88,5 @@ pub(crate) fn resolve_log_path(
use super::utils::{require_instance, required_arg};
#[cfg(test)]
-mod tests {
- use super::resolve_log_path;
-
- #[test]
- fn resolves_latest_log_when_no_file_is_given() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = tmp.path().join("demo/.minecraft/logs/launches");
- std::fs::create_dir_all(&dir).expect("log directory should exist");
- std::fs::write(dir.join("2024-01-02_03-04-05.log"), "newer").expect("write newer log");
- std::fs::write(dir.join("2024-01-01_03-04-05.log"), "older").expect("write older log");
-
- let path = resolve_log_path(tmp.path(), "demo", None).expect("latest log should resolve");
- assert_eq!(
- path.file_name().and_then(|name| name.to_str()),
- Some("2024-01-02_03-04-05.log")
- );
- }
-
- #[test]
- fn resolves_named_log_file() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = tmp.path().join("demo/.minecraft/logs/launches");
- std::fs::create_dir_all(&dir).expect("log directory should exist");
- std::fs::write(dir.join("latest.log"), "hello").expect("write named log");
-
- let path = resolve_log_path(tmp.path(), "demo", Some("latest.log"))
- .expect("named log should resolve");
- assert_eq!(
- path.file_name().and_then(|name| name.to_str()),
- Some("latest.log")
- );
- }
-}
+#[path = "tests/log.rs"]
+mod tests;
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 7af32a9..91f1571 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -24,6 +24,49 @@ pub async fn init() {
return;
}
+ let instances_dir = crate::config::SETTINGS.paths.resolve_instances_dir();
+ let meta_dir = crate::config::SETTINGS.paths.resolve_meta_dir();
+ if crate::layout_migration::is_needed(&instances_dir, &meta_dir) {
+ let config = crate::config::get_config_path().join("config.toml");
+ if let Err(error) =
+ crate::layout_migration::run(&instances_dir, &meta_dir, &config, |progress| {
+ eprintln!(
+ "{}: {} ({}/{})",
+ progress.phase, progress.item, progress.current, progress.total
+ );
+ })
+ {
+ eprintln!("error: layout migration failed safely: {error}");
+ std::process::exit(1);
+ }
+ } else if let Err(error) = crate::layout_migration::initialize_new_layout(&meta_dir) {
+ eprintln!("error: cannot initialize metadata layout: {error}");
+ std::process::exit(1);
+ }
+ if crate::layout_migration::cache_rebuild_pending(&meta_dir) {
+ let manager = crate::instance::InstanceManager::new(&instances_dir, &meta_dir);
+ let instances = manager.load_all();
+ for (index, instance) in instances.iter().enumerate() {
+ eprintln!(
+ "Rebuilding runtime cache: {} ({}/{})",
+ instance.name,
+ index + 1,
+ instances.len()
+ );
+ if let Err(error) = manager.repair_runtime_cache(instance).await {
+ eprintln!(
+ "error: runtime cache rebuild stopped safely for '{}': {error}",
+ instance.name
+ );
+ std::process::exit(1);
+ }
+ }
+ if let Err(error) = crate::layout_migration::finish_cache_rebuild(&meta_dir) {
+ eprintln!("error: cannot finish runtime cache migration: {error}");
+ std::process::exit(1);
+ }
+ }
+
let result = match matches.subcommand() {
Some(("instance", sub_matches)) => instance::handle_instance(sub_matches).await,
Some(("mod", sub_matches)) => content::handle_mod(sub_matches),
@@ -246,21 +289,5 @@ fn build_content_command(name: &'static str, about: &'static str) -> Command {
}
#[cfg(test)]
-mod tests {
- use super::build_command;
-
- #[test]
- fn parses_instance_list_subcommand() {
- let matches = build_command()
- .try_get_matches_from(["rmcl", "instance", "list"])
- .expect("command should parse");
- let instance = matches
- .subcommand_matches("instance")
- .expect("instance subcommand should be present");
- assert_eq!(
- instance.subcommand_name(),
- Some("list"),
- "instance list should resolve to the list subcommand"
- );
- }
-}
+#[path = "tests/arguments.rs"]
+mod tests;
diff --git a/src/cli/output.rs b/src/cli/output.rs
index 9d8c56a..18f9f84 100644
--- a/src/cli/output.rs
+++ b/src/cli/output.rs
@@ -78,30 +78,5 @@ fn render_separator(widths: &[usize]) -> String {
}
#[cfg(test)]
-mod tests {
- use super::{format_datetime, render_table};
- use chrono::{TimeZone, Utc};
-
- #[test]
- fn render_table_aligns_columns() {
- let rendered = render_table(
- &["Name", "State"],
- &[
- vec!["Alpha".to_string(), "enabled".to_string()],
- vec!["Longer Name".to_string(), "off".to_string()],
- ],
- );
-
- let lines: Vec<&str> = rendered.lines().collect();
- assert_eq!(lines[0], "Name State ");
- assert_eq!(lines[1], "----------- -------");
- assert_eq!(lines[2], "Alpha enabled");
- assert_eq!(lines[3], "Longer Name off ");
- }
-
- #[test]
- fn formats_datetime_consistently() {
- let dt = Utc.with_ymd_and_hms(2024, 1, 2, 3, 4, 5).unwrap();
- assert_eq!(format_datetime(&dt), "2024-01-02 03:04:05 UTC");
- }
-}
+#[path = "tests/output.rs"]
+mod tests;
diff --git a/src/cli/tests/account.rs b/src/cli/tests/account.rs
new file mode 100644
index 0000000..dde4529
--- /dev/null
+++ b/src/cli/tests/account.rs
@@ -0,0 +1,44 @@
+use super::add_offline_account;
+use crate::auth::{Account, AccountStore, AccountType};
+
+fn microsoft_account() -> Account {
+ Account {
+ uuid: "00000000-0000-0000-0000-000000000001".to_owned(),
+ username: "Owner".to_owned(),
+ account_type: AccountType::Microsoft,
+ active: false,
+ refresh_token: Some("refresh".to_owned()),
+ cached_mc_token: None,
+ cached_mc_token_expires_at: None,
+ }
+}
+
+#[test]
+fn creates_offline_account_after_microsoft_account_exists() {
+ let temp = tempfile::tempdir().unwrap();
+ let mut store = AccountStore::empty_for_test(temp.path().join("accounts.json"));
+ store.add(microsoft_account());
+ add_offline_account(&mut store, "Steve").expect("offline account should be added");
+
+ assert_eq!(store.accounts.len(), 2);
+ assert_eq!(store.accounts[1].username, "Steve");
+ assert_eq!(store.accounts[1].account_type, AccountType::Offline);
+}
+
+#[test]
+fn rejects_offline_account_before_microsoft_account_exists() {
+ let temp = tempfile::tempdir().unwrap();
+ let mut store = AccountStore::empty_for_test(temp.path().join("accounts.json"));
+ let err = add_offline_account(&mut store, "Steve")
+ .expect_err("offline account should require a microsoft account");
+
+ assert!(err.to_string().contains("Microsoft account"));
+ assert!(store.accounts.is_empty());
+}
+
+#[test]
+fn rejects_empty_offline_username() {
+ let temp = tempfile::tempdir().unwrap();
+ let mut store = AccountStore::empty_for_test(temp.path().join("accounts.json"));
+ assert!(add_offline_account(&mut store, " ").is_err());
+}
diff --git a/src/cli/tests/arguments.rs b/src/cli/tests/arguments.rs
new file mode 100644
index 0000000..d9c49f5
--- /dev/null
+++ b/src/cli/tests/arguments.rs
@@ -0,0 +1,16 @@
+use super::build_command;
+
+#[test]
+fn parses_instance_list_subcommand() {
+ let matches = build_command()
+ .try_get_matches_from(["rmcl", "instance", "list"])
+ .expect("command should parse");
+ let instance = matches
+ .subcommand_matches("instance")
+ .expect("instance subcommand should be present");
+ assert_eq!(
+ instance.subcommand_name(),
+ Some("list"),
+ "instance list should resolve to the list subcommand"
+ );
+}
diff --git a/src/cli/tests/content.rs b/src/cli/tests/content.rs
new file mode 100644
index 0000000..a479b92
--- /dev/null
+++ b/src/cli/tests/content.rs
@@ -0,0 +1,37 @@
+use super::find_entry_by_stem;
+use crate::instance::content::entry::ContentEntry;
+use std::path::PathBuf;
+
+fn entry(file_stem: &str) -> ContentEntry {
+ ContentEntry {
+ file_stem: file_stem.to_string(),
+ name: file_stem.to_string(),
+ source_slug: None,
+ installed_path: None,
+ provider_project: None,
+ world_details: None,
+ title_suffix: None,
+ footer_label: None,
+ footer_change: None,
+ description: String::new(),
+ enabled: true,
+ icon_bytes: None,
+ provider_icon: false,
+ provider_description: false,
+ path: PathBuf::from(file_stem),
+ icon_lines: None,
+ }
+}
+
+#[test]
+fn matches_by_stem_case_insensitively() {
+ let entries = vec![entry("Sodium"), entry("Lithium")];
+ let found = find_entry_by_stem(&entries, "sOdIuM").expect("entry should match");
+ assert_eq!(found.file_stem, "Sodium");
+}
+
+#[test]
+fn returns_none_for_missing_stem() {
+ let entries = vec![entry("Sodium")];
+ assert!(find_entry_by_stem(&entries, "iris").is_none());
+}
diff --git a/src/cli/tests/import.rs b/src/cli/tests/import.rs
new file mode 100644
index 0000000..c5fbb32
--- /dev/null
+++ b/src/cli/tests/import.rs
@@ -0,0 +1,81 @@
+use super::*;
+
+fn version(name: &str, number: &str) -> modrinth::VersionInfo {
+ modrinth::VersionInfo {
+ id: number.to_owned(),
+ project_id: "project".to_owned(),
+ name: name.to_owned(),
+ version_number: number.to_owned(),
+ game_versions: vec!["1.21.1".to_owned()],
+ loaders: vec!["fabric".to_owned()],
+ version_type: modrinth::VersionType::Release,
+ dependencies: Vec::new(),
+ date_published: String::new(),
+ files: Vec::new(),
+ }
+}
+
+#[test]
+fn version_override_matches_name_or_number_and_rejects_unknown_values() {
+ let versions = vec![version("Stable", "1.0.0"), version("Beta", "2.0.0-beta")];
+
+ assert_eq!(select_version(&versions, None).unwrap().name, "Stable");
+ assert_eq!(
+ select_version(&versions, Some("Beta"))
+ .unwrap()
+ .version_number,
+ "2.0.0-beta"
+ );
+ assert_eq!(
+ select_version(&versions, Some("1.0.0")).unwrap().name,
+ "Stable"
+ );
+ assert_eq!(
+ select_version(&versions, Some("missing")).unwrap_err(),
+ "Version 'missing' not found"
+ );
+}
+
+#[test]
+fn import_command_parses_name_and_version_overrides() {
+ let matches = crate::cli::build_command()
+ .try_get_matches_from([
+ "rmcl",
+ "import",
+ "example-pack",
+ "--name",
+ "Example",
+ "--version",
+ "1.2.3",
+ ])
+ .unwrap();
+ let import = matches.subcommand_matches("import").unwrap();
+
+ assert_eq!(
+ import.get_one::("source").map(String::as_str),
+ Some("example-pack")
+ );
+ assert_eq!(
+ import.get_one::("name").map(String::as_str),
+ Some("Example")
+ );
+ assert_eq!(
+ import.get_one::("version").map(String::as_str),
+ Some("1.2.3")
+ );
+}
+
+#[tokio::test]
+async fn missing_local_pack_returns_a_file_not_found_error() {
+ let temp = tempfile::tempdir().unwrap();
+ let missing = temp.path().join("missing.mrpack");
+ let source = missing.to_string_lossy().into_owned();
+ let matches = crate::cli::build_command()
+ .try_get_matches_from(["rmcl", "import", &source])
+ .unwrap();
+ let import = matches.subcommand_matches("import").unwrap();
+
+ let error = handle_import(import).await.unwrap_err().to_string();
+
+ assert_eq!(error, format!("File not found: {}", missing.display()));
+}
diff --git a/src/cli/tests/instance.rs b/src/cli/tests/instance.rs
new file mode 100644
index 0000000..05bdbf7
--- /dev/null
+++ b/src/cli/tests/instance.rs
@@ -0,0 +1,16 @@
+use super::parse_resolution;
+
+#[test]
+fn parses_valid_resolution() {
+ assert_eq!(
+ parse_resolution("1920x1080").expect("should parse"),
+ (1920, 1080)
+ );
+}
+
+#[test]
+fn rejects_invalid_resolution_format() {
+ assert!(parse_resolution("1920").is_err());
+ assert!(parse_resolution("1920xa").is_err());
+ assert!(parse_resolution("0x1080").is_err());
+}
diff --git a/src/cli/tests/log.rs b/src/cli/tests/log.rs
new file mode 100644
index 0000000..27018e7
--- /dev/null
+++ b/src/cli/tests/log.rs
@@ -0,0 +1,31 @@
+use super::resolve_log_path;
+
+#[test]
+fn resolves_latest_log_when_no_file_is_given() {
+ let tmp = tempfile::tempdir().unwrap();
+ let dir = tmp.path().join("demo/minecraft/logs/launches");
+ std::fs::create_dir_all(&dir).expect("log directory should exist");
+ std::fs::write(dir.join("2024-01-02_03-04-05.log"), "newer").expect("write newer log");
+ std::fs::write(dir.join("2024-01-01_03-04-05.log"), "older").expect("write older log");
+
+ let path = resolve_log_path(tmp.path(), "demo", None).expect("latest log should resolve");
+ assert_eq!(
+ path.file_name().and_then(|name| name.to_str()),
+ Some("2024-01-02_03-04-05.log")
+ );
+}
+
+#[test]
+fn resolves_named_log_file() {
+ let tmp = tempfile::tempdir().unwrap();
+ let dir = tmp.path().join("demo/minecraft/logs/launches");
+ std::fs::create_dir_all(&dir).expect("log directory should exist");
+ std::fs::write(dir.join("latest.log"), "hello").expect("write named log");
+
+ let path =
+ resolve_log_path(tmp.path(), "demo", Some("latest.log")).expect("named log should resolve");
+ assert_eq!(
+ path.file_name().and_then(|name| name.to_str()),
+ Some("latest.log")
+ );
+}
diff --git a/src/cli/tests/output.rs b/src/cli/tests/output.rs
new file mode 100644
index 0000000..2e00a4d
--- /dev/null
+++ b/src/cli/tests/output.rs
@@ -0,0 +1,25 @@
+use super::{format_datetime, render_table};
+use chrono::{TimeZone, Utc};
+
+#[test]
+fn render_table_aligns_columns() {
+ let rendered = render_table(
+ &["Name", "State"],
+ &[
+ vec!["Alpha".to_string(), "enabled".to_string()],
+ vec!["Longer Name".to_string(), "off".to_string()],
+ ],
+ );
+
+ let lines: Vec<&str> = rendered.lines().collect();
+ assert_eq!(lines[0], "Name State ");
+ assert_eq!(lines[1], "----------- -------");
+ assert_eq!(lines[2], "Alpha enabled");
+ assert_eq!(lines[3], "Longer Name off ");
+}
+
+#[test]
+fn formats_datetime_consistently() {
+ let dt = Utc.with_ymd_and_hms(2024, 1, 2, 3, 4, 5).unwrap();
+ assert_eq!(format_datetime(&dt), "2024-01-02 03:04:05 UTC");
+}
diff --git a/src/cli/tests/version.rs b/src/cli/tests/version.rs
new file mode 100644
index 0000000..8865378
--- /dev/null
+++ b/src/cli/tests/version.rs
@@ -0,0 +1,41 @@
+use super::filter_manifest_versions;
+use crate::net::mojang::{LatestVersions, VersionEntry, VersionManifest};
+use std::collections::HashSet;
+
+fn manifest() -> VersionManifest {
+ VersionManifest {
+ latest: LatestVersions {
+ release: "1.20.1".to_string(),
+ snapshot: "24w01a".to_string(),
+ },
+ versions: vec![
+ VersionEntry {
+ id: "1.20.1".to_string(),
+ version_type: "release".to_string(),
+ url: "https://example.com/release".to_string(),
+ sha1: "a".to_string(),
+ },
+ VersionEntry {
+ id: "24w01a".to_string(),
+ version_type: "snapshot".to_string(),
+ url: "https://example.com/snapshot".to_string(),
+ sha1: "b".to_string(),
+ },
+ ],
+ }
+}
+
+#[test]
+fn filters_out_snapshots_by_default() {
+ let rows = filter_manifest_versions(&manifest(), None, false);
+ assert_eq!(rows.len(), 1);
+ assert_eq!(rows[0].id, "1.20.1");
+}
+
+#[test]
+fn intersects_supported_versions() {
+ let supported = HashSet::from(["24w01a".to_string()]);
+ let rows = filter_manifest_versions(&manifest(), Some(&supported), true);
+ assert_eq!(rows.len(), 1);
+ assert_eq!(rows[0].id, "24w01a");
+}
diff --git a/src/cli/version.rs b/src/cli/version.rs
index e8b16db..4a522e2 100644
--- a/src/cli/version.rs
+++ b/src/cli/version.rs
@@ -96,46 +96,5 @@ fn filter_manifest_versions(
}
#[cfg(test)]
-mod tests {
- use super::filter_manifest_versions;
- use crate::net::mojang::{LatestVersions, VersionEntry, VersionManifest};
- use std::collections::HashSet;
-
- fn manifest() -> VersionManifest {
- VersionManifest {
- latest: LatestVersions {
- release: "1.20.1".to_string(),
- snapshot: "24w01a".to_string(),
- },
- versions: vec![
- VersionEntry {
- id: "1.20.1".to_string(),
- version_type: "release".to_string(),
- url: "https://example.com/release".to_string(),
- sha1: "a".to_string(),
- },
- VersionEntry {
- id: "24w01a".to_string(),
- version_type: "snapshot".to_string(),
- url: "https://example.com/snapshot".to_string(),
- sha1: "b".to_string(),
- },
- ],
- }
- }
-
- #[test]
- fn filters_out_snapshots_by_default() {
- let rows = filter_manifest_versions(&manifest(), None, false);
- assert_eq!(rows.len(), 1);
- assert_eq!(rows[0].id, "1.20.1");
- }
-
- #[test]
- fn intersects_supported_versions() {
- let supported = HashSet::from(["24w01a".to_string()]);
- let rows = filter_manifest_versions(&manifest(), Some(&supported), true);
- assert_eq!(rows.len(), 1);
- assert_eq!(rows[0].id, "24w01a");
- }
-}
+#[path = "tests/version.rs"]
+mod tests;
diff --git a/src/config/mod.rs b/src/config/mod.rs
index f2f7737..77b8bef 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -62,61 +62,11 @@ pub static SETTINGS: LazyLock = LazyLock::new(|| {
paths: settings::Paths::default(),
defaults: settings::Defaults::default(),
ui: settings::Ui::default(),
+ content: settings::Content::default(),
}
})
});
#[cfg(test)]
-mod tests {
- use super::*;
-
- #[test]
- fn load_config_from_valid_toml() {
- let tmp = tempfile::tempdir().unwrap();
- let path = tmp.path().join("config.toml");
- std::fs::write(
- &path,
- r#"
- [defaults]
- memory_max = "4G"
- "#,
- )
- .unwrap();
- let config = load_config(&path).unwrap();
- assert_eq!(config.defaults.memory_max, "4G");
- assert_eq!(config.defaults.memory_min, "512M");
- }
-
- #[test]
- fn load_config_from_empty_file() {
- let tmp = tempfile::tempdir().unwrap();
- let path = tmp.path().join("config.toml");
- std::fs::write(&path, "").unwrap();
- let config = load_config(&path).unwrap();
- assert_eq!(config.defaults.memory_max, "2G");
- }
-
- #[test]
- fn load_config_missing_file_uses_defaults() {
- let tmp = tempfile::tempdir().unwrap();
- let path = tmp.path().join("nonexistent.toml");
- load_config(&path).unwrap();
- }
-
- #[test]
- fn load_config_partial_sections() {
- let tmp = tempfile::tempdir().unwrap();
- let path = tmp.path().join("config.toml");
- std::fs::write(
- &path,
- r#"
- [paths]
- instances_dir = "/custom/path"
- "#,
- )
- .unwrap();
- let config = load_config(&path).unwrap();
- assert_eq!(config.paths.instances_dir, "/custom/path");
- assert!(config.paths.java_path.is_none());
- }
-}
+#[path = "tests/loading.rs"]
+mod tests;
diff --git a/src/config/settings.rs b/src/config/settings.rs
index 04b8307..15aa18b 100644
--- a/src/config/settings.rs
+++ b/src/config/settings.rs
@@ -18,6 +18,104 @@ pub enum ImageProtocol {
#[derive(Debug, Deserialize, Default)]
pub struct General {}
+#[derive(Debug, Deserialize)]
+pub struct Content {
+ #[serde(default = "default_true")]
+ pub ask_on_provider_conflict: bool,
+ #[serde(default = "default_provider")]
+ pub preferred_provider: String,
+ #[serde(default)]
+ pub preferred_provider_only: bool,
+ #[serde(default = "default_unmatched_retry_hours")]
+ pub unmatched_retry_hours: u64,
+ #[serde(default = "default_max_fingerprint_size_mib")]
+ pub max_fingerprint_size_mib: u64,
+}
+
+fn default_true() -> bool {
+ true
+}
+
+fn default_provider() -> String {
+ "modrinth".to_owned()
+}
+
+fn default_unmatched_retry_hours() -> u64 {
+ 24
+}
+
+fn default_max_fingerprint_size_mib() -> u64 {
+ 512
+}
+
+impl Default for Content {
+ fn default() -> Self {
+ Self {
+ ask_on_provider_conflict: true,
+ preferred_provider: default_provider(),
+ preferred_provider_only: false,
+ unmatched_retry_hours: default_unmatched_retry_hours(),
+ max_fingerprint_size_mib: default_max_fingerprint_size_mib(),
+ }
+ }
+}
+
+impl Content {
+ pub fn preferred_provider(&self) -> &str {
+ self.preferred_provider_with_curseforge(crate::net::curseforge::api_key().is_some())
+ }
+
+ pub fn discovery_provider_enabled(&self, provider: &str) -> bool {
+ self.discovery_provider_enabled_with_curseforge(
+ provider,
+ crate::net::curseforge::api_key().is_some(),
+ )
+ }
+
+ pub fn discovery_provider_label(&self) -> &'static str {
+ self.discovery_provider_label_with_curseforge(crate::net::curseforge::api_key().is_some())
+ }
+
+ fn preferred_provider_with_curseforge(&self, curseforge_available: bool) -> &'static str {
+ if self.preferred_provider.eq_ignore_ascii_case("curseforge") && curseforge_available {
+ "curseforge"
+ } else {
+ "modrinth"
+ }
+ }
+
+ fn discovery_provider_enabled_with_curseforge(
+ &self,
+ provider: &str,
+ curseforge_available: bool,
+ ) -> bool {
+ match provider {
+ "modrinth" => {
+ !self.preferred_provider_only
+ || self.preferred_provider_with_curseforge(curseforge_available) == "modrinth"
+ }
+ "curseforge" => {
+ curseforge_available
+ && (!self.preferred_provider_only
+ || self.preferred_provider_with_curseforge(curseforge_available)
+ == "curseforge")
+ }
+ _ => false,
+ }
+ }
+
+ fn discovery_provider_label_with_curseforge(&self, curseforge_available: bool) -> &'static str {
+ match (
+ self.discovery_provider_enabled_with_curseforge("modrinth", curseforge_available),
+ self.discovery_provider_enabled_with_curseforge("curseforge", curseforge_available),
+ ) {
+ (true, true) => "providers",
+ (false, true) => "CurseForge",
+ _ => "Modrinth",
+ }
+ }
+}
+
#[derive(Debug, Deserialize)]
pub struct Paths {
#[serde(default = "default_instances_dir")]
@@ -159,74 +257,10 @@ pub struct Config {
pub defaults: Defaults,
#[serde(default)]
pub ui: Ui,
+ #[serde(default)]
+ pub content: Content,
}
#[cfg(test)]
-mod tests {
- use super::*;
-
- #[test]
- fn effective_java_path_none_when_absent() {
- let paths = Paths {
- java_path: None,
- ..Paths::default()
- };
- assert!(paths.effective_java_path().is_none());
- }
-
- #[test]
- fn effective_java_path_none_when_empty() {
- let paths = Paths {
- java_path: Some(String::new()),
- ..Paths::default()
- };
- assert!(paths.effective_java_path().is_none());
- }
-
- #[test]
- fn effective_java_path_some_when_set() {
- let paths = Paths {
- java_path: Some("/usr/bin/java".to_owned()),
- ..Paths::default()
- };
- assert_eq!(paths.effective_java_path(), Some("/usr/bin/java"));
- }
-
- #[test]
- fn resolve_path_absolute() {
- assert_eq!(resolve_path("/opt/rmcl"), PathBuf::from("/opt/rmcl"));
- }
-
- #[test]
- fn resolve_path_tilde_prefix() {
- let resolved = resolve_path("~/games/rmcl");
- assert!(!resolved.to_string_lossy().starts_with('~'));
- assert!(resolved.to_string_lossy().ends_with("games/rmcl"));
- }
-
- #[test]
- fn resolve_path_bare_tilde() {
- let resolved = resolve_path("~");
- assert!(!resolved.to_string_lossy().starts_with('~'));
- }
-
- #[test]
- fn config_deserializes_from_empty_toml() {
- let config: Config = toml::from_str("").unwrap();
- assert_eq!(config.defaults.memory_max, "2G");
- }
-
- #[test]
- fn config_deserializes_partial_toml() {
- let toml_str = r#"
-[general]
-debug = true
-
-[defaults]
-memory_max = "8G"
-"#;
- let config: Config = toml::from_str(toml_str).unwrap();
- assert_eq!(config.defaults.memory_max, "8G");
- assert_eq!(config.defaults.memory_min, "512M");
- }
-}
+#[path = "tests/settings.rs"]
+mod tests;
diff --git a/src/config/tests/loading.rs b/src/config/tests/loading.rs
new file mode 100644
index 0000000..b8709f3
--- /dev/null
+++ b/src/config/tests/loading.rs
@@ -0,0 +1,51 @@
+use super::*;
+
+#[test]
+fn load_config_from_valid_toml() {
+ let tmp = tempfile::tempdir().unwrap();
+ let path = tmp.path().join("config.toml");
+ std::fs::write(
+ &path,
+ r#"
+ [defaults]
+ memory_max = "4G"
+ "#,
+ )
+ .unwrap();
+ let config = load_config(&path).unwrap();
+ assert_eq!(config.defaults.memory_max, "4G");
+ assert_eq!(config.defaults.memory_min, "512M");
+}
+
+#[test]
+fn load_config_from_empty_file() {
+ let tmp = tempfile::tempdir().unwrap();
+ let path = tmp.path().join("config.toml");
+ std::fs::write(&path, "").unwrap();
+ let config = load_config(&path).unwrap();
+ assert_eq!(config.defaults.memory_max, "2G");
+}
+
+#[test]
+fn load_config_missing_file_uses_defaults() {
+ let tmp = tempfile::tempdir().unwrap();
+ let path = tmp.path().join("nonexistent.toml");
+ load_config(&path).unwrap();
+}
+
+#[test]
+fn load_config_partial_sections() {
+ let tmp = tempfile::tempdir().unwrap();
+ let path = tmp.path().join("config.toml");
+ std::fs::write(
+ &path,
+ r#"
+ [paths]
+ instances_dir = "/custom/path"
+ "#,
+ )
+ .unwrap();
+ let config = load_config(&path).unwrap();
+ assert_eq!(config.paths.instances_dir, "/custom/path");
+ assert!(config.paths.java_path.is_none());
+}
diff --git a/src/config/tests/settings.rs b/src/config/tests/settings.rs
new file mode 100644
index 0000000..80d5375
--- /dev/null
+++ b/src/config/tests/settings.rs
@@ -0,0 +1,104 @@
+use super::*;
+
+#[test]
+fn effective_java_path_none_when_absent() {
+ let paths = Paths {
+ java_path: None,
+ ..Paths::default()
+ };
+ assert!(paths.effective_java_path().is_none());
+}
+
+#[test]
+fn effective_java_path_none_when_empty() {
+ let paths = Paths {
+ java_path: Some(String::new()),
+ ..Paths::default()
+ };
+ assert!(paths.effective_java_path().is_none());
+}
+
+#[test]
+fn effective_java_path_some_when_set() {
+ let paths = Paths {
+ java_path: Some("/usr/bin/java".to_owned()),
+ ..Paths::default()
+ };
+ assert_eq!(paths.effective_java_path(), Some("/usr/bin/java"));
+}
+
+#[test]
+fn content_provider_settings_are_normalized() {
+ let content: Content =
+ toml::from_str("preferred_provider = \"curseforge\"\npreferred_provider_only = true")
+ .unwrap();
+ assert_eq!(
+ content.preferred_provider_with_curseforge(false),
+ "modrinth"
+ );
+ assert_eq!(
+ content.preferred_provider_with_curseforge(true),
+ "curseforge"
+ );
+ assert!(content.preferred_provider_only);
+ assert!(content.discovery_provider_enabled_with_curseforge("modrinth", false));
+ assert!(!content.discovery_provider_enabled_with_curseforge("curseforge", false));
+ assert!(!content.discovery_provider_enabled_with_curseforge("modrinth", true));
+ assert!(content.discovery_provider_enabled_with_curseforge("curseforge", true));
+ assert_eq!(
+ content.discovery_provider_label_with_curseforge(false),
+ "Modrinth"
+ );
+ assert_eq!(
+ content.discovery_provider_label_with_curseforge(true),
+ "CurseForge"
+ );
+
+ let merged = Content::default();
+ assert_eq!(
+ merged.discovery_provider_label_with_curseforge(false),
+ "Modrinth"
+ );
+ assert_eq!(
+ merged.discovery_provider_label_with_curseforge(true),
+ "providers"
+ );
+}
+
+#[test]
+fn resolve_path_absolute() {
+ assert_eq!(resolve_path("/opt/rmcl"), PathBuf::from("/opt/rmcl"));
+}
+
+#[test]
+fn resolve_path_tilde_prefix() {
+ let resolved = resolve_path("~/games/rmcl");
+ assert!(!resolved.to_string_lossy().starts_with('~'));
+ assert!(resolved.to_string_lossy().ends_with("games/rmcl"));
+}
+
+#[test]
+fn resolve_path_bare_tilde() {
+ let resolved = resolve_path("~");
+ assert!(!resolved.to_string_lossy().starts_with('~'));
+}
+
+#[test]
+fn config_deserializes_from_empty_toml() {
+ let config: Config = toml::from_str("").unwrap();
+ assert_eq!(config.defaults.memory_max, "2G");
+}
+
+#[test]
+fn config_deserializes_partial_toml() {
+ let toml_str = r#"
+[general]
+debug = true
+
+[defaults]
+memory_max = "8G"
+"#;
+ let config: Config = toml::from_str(toml_str).unwrap();
+ assert_eq!(config.defaults.memory_max, "8G");
+ assert_eq!(config.defaults.memory_min, "512M");
+}
diff --git a/src/config/tests/theme.rs b/src/config/tests/theme.rs
new file mode 100644
index 0000000..0acce86
--- /dev/null
+++ b/src/config/tests/theme.rs
@@ -0,0 +1,74 @@
+use super::*;
+
+// cover every BorderStyle variant. a mutation that swaps two arms of the
+// match (e.g. Rounded -> Plain) would slip past testing just one variant.
+#[rstest::rstest]
+#[case::plain(BorderStyle::Plain, BorderType::Plain)]
+#[case::rounded(BorderStyle::Rounded, BorderType::Rounded)]
+#[case::double(BorderStyle::Double, BorderType::Double)]
+#[case::thick(BorderStyle::Thick, BorderType::Thick)]
+fn border_style_roundtrip(#[case] style: BorderStyle, #[case] expected: BorderType) {
+ assert_eq!(style.to_border_type(), expected);
+}
+
+#[test]
+fn theme_config_deserialize_builtin() {
+ let toml_str = r#"
+theme = "dracula"
+border_style = "plain"
+"#;
+ let config: ThemeConfig = toml::from_str(toml_str).unwrap();
+ assert_eq!(config.theme, "dracula");
+ assert_eq!(config.border_style, BorderStyle::Plain);
+ assert!(config.custom.is_none());
+}
+
+#[test]
+fn theme_config_with_partial_overrides() {
+ let toml_str = r#"
+theme = "dracula"
+
+[custom]
+accent = "Red"
+"#;
+ let config: ThemeConfig = toml::from_str(toml_str).unwrap();
+ assert_eq!(config.theme, "dracula");
+ let overrides = config.custom.unwrap();
+ assert_eq!(overrides.accent, Some(Color::Red));
+ assert!(overrides.text.is_none());
+}
+
+#[test]
+fn resolve_with_overrides_keeps_base() {
+ let config = ThemeConfig {
+ theme: "dracula".to_owned(),
+ custom: Some(ThemeOverrides {
+ accent: Some(Color::Red),
+ ..ThemeOverrides::default()
+ }),
+ ..ThemeConfig::default()
+ };
+ let theme = resolve_app_theme(&config);
+ assert_eq!(theme.accent(), Color::Red);
+ let base = resolve_theme("dracula");
+ assert_eq!(theme.text(), base.text());
+ assert_eq!(theme.error(), base.error());
+}
+
+#[test]
+fn resolve_builtin_theme() {
+ let theme = resolve_theme("dracula");
+ let expected = if std::env::var_os("NO_COLOR").is_some() {
+ "no-color"
+ } else {
+ "dracula"
+ };
+ assert_eq!(theme.id(), expected);
+}
+
+#[test]
+fn theme_config_empty_toml_uses_defaults() {
+ let config: ThemeConfig = toml::from_str("").unwrap();
+ assert_eq!(config.theme, "catppuccin");
+ assert_eq!(config.border_style, BorderStyle::Rounded);
+}
diff --git a/src/config/theme.rs b/src/config/theme.rs
index ba0289f..b6c3e0e 100644
--- a/src/config/theme.rs
+++ b/src/config/theme.rs
@@ -169,78 +169,5 @@ pub static BORDER_STYLE: LazyLock =
LazyLock::new(|| THEME_CONFIG.border_style.clone());
#[cfg(test)]
-mod tests {
- use super::*;
-
- // cover every BorderStyle variant. a mutation that swaps two arms of the
- // match (e.g. Rounded -> Plain) would slip past testing just one variant.
- #[rstest::rstest]
- #[case::plain(BorderStyle::Plain, BorderType::Plain)]
- #[case::rounded(BorderStyle::Rounded, BorderType::Rounded)]
- #[case::double(BorderStyle::Double, BorderType::Double)]
- #[case::thick(BorderStyle::Thick, BorderType::Thick)]
- fn border_style_roundtrip(#[case] style: BorderStyle, #[case] expected: BorderType) {
- assert_eq!(style.to_border_type(), expected);
- }
-
- #[test]
- fn theme_config_deserialize_builtin() {
- let toml_str = r#"
-theme = "dracula"
-border_style = "plain"
-"#;
- let config: ThemeConfig = toml::from_str(toml_str).unwrap();
- assert_eq!(config.theme, "dracula");
- assert_eq!(config.border_style, BorderStyle::Plain);
- assert!(config.custom.is_none());
- }
-
- #[test]
- fn theme_config_with_partial_overrides() {
- let toml_str = r#"
-theme = "dracula"
-
-[custom]
-accent = "Red"
-"#;
- let config: ThemeConfig = toml::from_str(toml_str).unwrap();
- assert_eq!(config.theme, "dracula");
- let overrides = config.custom.unwrap();
- assert_eq!(overrides.accent, Some(Color::Red));
- assert!(overrides.text.is_none());
- }
-
- #[test]
- fn resolve_with_overrides_keeps_base() {
- let config = ThemeConfig {
- theme: "dracula".to_owned(),
- custom: Some(ThemeOverrides {
- accent: Some(Color::Red),
- ..ThemeOverrides::default()
- }),
- ..ThemeConfig::default()
- };
- let theme = resolve_app_theme(&config);
- assert_eq!(theme.accent(), Color::Red);
- let base = resolve_theme("dracula");
- assert_eq!(theme.text(), base.text());
- assert_eq!(theme.error(), base.error());
- }
-
- #[test]
- fn resolve_builtin_theme() {
- let config = ThemeConfig {
- theme: "dracula".to_owned(),
- ..ThemeConfig::default()
- };
- let theme = resolve_app_theme(&config);
- assert_eq!(theme.id(), "dracula");
- }
-
- #[test]
- fn theme_config_empty_toml_uses_defaults() {
- let config: ThemeConfig = toml::from_str("").unwrap();
- assert_eq!(config.theme, "catppuccin");
- assert_eq!(config.border_style, BorderStyle::Rounded);
- }
-}
+#[path = "tests/theme.rs"]
+mod tests;
diff --git a/src/feedback/errors.rs b/src/feedback/errors.rs
new file mode 100644
index 0000000..3412881
--- /dev/null
+++ b/src/feedback/errors.rs
@@ -0,0 +1,90 @@
+// thread-safe FIFO queue for error/warning toasts displayed in the UI.
+// also (ab)used for INFO toasts like "desktop shortcut created" because
+// why build a separate notification system when this one works fine.
+//
+// callers pass id: 0 and push_error assigns a real unique id. the id is
+// used by the render layer to track per-toast animation state.
+
+use std::collections::VecDeque;
+use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::{Arc, Mutex};
+use std::time::Instant;
+
+use std::sync::LazyLock;
+use tracing::Level;
+
+const MAX_ERROR_EVENTS: usize = 50;
+static NEXT_ERROR_ID: AtomicU64 = AtomicU64::new(1);
+
+#[derive(Debug, Clone)]
+pub struct ErrorEvent {
+ pub id: u64,
+ pub level: Level,
+ pub message: String,
+ pub pushed_at: Instant,
+}
+
+pub static ERROR_EVENTS: LazyLock>>> =
+ LazyLock::new(|| Arc::new(Mutex::new(VecDeque::new())));
+
+pub fn push_error(event: ErrorEvent) {
+ match ERROR_EVENTS.lock() {
+ Ok(mut events) => {
+ let mut event = event;
+ event.id = NEXT_ERROR_ID.fetch_add(1, Ordering::Relaxed);
+
+ events.push_back(event);
+
+ while events.len() > MAX_ERROR_EVENTS {
+ events.pop_front();
+ }
+ super::request_redraw();
+ }
+ Err(e) => {
+ tracing::error!("Error buffer lock poisoned: {}", e);
+ }
+ }
+}
+
+#[must_use]
+pub fn has_errors() -> bool {
+ match ERROR_EVENTS.lock() {
+ Ok(events) => !events.is_empty(),
+ Err(_) => false,
+ }
+}
+
+#[must_use]
+pub fn pop_error() -> Option {
+ match ERROR_EVENTS.lock() {
+ Ok(mut events) => {
+ let event = events.pop_front();
+ if event.is_some() {
+ super::request_redraw();
+ }
+ event
+ }
+ Err(_) => None,
+ }
+}
+
+#[must_use]
+pub fn peek_error() -> Option {
+ match ERROR_EVENTS.lock() {
+ Ok(events) => events.front().cloned(),
+ Err(_) => None,
+ }
+}
+
+#[must_use]
+// returned in reverse order (newest first) so they stack top-down in the UI
+pub fn peek_all_errors() -> Vec {
+ match ERROR_EVENTS.lock() {
+ Ok(events) => events.iter().rev().cloned().collect(),
+ Err(_) => Vec::new(),
+ }
+}
+
+#[cfg(test)]
+#[path = "tests/errors.rs"]
+mod tests;
diff --git a/src/feedback/mod.rs b/src/feedback/mod.rs
new file mode 100644
index 0000000..0b8744f
--- /dev/null
+++ b/src/feedback/mod.rs
@@ -0,0 +1,16 @@
+// application feedback shared by background work and every frontend.
+
+use std::sync::atomic::{AtomicBool, Ordering};
+
+pub mod errors;
+pub mod progress;
+
+static REDRAW_REQUESTED: AtomicBool = AtomicBool::new(true);
+
+pub fn request_redraw() {
+ REDRAW_REQUESTED.store(true, Ordering::Release);
+}
+
+pub(crate) fn take_redraw_request() -> bool {
+ REDRAW_REQUESTED.swap(false, Ordering::AcqRel)
+}
diff --git a/src/feedback/progress.rs b/src/feedback/progress.rs
new file mode 100644
index 0000000..5050cfe
--- /dev/null
+++ b/src/feedback/progress.rs
@@ -0,0 +1,222 @@
+// global progress state shared between background tasks and the status bar widget.
+// background tasks set the action/progress, the render loop reads it every frame.
+
+use std::collections::BTreeMap;
+use std::sync::LazyLock;
+use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::{Arc, Mutex};
+
+#[derive(Debug, Default, Clone)]
+pub struct ProgressState {
+ pub current_action: Option,
+ pub progress: Option<(u64, u64)>,
+ pub sub_action: Option,
+ tasks: BTreeMap,
+ legacy_active: bool,
+}
+
+#[derive(Debug, Clone)]
+struct TaskState {
+ action: String,
+ sub_action: Option,
+ progress: Option<(u64, u64)>,
+}
+
+pub static PROGRESS: LazyLock>> =
+ LazyLock::new(|| Arc::new(Mutex::new(ProgressState::default())));
+static NEXT_TASK_ID: AtomicU64 = AtomicU64::new(1);
+
+pub struct ProgressTask {
+ id: u64,
+ finished: bool,
+}
+
+#[derive(Clone)]
+pub struct ProgressTaskHandle {
+ id: u64,
+}
+
+impl ProgressTask {
+ pub fn start(action: impl Into) -> Self {
+ let id = NEXT_TASK_ID.fetch_add(1, Ordering::Relaxed);
+ let action = action.into();
+ if let Ok(mut state) = PROGRESS.lock() {
+ state.tasks.insert(
+ id,
+ TaskState {
+ action: action.clone(),
+ sub_action: None,
+ progress: None,
+ },
+ );
+ refresh_visible(&mut state);
+ }
+ tracing::info!("{}", action);
+ super::request_redraw();
+ Self {
+ id,
+ finished: false,
+ }
+ }
+
+ pub fn handle(&self) -> ProgressTaskHandle {
+ ProgressTaskHandle { id: self.id }
+ }
+
+ pub fn set_action(&self, text: impl Into) {
+ update_task_action(self.id, text.into());
+ }
+
+ pub fn set_sub_action(&self, text: impl Into) {
+ update_task_sub_action(self.id, text.into());
+ }
+
+ pub fn set_progress(&self, current: u64, total: u64) {
+ update_task_progress(self.id, current, total);
+ }
+
+ pub fn finish(mut self) {
+ self.remove();
+ self.finished = true;
+ }
+
+ pub fn fail(mut self, error: impl std::fmt::Display) {
+ tracing::warn!("Progress task failed: {error}");
+ self.remove();
+ self.finished = true;
+ }
+
+ fn remove(&self) {
+ if let Ok(mut state) = PROGRESS.lock() {
+ state.tasks.remove(&self.id);
+ refresh_visible(&mut state);
+ }
+ super::request_redraw();
+ }
+}
+
+impl ProgressTaskHandle {
+ pub fn set_sub_action(&self, text: impl Into) {
+ update_task_sub_action(self.id, text.into());
+ }
+
+ pub fn set_progress(&self, current: u64, total: u64) {
+ update_task_progress(self.id, current, total);
+ }
+}
+
+fn update_task_action(id: u64, text: String) {
+ if let Ok(mut state) = PROGRESS.lock() {
+ if let Some(task) = state.tasks.get_mut(&id) {
+ task.action = text;
+ task.progress = None;
+ }
+ refresh_visible(&mut state);
+ }
+ super::request_redraw();
+}
+
+fn update_task_sub_action(id: u64, text: String) {
+ if let Ok(mut state) = PROGRESS.lock() {
+ if let Some(task) = state.tasks.get_mut(&id) {
+ task.sub_action = Some(text);
+ }
+ refresh_visible(&mut state);
+ }
+ super::request_redraw();
+}
+
+fn update_task_progress(id: u64, current: u64, total: u64) {
+ if let Ok(mut state) = PROGRESS.lock() {
+ if let Some(task) = state.tasks.get_mut(&id) {
+ task.progress = Some((current, total));
+ }
+ refresh_visible(&mut state);
+ }
+ super::request_redraw();
+}
+
+impl Drop for ProgressTask {
+ fn drop(&mut self) {
+ if !self.finished {
+ self.remove();
+ }
+ }
+}
+
+fn refresh_visible(state: &mut ProgressState) {
+ if let Some((_, task)) = state.tasks.last_key_value() {
+ state.current_action = Some(task.action.clone());
+ state.sub_action.clone_from(&task.sub_action);
+ state.progress = task.progress;
+ } else if !state.legacy_active {
+ state.current_action = None;
+ state.sub_action = None;
+ state.progress = None;
+ }
+}
+
+pub fn set_action(text: impl Into) {
+ let text = text.into();
+ match PROGRESS.lock() {
+ Ok(mut state) => {
+ state.legacy_active = true;
+ state.current_action = Some(text.clone());
+ state.progress = None;
+ super::request_redraw();
+ }
+ Err(e) => {
+ tracing::error!("Progress lock poisoned: {}", e);
+ }
+ }
+ tracing::info!("{}", text);
+}
+
+pub fn set_progress(current: u64, total: u64) {
+ match PROGRESS.lock() {
+ Ok(mut state) => {
+ state.progress = Some((current, total));
+ super::request_redraw();
+ }
+ Err(e) => {
+ tracing::error!("Progress lock poisoned: {}", e);
+ }
+ }
+}
+
+pub fn set_sub_action(text: impl Into) {
+ let text = text.into();
+ match PROGRESS.lock() {
+ Ok(mut state) => {
+ state.sub_action = Some(text.clone());
+ super::request_redraw();
+ }
+ Err(e) => {
+ tracing::error!("Progress lock poisoned: {}", e);
+ }
+ }
+ tracing::debug!(" {}", text);
+}
+
+pub fn clear() {
+ match PROGRESS.lock() {
+ Ok(mut state) => {
+ state.legacy_active = false;
+ refresh_visible(&mut state);
+ super::request_redraw();
+ }
+ Err(e) => {
+ tracing::error!("Progress lock poisoned: {}", e);
+ }
+ }
+}
+
+pub fn is_active() -> bool {
+ PROGRESS
+ .lock()
+ .is_ok_and(|state| state.current_action.is_some())
+}
+
+#[cfg(test)]
+#[path = "tests/progress.rs"]
+mod tests;
diff --git a/src/feedback/tests/errors.rs b/src/feedback/tests/errors.rs
new file mode 100644
index 0000000..d687e64
--- /dev/null
+++ b/src/feedback/tests/errors.rs
@@ -0,0 +1,85 @@
+use super::*;
+use crate::tests::TEST_LOCK;
+
+fn clear_errors_for_test() {
+ ERROR_EVENTS.lock().unwrap().clear();
+}
+
+fn make_event(msg: &str) -> ErrorEvent {
+ ErrorEvent {
+ id: 0,
+ level: Level::ERROR,
+ message: msg.to_string(),
+ pushed_at: Instant::now(),
+ }
+}
+
+#[test]
+fn peek_does_not_remove() {
+ let _guard = TEST_LOCK.lock().unwrap();
+ clear_errors_for_test();
+
+ push_error(make_event("peek-test"));
+
+ let count_before = peek_all_errors().len();
+ let peeked = peek_error();
+ let count_after = peek_all_errors().len();
+
+ assert_eq!(
+ count_before, count_after,
+ "peek should not change queue length"
+ );
+
+ assert!(peeked.is_some());
+ assert_eq!(peeked.unwrap().message, "peek-test");
+}
+
+#[test]
+fn peek_all_returns_newest_first() {
+ let _guard = TEST_LOCK.lock().unwrap();
+ clear_errors_for_test();
+
+ push_error(make_event("newest_a"));
+ push_error(make_event("newest_b"));
+
+ let all = peek_all_errors();
+
+ assert_eq!(all.len(), 2);
+ assert!(all[0].message.ends_with("_b"));
+ assert!(all[1].message.ends_with("_a"));
+ assert!(all[0].id > all[1].id);
+}
+
+#[test]
+fn auto_assigned_ids_are_unique() {
+ let _guard = TEST_LOCK.lock().unwrap();
+ clear_errors_for_test();
+
+ push_error(make_event("unique_1"));
+ push_error(make_event("unique_2"));
+
+ let all = peek_all_errors();
+
+ assert_eq!(all.len(), 2);
+ assert_ne!(all[0].id, all[1].id);
+}
+
+#[test]
+fn overflow_drops_oldest() {
+ let _guard = TEST_LOCK.lock().unwrap();
+ clear_errors_for_test();
+
+ for i in 0..(MAX_ERROR_EVENTS + 10) {
+ push_error(make_event(&format!("overflow_{i}")));
+ }
+
+ let all = peek_all_errors();
+
+ assert_eq!(all.len(), MAX_ERROR_EVENTS);
+
+ assert!(!all.iter().any(|e| e.message == "overflow_0"));
+ assert!(!all.iter().any(|e| e.message == "overflow_9"));
+
+ assert!(all.iter().any(|e| e.message == "overflow_10"));
+ assert!(all.iter().any(|e| e.message == "overflow_59"));
+}
diff --git a/src/feedback/tests/progress.rs b/src/feedback/tests/progress.rs
new file mode 100644
index 0000000..ecdcf62
--- /dev/null
+++ b/src/feedback/tests/progress.rs
@@ -0,0 +1,73 @@
+use super::*;
+use crate::tests::TEST_LOCK;
+
+#[test]
+fn newest_task_is_visible_and_drop_restores_previous_task() {
+ let _guard = TEST_LOCK.lock().unwrap();
+ clear();
+ let first = ProgressTask::start("first");
+ first.set_progress(1, 2);
+ {
+ let second = ProgressTask::start("second");
+ second.set_sub_action("working");
+ let state = PROGRESS.lock().unwrap();
+ assert_eq!(state.current_action.as_deref(), Some("second"));
+ assert_eq!(state.sub_action.as_deref(), Some("working"));
+ }
+ let state = PROGRESS.lock().unwrap();
+ assert_eq!(state.current_action.as_deref(), Some("first"));
+ assert_eq!(state.progress, Some((1, 2)));
+ drop(state);
+ first.finish();
+ clear();
+}
+
+#[test]
+fn changing_phase_resets_progress_to_indeterminate() {
+ let _guard = TEST_LOCK.lock().unwrap();
+ clear();
+ let task = ProgressTask::start("inventory");
+ task.set_progress(4, 10);
+ task.set_action("provider matching");
+
+ let state = PROGRESS.lock().unwrap();
+ assert_eq!(state.current_action.as_deref(), Some("provider matching"));
+ assert_eq!(state.progress, None);
+ drop(state);
+
+ task.finish();
+ assert!(!is_active());
+ clear();
+}
+
+#[test]
+fn clearing_legacy_progress_keeps_owned_tasks() {
+ let _guard = TEST_LOCK.lock().unwrap();
+ clear();
+ let task = ProgressTask::start("indexing");
+ set_action("legacy download");
+ clear();
+
+ let state = PROGRESS.lock().unwrap();
+ assert_eq!(state.current_action.as_deref(), Some("indexing"));
+ drop(state);
+
+ task.finish();
+ clear();
+}
+
+#[test]
+fn a_new_legacy_action_does_not_reuse_the_previous_phase_progress() {
+ let _guard = TEST_LOCK.lock().unwrap();
+ clear();
+ set_action("Downloading installer");
+ set_progress(1, 1);
+
+ set_action("Running installer");
+
+ let state = PROGRESS.lock().unwrap();
+ assert_eq!(state.current_action.as_deref(), Some("Running installer"));
+ assert_eq!(state.progress, None);
+ drop(state);
+ clear();
+}
diff --git a/src/instance/config_sync.rs b/src/instance/config_sync.rs
index 3a76ccb..51a44f1 100644
--- a/src/instance/config_sync.rs
+++ b/src/instance/config_sync.rs
@@ -110,7 +110,7 @@ pub fn switch_profile(
meta_dir: &Path,
instance_dir: &Path,
) -> Result, ConfigSyncError> {
- if crate::running::get(instance_name).is_some() {
+ if crate::instance::runtime::get(instance_name).is_some() {
return Err(ConfigSyncError::InstanceRunning {
instance: instance_name.to_string(),
});
@@ -203,18 +203,15 @@ fn profile_dir(meta_dir: &Path, profile: &str) -> PathBuf {
}
fn profiles_dir(meta_dir: &Path) -> PathBuf {
- meta_dir.join("config-sync").join("profiles")
+ crate::storage::MetadataPaths::new(meta_dir).profiles()
}
fn minecraft_dir(instance_dir: &Path) -> PathBuf {
- instance_dir.join(".minecraft")
+ instance_dir.join(crate::storage::MINECRAFT_DIR_NAME)
}
fn local_backup_dir(instance_dir: &Path) -> PathBuf {
- instance_dir
- .join(".rmcl")
- .join("config-sync")
- .join("local-config")
+ crate::storage::InstancePaths::new(instance_dir).local_config()
}
fn acquire_lock(profile_dir: &Path) -> Result {
@@ -224,6 +221,7 @@ fn acquire_lock(profile_dir: &Path) -> Result {
.read(true)
.write(true)
.create(true)
+ .truncate(false)
.open(path)?;
file.lock()?;
Ok(ConfigSyncLock { file })
@@ -332,338 +330,5 @@ fn copy_dir_contents(src: &Path, dst: &Path) -> Result<(), ConfigSyncError> {
}
#[cfg(test)]
-mod tests {
- use super::*;
-
- #[test]
- fn first_prepare_seeds_shared_config() {
- let tmp = tempfile::tempdir().unwrap();
- let meta = tmp.path().join("meta");
- let minecraft = tmp.path().join("instance/.minecraft");
- create_profile(&meta, "main").unwrap();
- std::fs::create_dir_all(minecraft.join("config/nested")).unwrap();
- std::fs::write(minecraft.join("options.txt"), "local-options").unwrap();
- std::fs::write(minecraft.join("optionsshaders.txt"), "shader-options").unwrap();
- std::fs::write(minecraft.join("config/options.txt"), "local-config").unwrap();
- std::fs::write(minecraft.join("config/nested/mod.toml"), "nested").unwrap();
-
- assert!(prepare(Some("main"), &meta, &minecraft).unwrap());
-
- assert_eq!(
- std::fs::read_to_string(meta.join("config-sync/profiles/main/options.txt")).unwrap(),
- "local-options"
- );
- assert_eq!(
- std::fs::read_to_string(meta.join("config-sync/profiles/main/optionsshaders.txt"))
- .unwrap(),
- "shader-options"
- );
- assert_eq!(
- std::fs::read_to_string(meta.join("config-sync/profiles/main/config/options.txt"))
- .unwrap(),
- "local-config"
- );
- assert_eq!(
- std::fs::read_to_string(meta.join("config-sync/profiles/main/config/nested/mod.toml"))
- .unwrap(),
- "nested"
- );
- }
-
- #[test]
- fn prepare_mirrors_shared_config_into_instance() {
- let tmp = tempfile::tempdir().unwrap();
- let meta = tmp.path().join("meta");
- let minecraft = tmp.path().join("instance/.minecraft");
- std::fs::create_dir_all(meta.join("config-sync/profiles/main/config")).unwrap();
- std::fs::create_dir_all(minecraft.join("config")).unwrap();
- std::fs::write(
- meta.join("config-sync/profiles/main/options.txt"),
- "shared-options",
- )
- .unwrap();
- std::fs::write(
- meta.join("config-sync/profiles/main/config/shared.toml"),
- "shared",
- )
- .unwrap();
- std::fs::write(minecraft.join("options.txt"), "stale-options").unwrap();
- std::fs::write(minecraft.join("config/local.toml"), "stale").unwrap();
-
- assert!(prepare(Some("main"), &meta, &minecraft).unwrap());
-
- assert_eq!(
- std::fs::read_to_string(minecraft.join("options.txt")).unwrap(),
- "shared-options"
- );
- assert_eq!(
- std::fs::read_to_string(minecraft.join("config/shared.toml")).unwrap(),
- "shared"
- );
- assert!(!minecraft.join("config/local.toml").exists());
- }
-
- #[test]
- fn finish_mirrors_instance_config_back_to_shared() {
- let tmp = tempfile::tempdir().unwrap();
- let meta = tmp.path().join("meta");
- let minecraft = tmp.path().join("instance/.minecraft");
- std::fs::create_dir_all(meta.join("config-sync/profiles/main/config")).unwrap();
- std::fs::write(
- meta.join("config-sync/profiles/main/config/old.toml"),
- "old",
- )
- .unwrap();
- std::fs::create_dir_all(minecraft.join("config")).unwrap();
- std::fs::write(minecraft.join("options.txt"), "new-options").unwrap();
- std::fs::write(minecraft.join("config/new.toml"), "new").unwrap();
-
- finish(Some("main"), &meta, &minecraft).unwrap();
-
- assert_eq!(
- std::fs::read_to_string(meta.join("config-sync/profiles/main/options.txt")).unwrap(),
- "new-options"
- );
- assert_eq!(
- std::fs::read_to_string(meta.join("config-sync/profiles/main/config/new.toml"))
- .unwrap(),
- "new"
- );
- assert!(
- !meta
- .join("config-sync/profiles/main/config/old.toml")
- .exists()
- );
- }
-
- #[test]
- fn prepare_releases_lock_for_another_instance() {
- let tmp = tempfile::tempdir().unwrap();
- let meta = tmp.path().join("meta");
- let minecraft = tmp.path().join("instance/.minecraft");
- create_profile(&meta, "main").unwrap();
- std::fs::create_dir_all(minecraft.join("config")).unwrap();
-
- assert!(prepare(Some("main"), &meta, &minecraft).unwrap());
- let second = tmp.path().join("second/.minecraft");
- std::fs::create_dir_all(second.join("config")).unwrap();
-
- assert!(prepare(Some("main"), &meta, &second).unwrap());
- }
-
- #[test]
- fn profile_rejects_path_traversal() {
- let tmp = tempfile::tempdir().unwrap();
- let err = prepare(Some("../bad"), tmp.path(), tmp.path()).unwrap_err();
-
- assert!(matches!(err, ConfigSyncError::InvalidProfile(_)));
- }
-
- #[test]
- fn profile_rejects_builtin_names() {
- for profile in [
- "none",
- "default",
- "local",
- "instance default",
- "local default",
- ] {
- let err = validate_profile(profile).unwrap_err();
- assert!(matches!(err, ConfigSyncError::InvalidProfile(_)));
- }
- }
-
- #[test]
- fn prepare_ignores_deleted_profile() {
- let tmp = tempfile::tempdir().unwrap();
- let meta = tmp.path().join("meta");
- let minecraft = tmp.path().join("instance/.minecraft");
- std::fs::create_dir_all(minecraft.join("config")).unwrap();
-
- let lock = prepare(Some("deleted"), &meta, &minecraft).unwrap();
-
- assert!(!lock);
- assert!(!meta.join("config-sync/profiles/deleted").exists());
- }
-
- #[test]
- fn create_profile_trims_and_lists_profiles() {
- let tmp = tempfile::tempdir().unwrap();
-
- let profile = create_profile(tmp.path(), " main ").unwrap();
- let profiles = list_profiles(tmp.path()).unwrap();
-
- assert_eq!(profile, "main");
- assert_eq!(profiles, vec!["main"]);
- }
-
- #[test]
- fn delete_profile_removes_profile_dir() {
- let tmp = tempfile::tempdir().unwrap();
- create_profile(tmp.path(), "main").unwrap();
-
- delete_profile(tmp.path(), "main").unwrap();
-
- assert!(list_profiles(tmp.path()).unwrap().is_empty());
- }
-
- #[test]
- fn switch_to_profile_backs_up_local_config_and_restores_none() {
- let tmp = tempfile::tempdir().unwrap();
- let meta = tmp.path().join("meta");
- let instance = tmp.path().join("instance");
- let minecraft = instance.join(".minecraft");
- std::fs::create_dir_all(minecraft.join("config")).unwrap();
- std::fs::write(minecraft.join("options.txt"), "local-options").unwrap();
- std::fs::write(minecraft.join("config/local.txt"), "local").unwrap();
-
- let selected = switch_profile("inst", None, Some("main"), &meta, &instance).unwrap();
- assert_eq!(selected.as_deref(), Some("main"));
- assert_eq!(
- std::fs::read_to_string(instance.join(".rmcl/config-sync/local-config/options.txt"))
- .unwrap(),
- "local-options"
- );
- assert_eq!(
- std::fs::read_to_string(
- instance.join(".rmcl/config-sync/local-config/config/local.txt")
- )
- .unwrap(),
- "local"
- );
-
- std::fs::write(minecraft.join("options.txt"), "shared-options").unwrap();
- std::fs::write(minecraft.join("config/shared.txt"), "shared").unwrap();
- let selected = switch_profile("inst", Some("main"), None, &meta, &instance).unwrap();
-
- assert_eq!(selected, None);
- assert_eq!(
- std::fs::read_to_string(meta.join("config-sync/profiles/main/options.txt")).unwrap(),
- "shared-options"
- );
- assert_eq!(
- std::fs::read_to_string(meta.join("config-sync/profiles/main/config/shared.txt"))
- .unwrap(),
- "shared"
- );
- assert_eq!(
- std::fs::read_to_string(minecraft.join("options.txt")).unwrap(),
- "local-options"
- );
- assert_eq!(
- std::fs::read_to_string(minecraft.join("config/local.txt")).unwrap(),
- "local"
- );
- assert!(!minecraft.join("config/shared.txt").exists());
- }
-
- #[test]
- fn switch_from_deleted_profile_restores_local_without_recreating_profile() {
- let tmp = tempfile::tempdir().unwrap();
- let meta = tmp.path().join("meta");
- let instance = tmp.path().join("instance");
- let minecraft = instance.join(".minecraft");
- std::fs::create_dir_all(minecraft.join("config")).unwrap();
- std::fs::create_dir_all(instance.join(".rmcl/config-sync/local-config/config")).unwrap();
- std::fs::write(minecraft.join("options.txt"), "deleted-profile-options").unwrap();
- std::fs::write(
- instance.join(".rmcl/config-sync/local-config/options.txt"),
- "local-options",
- )
- .unwrap();
- std::fs::write(
- instance.join(".rmcl/config-sync/local-config/config/local.txt"),
- "local",
- )
- .unwrap();
-
- let selected = switch_profile("inst", Some("deleted"), None, &meta, &instance).unwrap();
-
- assert_eq!(selected, None);
- assert_eq!(
- std::fs::read_to_string(minecraft.join("options.txt")).unwrap(),
- "local-options"
- );
- assert_eq!(
- std::fs::read_to_string(minecraft.join("config/local.txt")).unwrap(),
- "local"
- );
- assert!(!meta.join("config-sync/profiles/deleted").exists());
- }
-
- #[test]
- fn switch_between_profiles_saves_old_and_loads_new() {
- let tmp = tempfile::tempdir().unwrap();
- let meta = tmp.path().join("meta");
- let instance = tmp.path().join("instance");
- let minecraft = instance.join(".minecraft");
- std::fs::create_dir_all(minecraft.join("config")).unwrap();
- std::fs::write(minecraft.join("options.txt"), "changed-a-options").unwrap();
- std::fs::write(minecraft.join("config/a.txt"), "changed-a").unwrap();
- create_profile(&meta, "a").unwrap();
- std::fs::create_dir_all(meta.join("config-sync/profiles/b/config")).unwrap();
- std::fs::write(
- meta.join("config-sync/profiles/b/options.txt"),
- "profile-b-options",
- )
- .unwrap();
- std::fs::write(
- meta.join("config-sync/profiles/b/config/b.txt"),
- "profile-b",
- )
- .unwrap();
-
- let selected = switch_profile("inst", Some("a"), Some("b"), &meta, &instance).unwrap();
-
- assert_eq!(selected.as_deref(), Some("b"));
- assert_eq!(
- std::fs::read_to_string(meta.join("config-sync/profiles/a/options.txt")).unwrap(),
- "changed-a-options"
- );
- assert_eq!(
- std::fs::read_to_string(meta.join("config-sync/profiles/a/config/a.txt")).unwrap(),
- "changed-a"
- );
- assert_eq!(
- std::fs::read_to_string(minecraft.join("options.txt")).unwrap(),
- "profile-b-options"
- );
- assert_eq!(
- std::fs::read_to_string(minecraft.join("config/b.txt")).unwrap(),
- "profile-b"
- );
- assert!(!minecraft.join("config/a.txt").exists());
- }
-
- #[test]
- fn second_instance_uses_profile_options_saved_by_first_instance() {
- let tmp = tempfile::tempdir().unwrap();
- let meta = tmp.path().join("meta");
- let first = tmp.path().join("first/.minecraft");
- let second_instance = tmp.path().join("second");
- let second = second_instance.join(".minecraft");
- std::fs::create_dir_all(first.join("config")).unwrap();
- std::fs::create_dir_all(second.join("config")).unwrap();
- std::fs::write(first.join("options.txt"), "first-default").unwrap();
- std::fs::write(second.join("options.txt"), "second-local").unwrap();
- create_profile(&meta, "main").unwrap();
-
- assert!(prepare(Some("main"), &meta, &first).unwrap());
- std::fs::write(first.join("options.txt"), "changed-in-main").unwrap();
- finish(Some("main"), &meta, &first).unwrap();
-
- switch_profile("second", None, Some("main"), &meta, &second_instance).unwrap();
-
- assert_eq!(
- std::fs::read_to_string(second.join("options.txt")).unwrap(),
- "changed-in-main"
- );
- assert_eq!(
- std::fs::read_to_string(
- second_instance.join(".rmcl/config-sync/local-config/options.txt")
- )
- .unwrap(),
- "second-local"
- );
- }
-}
+#[path = "tests/config_sync.rs"]
+mod tests;
diff --git a/src/instance/content/datapacks.rs b/src/instance/content/datapacks.rs
new file mode 100644
index 0000000..5c27b59
--- /dev/null
+++ b/src/instance/content/datapacks.rs
@@ -0,0 +1,9 @@
+// data pack scanning backed by the same pack.mcmeta reader as resource packs.
+
+use std::path::Path;
+
+use super::entry::ContentEntry;
+
+pub fn scan_one_datapack(path: &Path, file_stem: &str, enabled: bool) -> ContentEntry {
+ super::packs::scan_one_pack(path, file_stem, enabled)
+}
diff --git a/src/instance/content/dependencies.rs b/src/instance/content/dependencies.rs
new file mode 100644
index 0000000..bd9660a
--- /dev/null
+++ b/src/instance/content/dependencies.rs
@@ -0,0 +1,1156 @@
+use std::collections::{HashMap, HashSet, VecDeque};
+use std::path::{Path, PathBuf};
+use std::sync::atomic::{AtomicU64, Ordering};
+
+use crate::instance::content::provider::{ContentProvider, FingerprintQuery, ProviderRegistry};
+use crate::instance::{
+ ContentFileRecord, ContentKind, ContentManifest, InstanceConfig, ProviderProject,
+};
+use crate::net::NetError;
+use crate::net::modrinth::{
+ DependencyType, ProjectInfo, VersionDependency, VersionInfo, VersionType,
+};
+
+static NEXT_INSTALL_ID: AtomicU64 = AtomicU64::new(1);
+
+#[derive(Debug, Clone)]
+pub struct InstallRoot {
+ pub provider: String,
+ pub project_id: String,
+ pub title: String,
+ pub version: VersionInfo,
+ pub installed_path: Option,
+ pub kind: ContentKind,
+ pub target_world: Option,
+ pub force_reinstall: bool,
+}
+
+#[derive(Debug, Clone)]
+pub struct PlannedInstall {
+ pub provider: String,
+ pub project_id: String,
+ pub title: String,
+ pub version: VersionInfo,
+ pub installed_path: Option,
+ pub kind: ContentKind,
+ pub destination: PathBuf,
+ pub provider_aliases: Vec,
+ pub required_dependencies: Vec,
+ pub automatic_dependency: bool,
+ pub cleanup_eligible: bool,
+ pub replacement: bool,
+}
+
+impl PlannedInstall {
+ pub fn needs_download(&self) -> bool {
+ self.installed_path.is_none() || self.replacement
+ }
+
+ pub fn identity(&self) -> ProviderProject {
+ ProviderProject {
+ provider: self.provider.clone(),
+ project_id: self.project_id.clone(),
+ version_id: self.version.id.clone(),
+ }
+ }
+}
+
+#[derive(Debug, Clone)]
+pub struct DependencyPlan {
+ pub items: Vec,
+ pub root_count: usize,
+ pub optional_dependencies: usize,
+}
+
+pub struct InstallResult {
+ pub root_path: PathBuf,
+ pub replaced: bool,
+ pub skipped: bool,
+ pub orphaned_dependencies: Vec,
+}
+
+impl DependencyPlan {
+ pub fn dependency_installs(&self) -> impl Iterator- {
+ self.items
+ .iter()
+ .skip(self.root_count)
+ .filter(|item| item.installed_path.is_none())
+ }
+
+ pub fn dependency_replacements(&self) -> impl Iterator
- {
+ self.items
+ .iter()
+ .skip(self.root_count)
+ .filter(|item| item.replacement)
+ }
+}
+
+pub async fn install(
+ registry: &ProviderRegistry,
+ manifest_path: &Path,
+ minecraft_dir: &Path,
+ plan: &DependencyPlan,
+) -> Result {
+ let root = plan
+ .items
+ .first()
+ .ok_or_else(|| NetError::Parse("Dependency plan is empty".to_owned()))?;
+ for item in &plan.items {
+ tokio::fs::create_dir_all(&item.destination).await?;
+ }
+ let staging = staging_directory(minecraft_dir);
+ tokio::fs::create_dir(&staging).await?;
+
+ let result = install_staged(registry, manifest_path, minecraft_dir, &staging, plan).await;
+ if let Err(error) = tokio::fs::remove_dir_all(&staging).await
+ && error.kind() != std::io::ErrorKind::NotFound
+ {
+ tracing::warn!(
+ "Failed to remove dependency install staging directory '{}': {error}",
+ staging.display()
+ );
+ }
+ result.map(|(root_path, orphaned_dependencies)| InstallResult {
+ root_path,
+ replaced: root.replacement,
+ skipped: !plan.items.iter().any(PlannedInstall::needs_download),
+ orphaned_dependencies,
+ })
+}
+
+fn staging_directory(minecraft_dir: &Path) -> PathBuf {
+ minecraft_dir.join(format!(
+ ".rmcl-install-{}",
+ NEXT_INSTALL_ID.fetch_add(1, Ordering::Relaxed)
+ ))
+}
+
+struct StagedFile {
+ item: usize,
+ source: PathBuf,
+ target: PathBuf,
+}
+
+struct CommittedFile {
+ target: PathBuf,
+ old_path: Option,
+ backup: Option,
+}
+
+async fn install_staged(
+ registry: &ProviderRegistry,
+ manifest_path: &Path,
+ minecraft_dir: &Path,
+ staging: &Path,
+ plan: &DependencyPlan,
+) -> Result<(PathBuf, Vec), NetError> {
+ let mut staged = Vec::new();
+ let mut targets = HashSet::new();
+ for (index, item) in plan.items.iter().enumerate() {
+ if !item.needs_download() {
+ continue;
+ }
+ let provider = registry.get(&item.provider).ok_or_else(|| {
+ NetError::Parse(format!("{} content provider is unavailable", item.provider))
+ })?;
+ let item_staging = staging.join(format!("item-{index}"));
+ tokio::fs::create_dir(&item_staging).await?;
+ let outcome = provider
+ .download_version(&item.version, &item_staging, None)
+ .await?;
+ let source = match outcome {
+ crate::net::modrinth::DownloadOutcome::Downloaded(path)
+ | crate::net::modrinth::DownloadOutcome::SkippedExisting(path) => path,
+ };
+ let file_name = source.file_name().ok_or_else(|| {
+ NetError::Parse(format!(
+ "Downloaded dependency '{}' has no filename",
+ item.title
+ ))
+ })?;
+ let target = item.destination.join(file_name);
+ if !targets.insert(target.clone()) {
+ return Err(NetError::Parse(format!(
+ "Multiple selected projects install '{}'",
+ target.display()
+ )));
+ }
+ if target.exists()
+ && item
+ .installed_path
+ .as_ref()
+ .is_none_or(|installed| installed != &target)
+ {
+ return Err(NetError::Parse(format!(
+ "Cannot install '{}' because '{}' already exists",
+ item.title,
+ target.display()
+ )));
+ }
+ staged.push(StagedFile {
+ item: index,
+ source,
+ target,
+ });
+ }
+
+ let mut committed = Vec::new();
+ for (index, file) in staged.iter().enumerate() {
+ let item = &plan.items[file.item];
+ let old_path = item.installed_path.clone();
+ let backup = if let Some(old_path) = old_path.as_ref() {
+ let backup = staging.join(format!("backup-{index}"));
+ if let Err(error) = tokio::fs::rename(old_path, &backup).await {
+ rollback_files(&committed).await;
+ return Err(error.into());
+ }
+ Some(backup)
+ } else {
+ None
+ };
+ if let Err(error) = tokio::fs::rename(&file.source, &file.target).await {
+ if let (Some(old_path), Some(backup)) = (&old_path, &backup) {
+ let _ = tokio::fs::rename(backup, old_path).await;
+ }
+ rollback_files(&committed).await;
+ return Err(error.into());
+ }
+ committed.push(CommittedFile {
+ target: file.target.clone(),
+ old_path,
+ backup,
+ });
+ }
+
+ let previous =
+ ContentManifest::load(manifest_path).map_err(|error| NetError::Parse(error.to_string()))?;
+ let records = match build_records(plan, &previous, minecraft_dir, &staged) {
+ Ok(records) => records,
+ Err(error) => {
+ rollback_files(&committed).await;
+ return Err(error);
+ }
+ };
+ if let Err(error) = ContentManifest::update(manifest_path, |manifest| {
+ for (old_relative, record) in &records {
+ if let Some(old_relative) = old_relative
+ && old_relative != &record.relative_path
+ {
+ manifest.remove(old_relative);
+ }
+ manifest.upsert(record.clone());
+ }
+ Ok(())
+ }) {
+ rollback_files(&committed).await;
+ return Err(NetError::Parse(error.to_string()));
+ }
+ for committed in &committed {
+ if let Some(backup) = &committed.backup
+ && let Err(error) = tokio::fs::remove_file(backup).await
+ {
+ tracing::warn!(
+ "Failed to remove dependency install backup '{}': {error}",
+ backup.display()
+ );
+ }
+ }
+
+ let orphaned_dependencies = match ContentManifest::load(manifest_path) {
+ Ok(updated) => updated
+ .orphaned_dependencies()
+ .into_iter()
+ .map(|relative| minecraft_dir.join(relative))
+ .collect(),
+ Err(error) => {
+ tracing::warn!("Failed to check for unused dependencies: {error}");
+ Vec::new()
+ }
+ };
+ let root = &plan.items[0];
+ let root_path = if root.needs_download() {
+ staged
+ .iter()
+ .find(|file| file.item == 0)
+ .map(|file| file.target.clone())
+ .ok_or_else(|| NetError::Parse("Installed root file is missing".to_owned()))
+ } else {
+ root.installed_path
+ .clone()
+ .ok_or_else(|| NetError::Parse("Installed root path is missing".to_owned()))
+ }?;
+ Ok((root_path, orphaned_dependencies))
+}
+
+fn build_records(
+ plan: &DependencyPlan,
+ previous: &ContentManifest,
+ minecraft_dir: &Path,
+ staged: &[StagedFile],
+) -> Result, ContentFileRecord)>, NetError> {
+ plan.items
+ .iter()
+ .enumerate()
+ .map(|(index, item)| {
+ let old_relative = item
+ .installed_path
+ .as_ref()
+ .and_then(|path| path.strip_prefix(minecraft_dir).ok())
+ .map(Path::to_owned);
+ if !item.needs_download() {
+ let old_relative = old_relative.ok_or_else(|| {
+ NetError::Parse(format!("Installed path for '{}' is invalid", item.title))
+ })?;
+ let mut record = previous.record(&old_relative).cloned().ok_or_else(|| {
+ NetError::Parse(format!("Manifest record for '{}' is missing", item.title))
+ })?;
+ let identity = item.identity();
+ if !record.matches_project(&identity.provider, &identity.project_id)
+ && !record.provider_aliases.contains(&identity)
+ {
+ record.provider_aliases.push(identity);
+ }
+ record.required_dependencies = item.required_dependencies.clone();
+ record.automatic_dependency = item.automatic_dependency;
+ record.cleanup_eligible = item.cleanup_eligible;
+ return Ok((Some(old_relative), record));
+ }
+ let path = staged
+ .iter()
+ .find(|file| file.item == index)
+ .map(|file| file.target.clone())
+ .ok_or_else(|| {
+ NetError::Parse(format!("Staged file for '{}' is missing", item.title))
+ })?;
+ let relative_path = path
+ .strip_prefix(minecraft_dir)
+ .map_err(|error| NetError::Parse(error.to_string()))?
+ .to_owned();
+ Ok((
+ old_relative,
+ ContentFileRecord {
+ relative_path,
+ kind: item.kind,
+ enabled: true,
+ fingerprint: crate::instance::content::manifest::fingerprint(&path)?,
+ resolution: crate::instance::Resolution::Resolved {
+ project: item.identity(),
+ },
+ provider_aliases: item.provider_aliases.clone(),
+ provider_checks: vec![item.provider.clone()],
+ required_dependencies: item.required_dependencies.clone(),
+ automatic_dependency: item.automatic_dependency,
+ cleanup_eligible: item.cleanup_eligible,
+ },
+ ))
+ })
+ .collect()
+}
+
+async fn rollback_files(committed: &[CommittedFile]) {
+ for committed in committed.iter().rev() {
+ if let Err(error) = tokio::fs::remove_file(&committed.target).await
+ && error.kind() != std::io::ErrorKind::NotFound
+ {
+ tracing::warn!(
+ "Failed to remove rolled back content '{}': {error}",
+ committed.target.display()
+ );
+ }
+ if let (Some(old_path), Some(backup)) = (&committed.old_path, &committed.backup)
+ && let Err(error) = tokio::fs::rename(backup, old_path).await
+ {
+ tracing::warn!(
+ "Failed to restore rolled back content '{}': {error}",
+ old_path.display()
+ );
+ }
+ }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+struct ProjectKey {
+ provider: String,
+ project_id: String,
+}
+
+impl ProjectKey {
+ fn new(provider: &str, project_id: impl Into) -> Self {
+ Self {
+ provider: provider.to_owned(),
+ project_id: project_id.into(),
+ }
+ }
+}
+
+#[derive(Debug, Clone)]
+struct Node {
+ title: String,
+ kind: ContentKind,
+ version: VersionInfo,
+ installed: Option,
+ automatic_dependency: bool,
+ cleanup_eligible: bool,
+ exact: bool,
+ dependencies: Vec,
+ optional_dependencies: usize,
+ incompatible: Vec,
+}
+
+#[derive(Debug, Clone)]
+struct InstalledMatch {
+ relative_path: PathBuf,
+ identity: ProviderProject,
+ aliases: Vec,
+ automatic_dependency: bool,
+}
+
+#[derive(Debug, Clone)]
+struct Incompatible {
+ project_id: String,
+ version_id: Option,
+}
+
+#[derive(Debug, Clone)]
+struct Requirement {
+ parent: ProjectKey,
+ parent_version_id: String,
+ dependency: VersionDependency,
+ ancestors: Vec,
+}
+
+pub async fn resolve(
+ registry: &ProviderRegistry,
+ manifest: &ContentManifest,
+ minecraft_dir: &Path,
+ instance: &InstanceConfig,
+ root: InstallRoot,
+) -> Result {
+ if root.kind == ContentKind::DataPack && root.target_world.is_none() {
+ return Err(NetError::Parse(
+ "A target world is required for datapack installation".to_owned(),
+ ));
+ }
+ let provider = registry.get(&root.provider).ok_or_else(|| {
+ NetError::Parse(format!("{} content provider is unavailable", root.provider))
+ })?;
+ let root_version = provider.version(&root.version.id).await?;
+ validate_compatible(&root_version, instance, root.kind)?;
+ if !root_version.project_id.is_empty() && root_version.project_id != root.project_id {
+ return Err(NetError::Parse(format!(
+ "Selected version belongs to project '{}', not '{}'",
+ root_version.project_id, root.project_id
+ )));
+ }
+ let remote_matches = resolve_installed_files(provider, manifest).await?;
+ let root_key = ProjectKey::new(&root.provider, root.project_id.clone());
+ let root_installed = installed_root(manifest, minecraft_dir, &root, &remote_matches);
+ let mut nodes = HashMap::from([(
+ root_key.clone(),
+ Node {
+ title: root.title,
+ kind: root.kind,
+ version: root_version.clone(),
+ automatic_dependency: false,
+ cleanup_eligible: false,
+ exact: true,
+ installed: root_installed,
+ dependencies: Vec::new(),
+ optional_dependencies: 0,
+ incompatible: Vec::new(),
+ },
+ )]);
+ let mut queue = VecDeque::new();
+ expand_node(
+ provider,
+ &root_key,
+ &root_version,
+ vec![root_key.clone()],
+ &mut nodes,
+ &mut queue,
+ )
+ .await?;
+
+ while let Some(requirement) = queue.pop_front() {
+ if nodes
+ .get(&requirement.parent)
+ .is_none_or(|parent| parent.version.id != requirement.parent_version_id)
+ {
+ continue;
+ }
+ let exact = requirement.dependency.version_id.is_some();
+ let parent_kind = nodes
+ .get(&requirement.parent)
+ .map(|node| node.kind)
+ .unwrap_or(root.kind);
+ let choice = resolve_requirement(
+ provider,
+ manifest,
+ &remote_matches,
+ instance,
+ parent_kind,
+ root.target_world.as_deref(),
+ &requirement.dependency,
+ )
+ .await?;
+ if choice.kind == ContentKind::DataPack && root.target_world.is_none() {
+ return Err(NetError::Parse(format!(
+ "Datapack dependency '{}' requires a target world",
+ choice.title
+ )));
+ }
+ let key = ProjectKey::new(provider.id(), choice.version.project_id.clone());
+ if requirement.ancestors.contains(&key) {
+ return Err(NetError::Parse(format!(
+ "Dependency cycle detected at '{}'",
+ choice.title
+ )));
+ }
+ if let Some(parent) = nodes.get_mut(&requirement.parent)
+ && !parent.dependencies.contains(&key)
+ {
+ parent.dependencies.push(key.clone());
+ }
+
+ let replace_selection = match nodes.get(&key) {
+ Some(existing)
+ if exact && existing.exact && existing.version.id != choice.version.id =>
+ {
+ return Err(NetError::Parse(format!(
+ "Conflicting required versions for '{}': '{}' and '{}'",
+ choice.title, existing.version.version_number, choice.version.version_number
+ )));
+ }
+ Some(existing) => exact && !existing.exact && existing.version.id != choice.version.id,
+ None => true,
+ };
+ if !replace_selection {
+ continue;
+ }
+
+ let mut ancestors = requirement.ancestors;
+ ancestors.push(key.clone());
+ nodes.insert(
+ key.clone(),
+ Node {
+ title: choice.title,
+ kind: choice.kind,
+ version: choice.version.clone(),
+ installed: choice.installed,
+ automatic_dependency: choice.automatic_dependency,
+ cleanup_eligible: choice.cleanup_eligible,
+ exact,
+ dependencies: Vec::new(),
+ optional_dependencies: 0,
+ incompatible: Vec::new(),
+ },
+ );
+ expand_node(
+ provider,
+ &key,
+ &choice.version,
+ ancestors,
+ &mut nodes,
+ &mut queue,
+ )
+ .await?;
+ }
+
+ let order = reachable_order(&root_key, &nodes);
+ reject_installed_incompatibilities(
+ provider,
+ manifest,
+ &remote_matches,
+ &order,
+ &nodes,
+ root.target_world.as_deref(),
+ )?;
+ let optional_dependencies = order
+ .iter()
+ .filter_map(|key| nodes.get(key))
+ .map(|node| node.optional_dependencies)
+ .sum();
+ let items = order
+ .iter()
+ .filter_map(|key| {
+ nodes.get(key).map(|node| {
+ planned_install(
+ key,
+ node,
+ &nodes,
+ minecraft_dir,
+ root.target_world.as_deref(),
+ root.force_reinstall && key == &root_key,
+ )
+ })
+ })
+ .collect();
+ Ok(DependencyPlan {
+ items,
+ root_count: 1,
+ optional_dependencies,
+ })
+}
+
+pub fn merge(plans: Vec) -> Result {
+ let optional_dependencies = plans.iter().map(|plan| plan.optional_dependencies).sum();
+ let mut merged: Vec<(PlannedInstall, bool)> = Vec::new();
+ for plan in plans {
+ for (index, item) in plan.items.into_iter().enumerate() {
+ let root = index < plan.root_count;
+ if let Some((existing, existing_root)) = merged.iter_mut().find(|(existing, _)| {
+ existing.provider == item.provider
+ && existing.project_id == item.project_id
+ && existing.destination == item.destination
+ }) {
+ if existing.version.id != item.version.id {
+ return Err(NetError::Parse(format!(
+ "Conflicting selected versions for '{}': '{}' and '{}'",
+ item.title, existing.version.version_number, item.version.version_number
+ )));
+ }
+ for dependency in item.required_dependencies {
+ if !existing.required_dependencies.contains(&dependency) {
+ existing.required_dependencies.push(dependency);
+ }
+ }
+ for alias in item.provider_aliases {
+ if !existing.provider_aliases.contains(&alias) {
+ existing.provider_aliases.push(alias);
+ }
+ }
+ if root && !*existing_root {
+ existing.title = item.title;
+ if item.installed_path.is_some() {
+ existing.installed_path = item.installed_path;
+ }
+ existing.replacement |= item.replacement;
+ existing.automatic_dependency = false;
+ existing.cleanup_eligible = false;
+ *existing_root = true;
+ }
+ continue;
+ }
+ merged.push((item, root));
+ }
+ }
+ merged.sort_by_key(|(_, root)| !*root);
+ let root_count = merged.iter().take_while(|(_, root)| *root).count();
+ Ok(DependencyPlan {
+ items: merged.into_iter().map(|(item, _)| item).collect(),
+ root_count,
+ optional_dependencies,
+ })
+}
+
+struct ResolvedChoice {
+ title: String,
+ kind: ContentKind,
+ version: VersionInfo,
+ installed: Option,
+ automatic_dependency: bool,
+ cleanup_eligible: bool,
+}
+
+async fn resolve_requirement(
+ provider: &dyn ContentProvider,
+ manifest: &ContentManifest,
+ remote_matches: &HashMap,
+ instance: &InstanceConfig,
+ parent_kind: ContentKind,
+ target_world: Option<&Path>,
+ dependency: &VersionDependency,
+) -> Result {
+ let exact_version = match dependency.version_id.as_deref() {
+ Some(version_id) => Some(provider.version(version_id).await?),
+ None => None,
+ };
+ let project_id = dependency
+ .project_id
+ .clone()
+ .or_else(|| {
+ exact_version
+ .as_ref()
+ .map(|version| version.project_id.clone())
+ })
+ .filter(|project_id| !project_id.is_empty())
+ .ok_or_else(|| {
+ NetError::Parse(format!(
+ "Required dependency '{}' has no provider project",
+ dependency.file_name.as_deref().unwrap_or("unknown")
+ ))
+ })?;
+ let project = match provider.project(&project_id).await {
+ Ok(project) => Some(project),
+ Err(error) => {
+ tracing::warn!(
+ "Could not load metadata for dependency '{project_id}'; keeping it out of automatic cleanup: {error}"
+ );
+ None
+ }
+ };
+ let kind = dependency_kind(project.as_ref(), exact_version.as_ref(), parent_kind);
+ let installed = find_installed(
+ manifest,
+ remote_matches,
+ provider.id(),
+ &project_id,
+ kind,
+ target_world,
+ );
+ let version = if let Some(version) = exact_version {
+ version
+ } else {
+ let installed_version = match &installed {
+ Some(installed) => match provider.version(&installed.identity.version_id).await {
+ Ok(version) => Some(version),
+ Err(error) => {
+ tracing::warn!(
+ "Could not load installed dependency version '{}'; selecting a compatible replacement: {error}",
+ installed.identity.version_id
+ );
+ None
+ }
+ },
+ None => None,
+ };
+ match installed_version {
+ Some(version) if validate_compatible(&version, instance, kind).is_ok() => version,
+ _ => {
+ let versions = provider
+ .compatible_versions(&project_id, kind, &instance.game_version, instance.loader)
+ .await?;
+ select_preferred_version(versions).ok_or_else(|| {
+ NetError::Parse(format!(
+ "No compatible dependency version found for project '{project_id}'"
+ ))
+ })?
+ }
+ }
+ };
+ validate_compatible(&version, instance, kind)?;
+ if !version.project_id.is_empty() && version.project_id != project_id {
+ return Err(NetError::Parse(format!(
+ "Dependency version '{}' belongs to project '{}', not '{}'",
+ version.version_number, version.project_id, project_id
+ )));
+ }
+ let automatic_dependency = installed
+ .as_ref()
+ .is_none_or(|installed| installed.automatic_dependency);
+ let cleanup_eligible =
+ automatic_dependency && project.as_ref().is_some_and(ProjectInfo::is_library_only);
+ Ok(ResolvedChoice {
+ title: project
+ .map(|project| project.title)
+ .unwrap_or_else(|| project_id.clone()),
+ version,
+ kind,
+ automatic_dependency,
+ cleanup_eligible,
+ installed,
+ })
+}
+
+async fn expand_node(
+ provider: &dyn ContentProvider,
+ key: &ProjectKey,
+ version: &VersionInfo,
+ ancestors: Vec,
+ nodes: &mut HashMap,
+ queue: &mut VecDeque,
+) -> Result<(), NetError> {
+ let mut required = Vec::new();
+ let mut incompatible = Vec::new();
+ let mut optional_dependencies = 0;
+ for dependency in &version.dependencies {
+ match dependency.dependency_type {
+ DependencyType::Required => required.push(dependency.clone()),
+ DependencyType::Optional => optional_dependencies += 1,
+ DependencyType::Incompatible => {
+ let (project_id, version_id) = dependency_identity(provider, dependency).await?;
+ incompatible.push(Incompatible {
+ project_id,
+ version_id,
+ });
+ }
+ DependencyType::Embedded | DependencyType::Unknown => {}
+ }
+ }
+ if let Some(node) = nodes.get_mut(key) {
+ node.optional_dependencies = optional_dependencies;
+ node.incompatible = incompatible;
+ }
+ queue.extend(required.into_iter().map(|dependency| Requirement {
+ parent: key.clone(),
+ parent_version_id: version.id.clone(),
+ dependency,
+ ancestors: ancestors.clone(),
+ }));
+ Ok(())
+}
+
+async fn dependency_identity(
+ provider: &dyn ContentProvider,
+ dependency: &VersionDependency,
+) -> Result<(String, Option), NetError> {
+ if let Some(project_id) = dependency.project_id.clone() {
+ return Ok((project_id, dependency.version_id.clone()));
+ }
+ let version_id = dependency.version_id.as_deref().ok_or_else(|| {
+ NetError::Parse("Incompatible dependency has no provider project".to_owned())
+ })?;
+ let version = provider.version(version_id).await?;
+ Ok((version.project_id, Some(version_id.to_owned())))
+}
+
+fn select_preferred_version(mut versions: Vec) -> Option {
+ versions.sort_by(|left, right| {
+ release_rank(left.version_type)
+ .cmp(&release_rank(right.version_type))
+ .then_with(|| right.date_published.cmp(&left.date_published))
+ });
+ versions.into_iter().next()
+}
+
+fn dependency_kind(
+ project: Option<&ProjectInfo>,
+ version: Option<&VersionInfo>,
+ parent_kind: ContentKind,
+) -> ContentKind {
+ if version.is_some_and(|version| {
+ version
+ .loaders
+ .iter()
+ .any(|loader| loader.eq_ignore_ascii_case("datapack"))
+ }) {
+ return ContentKind::DataPack;
+ }
+ if version.is_some_and(|version| {
+ version.loaders.iter().any(|loader| {
+ matches!(
+ loader.to_ascii_lowercase().as_str(),
+ "fabric" | "forge" | "neoforge" | "quilt"
+ )
+ })
+ }) {
+ return ContentKind::Mod;
+ }
+ if project.is_some_and(|project| {
+ project
+ .loaders
+ .iter()
+ .any(|loader| loader.eq_ignore_ascii_case("datapack"))
+ }) {
+ return ContentKind::DataPack;
+ }
+ match project.map(|project| project.project_type.as_str()) {
+ Some("resourcepack") => ContentKind::ResourcePack,
+ Some("shader") => ContentKind::Shader,
+ Some("datapack") => ContentKind::DataPack,
+ Some("mod") => ContentKind::Mod,
+ _ => parent_kind,
+ }
+}
+
+fn release_rank(version_type: VersionType) -> u8 {
+ match version_type {
+ VersionType::Release => 0,
+ VersionType::Beta => 1,
+ VersionType::Alpha => 2,
+ VersionType::Unknown => 3,
+ }
+}
+
+fn validate_compatible(
+ version: &VersionInfo,
+ instance: &InstanceConfig,
+ kind: ContentKind,
+) -> Result<(), NetError> {
+ let loader = instance.loader.to_string().to_ascii_lowercase();
+ let supports_game = version
+ .game_versions
+ .iter()
+ .any(|game_version| game_version == &instance.game_version);
+ let supports_loader = kind != ContentKind::Mod
+ || version
+ .loaders
+ .iter()
+ .any(|candidate| candidate.eq_ignore_ascii_case(&loader));
+ if !supports_game || !supports_loader {
+ return Err(NetError::Parse(format!(
+ "Required dependency '{}' does not support Minecraft {} with {}",
+ version.version_number, instance.game_version, instance.loader
+ )));
+ }
+ Ok(())
+}
+
+async fn resolve_installed_files(
+ provider: &dyn ContentProvider,
+ manifest: &ContentManifest,
+) -> Result, NetError> {
+ let files = manifest
+ .files
+ .iter()
+ .filter(|record| record.enabled)
+ .map(|record| FingerprintQuery {
+ key: record.relative_path.to_string_lossy().into_owned(),
+ kind: record.kind,
+ fingerprint: record.fingerprint.clone(),
+ })
+ .collect::>();
+ if files.is_empty() {
+ return Ok(HashMap::new());
+ }
+ Ok(provider
+ .resolve_files(&files)
+ .await?
+ .into_iter()
+ .map(|resolved| (PathBuf::from(resolved.key), resolved.project))
+ .collect())
+}
+
+fn installed_root(
+ manifest: &ContentManifest,
+ minecraft_dir: &Path,
+ root: &InstallRoot,
+ remote_matches: &HashMap,
+) -> Option {
+ let path = root.installed_path.as_ref()?;
+ let relative_path = path.strip_prefix(minecraft_dir).ok()?.to_owned();
+ let record = manifest.record(&relative_path)?;
+ Some(installed_match(
+ record,
+ remote_matches.get(&relative_path),
+ &root.provider,
+ &root.project_id,
+ ))
+}
+
+fn find_installed(
+ manifest: &ContentManifest,
+ remote_matches: &HashMap,
+ provider: &str,
+ project_id: &str,
+ kind: ContentKind,
+ target_world: Option<&Path>,
+) -> Option {
+ manifest
+ .files
+ .iter()
+ .filter(|record| record.enabled && record.kind == kind)
+ .filter(|record| record_in_target(record, kind, target_world))
+ .find_map(|record| {
+ let remote = remote_matches.get(&record.relative_path);
+ if !record.matches_project(provider, project_id)
+ && !remote.is_some_and(|project| {
+ project.provider == provider && project.project_id == project_id
+ })
+ {
+ return None;
+ }
+ Some(installed_match(record, remote, provider, project_id))
+ })
+}
+
+fn record_in_target(
+ record: &ContentFileRecord,
+ kind: ContentKind,
+ target_world: Option<&Path>,
+) -> bool {
+ if kind != ContentKind::DataPack {
+ return true;
+ }
+ let Some(world_name) = target_world.and_then(Path::file_name) else {
+ return false;
+ };
+ record
+ .relative_path
+ .starts_with(Path::new("saves").join(world_name).join("datapacks"))
+}
+
+fn installed_match(
+ record: &ContentFileRecord,
+ remote: Option<&ProviderProject>,
+ provider: &str,
+ project_id: &str,
+) -> InstalledMatch {
+ let identity = record
+ .project_for_provider(provider, project_id)
+ .or_else(|| {
+ remote
+ .filter(|project| project.provider == provider && project.project_id == project_id)
+ })
+ .cloned()
+ .unwrap_or_else(|| ProviderProject {
+ provider: provider.to_owned(),
+ project_id: project_id.to_owned(),
+ version_id: String::new(),
+ });
+ let mut aliases = record.provider_aliases.clone();
+ if let Some(project) = record.resolved_project()
+ && project != &identity
+ && !aliases.contains(project)
+ {
+ aliases.push(project.clone());
+ }
+ if record.resolved_project() != Some(&identity) && !aliases.contains(&identity) {
+ aliases.push(identity.clone());
+ }
+ InstalledMatch {
+ relative_path: record.relative_path.clone(),
+ identity,
+ aliases,
+ automatic_dependency: record.automatic_dependency,
+ }
+}
+
+fn reachable_order(root: &ProjectKey, nodes: &HashMap) -> Vec {
+ let mut order = Vec::new();
+ let mut pending = VecDeque::from([root.clone()]);
+ let mut seen = HashSet::new();
+ while let Some(key) = pending.pop_front() {
+ if !seen.insert(key.clone()) {
+ continue;
+ }
+ order.push(key.clone());
+ if let Some(node) = nodes.get(&key) {
+ pending.extend(node.dependencies.iter().cloned());
+ }
+ }
+ order
+}
+
+fn reject_installed_incompatibilities(
+ provider: &dyn ContentProvider,
+ manifest: &ContentManifest,
+ remote_matches: &HashMap,
+ order: &[ProjectKey],
+ nodes: &HashMap,
+ target_world: Option<&Path>,
+) -> Result<(), NetError> {
+ for key in order {
+ let Some(node) = nodes.get(key) else {
+ continue;
+ };
+ for incompatible in &node.incompatible {
+ let installed = find_installed_incompatible(
+ manifest,
+ remote_matches,
+ provider.id(),
+ &incompatible.project_id,
+ target_world,
+ );
+ let selected = order.iter().find_map(|selected_key| {
+ (selected_key.provider == provider.id()
+ && selected_key.project_id == incompatible.project_id)
+ .then(|| nodes.get(selected_key))
+ .flatten()
+ });
+ let conflicts = installed.as_ref().is_some_and(|installed| {
+ incompatible
+ .version_id
+ .as_ref()
+ .is_none_or(|version_id| installed.identity.version_id == *version_id)
+ }) || selected.is_some_and(|selected| {
+ incompatible
+ .version_id
+ .as_ref()
+ .is_none_or(|version_id| selected.version.id == *version_id)
+ });
+ if conflicts {
+ return Err(NetError::Parse(format!(
+ "'{}' is incompatible with installed project '{}'",
+ node.title, incompatible.project_id
+ )));
+ }
+ }
+ }
+ Ok(())
+}
+
+fn find_installed_incompatible(
+ manifest: &ContentManifest,
+ remote_matches: &HashMap,
+ provider: &str,
+ project_id: &str,
+ target_world: Option<&Path>,
+) -> Option {
+ manifest
+ .files
+ .iter()
+ .filter(|record| record.enabled)
+ .filter(|record| {
+ record.kind != ContentKind::DataPack
+ || record_in_target(record, ContentKind::DataPack, target_world)
+ })
+ .find_map(|record| {
+ let remote = remote_matches.get(&record.relative_path);
+ (record.matches_project(provider, project_id)
+ || remote.is_some_and(|project| {
+ project.provider == provider && project.project_id == project_id
+ }))
+ .then(|| installed_match(record, remote, provider, project_id))
+ })
+}
+
+fn planned_install(
+ key: &ProjectKey,
+ node: &Node,
+ nodes: &HashMap,
+ minecraft_dir: &Path,
+ target_world: Option<&Path>,
+ force_reinstall: bool,
+) -> PlannedInstall {
+ let installed_path = node
+ .installed
+ .as_ref()
+ .map(|installed| minecraft_dir.join(&installed.relative_path));
+ let replacement = force_reinstall
+ || node.installed.as_ref().is_some_and(|installed| {
+ installed.identity.version_id.is_empty()
+ || installed.identity.version_id != node.version.id
+ });
+ PlannedInstall {
+ provider: key.provider.clone(),
+ project_id: key.project_id.clone(),
+ title: node.title.clone(),
+ version: node.version.clone(),
+ installed_path,
+ kind: node.kind,
+ destination: match node.kind {
+ ContentKind::DataPack => target_world
+ .expect("datapack dependency plan requires a world")
+ .join("datapacks"),
+ kind => minecraft_dir.join(kind.directory()),
+ },
+ provider_aliases: node.installed.as_ref().map_or_else(Vec::new, |installed| {
+ if replacement {
+ Vec::new()
+ } else {
+ installed.aliases.clone()
+ }
+ }),
+ required_dependencies: node
+ .dependencies
+ .iter()
+ .filter_map(|dependency| {
+ nodes
+ .get(dependency)
+ .map(|dependency_node| ProviderProject {
+ provider: dependency.provider.clone(),
+ project_id: dependency.project_id.clone(),
+ version_id: dependency_node.version.id.clone(),
+ })
+ })
+ .collect(),
+ automatic_dependency: node.automatic_dependency,
+ cleanup_eligible: node.cleanup_eligible,
+ replacement,
+ }
+}
+
+#[cfg(test)]
+#[path = "../tests/content/dependencies.rs"]
+mod tests;
diff --git a/src/instance/content/entry.rs b/src/instance/content/entry.rs
new file mode 100644
index 0000000..3fe074b
--- /dev/null
+++ b/src/instance/content/entry.rs
@@ -0,0 +1,73 @@
+use std::path::PathBuf;
+
+use super::icons::IconCell;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum WorldGameMode {
+ Survival,
+ Creative,
+ Adventure,
+ Spectator,
+ Hardcore,
+}
+
+impl WorldGameMode {
+ pub fn label(self) -> &'static str {
+ match self {
+ Self::Survival => "Survival",
+ Self::Creative => "Creative",
+ Self::Adventure => "Adventure",
+ Self::Spectator => "Spectator",
+ Self::Hardcore => "Hardcore",
+ }
+ }
+}
+
+#[derive(Debug, Clone)]
+pub struct WorldDetails {
+ pub game_mode: Option,
+ pub last_played: Option>,
+ pub minecraft_version: Option,
+ pub size: Option,
+ pub datapacks: Vec,
+}
+
+#[derive(Debug, Clone)]
+pub struct ContentEntry {
+ pub file_stem: String,
+ pub name: String,
+ pub source_slug: Option,
+ pub installed_path: Option,
+ pub provider_project: Option,
+ pub world_details: Option,
+ pub title_suffix: Option,
+ pub footer_label: Option,
+ pub footer_change: Option<(String, String)>,
+ pub description: String,
+ pub enabled: bool,
+ pub icon_bytes: Option>,
+ pub provider_icon: bool,
+ pub provider_description: bool,
+ pub path: PathBuf,
+ pub icon_lines: Option>>,
+}
+
+// enable/disable by renaming the file with/without ".disabled" suffix.
+pub fn toggle_entry(entry: &ContentEntry) -> Result<(), std::io::Error> {
+ toggle_entry_path(entry).map(drop)
+}
+
+pub(crate) fn toggle_entry_path(entry: &ContentEntry) -> Result, std::io::Error> {
+ let Some(file_name) = entry.path.file_name().and_then(|name| name.to_str()) else {
+ return Ok(None);
+ };
+ let new_name = if entry.enabled {
+ format!("{file_name}.disabled")
+ } else {
+ file_name.trim_end_matches(".disabled").to_owned()
+ };
+ let mut new_path = entry.path.clone();
+ new_path.set_file_name(new_name);
+ std::fs::rename(&entry.path, &new_path)?;
+ Ok(Some(new_path))
+}
diff --git a/src/instance/content/icons.rs b/src/instance/content/icons.rs
new file mode 100644
index 0000000..c0a2d6d
--- /dev/null
+++ b/src/instance/content/icons.rs
@@ -0,0 +1,248 @@
+// terminal icon rasterization shared by every content type and markdown.
+
+// a single "pixel" in a terminal icon.
+#[derive(Debug, Clone, Copy)]
+pub struct IconCell {
+ pub symbol: char,
+ pub bg_r: u8,
+ pub bg_g: u8,
+ pub bg_b: u8,
+ pub fg_r: u8,
+ pub fg_g: u8,
+ pub fg_b: u8,
+}
+
+pub(crate) fn make_icon_pixels(
+ bytes: &[u8],
+ width: u16,
+ height: u16,
+) -> Option>> {
+ let image = image::load_from_memory(bytes).ok()?;
+ Some(make_icon_pixels_from_image(&image, width, height))
+}
+
+pub(crate) fn make_icon_pixels_from_image(
+ image: &image::DynamicImage,
+ width: u16,
+ height: u16,
+) -> Vec> {
+ let resized = image.resize_exact(
+ u32::from(width),
+ u32::from(height) * 2,
+ image::imageops::FilterType::Nearest,
+ );
+ let rgb = resized.to_rgb8();
+
+ let mut rows = Vec::new();
+ for row in 0..height {
+ let mut columns = Vec::new();
+ for column in 0..width {
+ let top_y = u32::from(row) * 2;
+ let bottom_y = (top_y + 1).min(rgb.height().saturating_sub(1));
+ let [tr, tg, tb] = rgb.get_pixel(u32::from(column), top_y).0;
+ let [br, bg, bb] = rgb.get_pixel(u32::from(column), bottom_y).0;
+ columns.push(IconCell {
+ symbol: '\u{2584}',
+ bg_r: br,
+ bg_g: bg,
+ bg_b: bb,
+ fg_r: tr,
+ fg_g: tg,
+ fg_b: tb,
+ });
+ }
+ rows.push(columns);
+ }
+ rows
+}
+
+pub(crate) fn make_icon_quadrants_from_image(
+ image: &image::DynamicImage,
+ width: u16,
+ height: u16,
+) -> Vec> {
+ let resized = image
+ .resize_exact(
+ u32::from(width) * 2,
+ u32::from(height) * 2,
+ image::imageops::FilterType::Lanczos3,
+ )
+ .to_rgb8();
+
+ (0..height)
+ .map(|row| {
+ (0..width)
+ .map(|column| {
+ let x = u32::from(column) * 2;
+ let y = u32::from(row) * 2;
+ quadrant_cell([
+ resized.get_pixel(x, y).0,
+ resized.get_pixel(x + 1, y).0,
+ resized.get_pixel(x, y + 1).0,
+ resized.get_pixel(x + 1, y + 1).0,
+ ])
+ })
+ .collect()
+ })
+ .collect()
+}
+
+fn quadrant_cell(pixels: [[u8; 3]; 4]) -> IconCell {
+ let mut pair = (0, 0);
+ let mut max_distance = 0;
+ for left in 0..pixels.len() {
+ for right in (left + 1)..pixels.len() {
+ let distance = color_distance(pixels[left], pixels[right]);
+ if distance > max_distance {
+ max_distance = distance;
+ pair = (left, right);
+ }
+ }
+ }
+
+ let bg = pixels[pair.0];
+ let fg = pixels[pair.1];
+ let mask = pixels
+ .iter()
+ .enumerate()
+ .fold(0_u8, |mask, (index, pixel)| {
+ if color_distance(*pixel, fg) <= color_distance(*pixel, bg) {
+ mask | (1 << index)
+ } else {
+ mask
+ }
+ });
+ let symbol = match mask {
+ 0 => ' ',
+ 1 => '\u{2598}',
+ 2 => '\u{259d}',
+ 3 => '\u{2580}',
+ 4 => '\u{2596}',
+ 5 => '\u{258c}',
+ 6 => '\u{259e}',
+ 7 => '\u{259b}',
+ 8 => '\u{2597}',
+ 9 => '\u{259a}',
+ 10 => '\u{2590}',
+ 11 => '\u{259c}',
+ 12 => '\u{2584}',
+ 13 => '\u{2599}',
+ 14 => '\u{259f}',
+ _ => '\u{2588}',
+ };
+
+ IconCell {
+ symbol,
+ bg_r: bg[0],
+ bg_g: bg[1],
+ bg_b: bg[2],
+ fg_r: fg[0],
+ fg_g: fg[1],
+ fg_b: fg[2],
+ }
+}
+
+fn color_distance(left: [u8; 3], right: [u8; 3]) -> u32 {
+ left.into_iter()
+ .zip(right)
+ .map(|(left, right)| {
+ let delta = i32::from(left) - i32::from(right);
+ (delta * delta) as u32
+ })
+ .sum()
+}
+
+// 6 columns by 3 terminal rows is physically square with the usual 1:2 cell ratio.
+pub(crate) fn fallback_icon() -> Vec> {
+ const MASK: [[bool; 6]; 6] = [
+ [false, true, true, true, true, false],
+ [true, false, false, false, false, true],
+ [false, false, false, true, true, false],
+ [false, false, true, true, false, false],
+ [false, false, false, false, false, false],
+ [false, false, true, true, false, false],
+ ];
+ MASK.chunks_exact(2)
+ .map(|pair| {
+ pair[0]
+ .iter()
+ .zip(pair[1])
+ .map(|(&top, bottom)| fallback_cell(top, bottom))
+ .collect()
+ })
+ .collect()
+}
+
+fn fallback_cell(top: bool, bottom: bool) -> IconCell {
+ let background = if top { 150 } else { 45 };
+ let foreground = if bottom { 150 } else { 45 };
+ IconCell {
+ symbol: '\u{2584}',
+ bg_r: background,
+ bg_g: background,
+ bg_b: background,
+ fg_r: foreground,
+ fg_g: foreground,
+ fg_b: foreground,
+ }
+}
+
+pub(crate) fn fallback_icon_large() -> Vec> {
+ let background = IconCell {
+ symbol: '\u{2584}',
+ bg_r: 50,
+ bg_g: 50,
+ bg_b: 50,
+ fg_r: 50,
+ fg_g: 50,
+ fg_b: 50,
+ };
+ let bottom = IconCell {
+ symbol: '\u{2584}',
+ bg_r: 50,
+ bg_g: 50,
+ bg_b: 50,
+ fg_r: 130,
+ fg_g: 130,
+ fg_b: 130,
+ };
+ let top = IconCell {
+ symbol: '\u{2584}',
+ bg_r: 130,
+ bg_g: 130,
+ bg_b: 130,
+ fg_r: 50,
+ fg_g: 50,
+ fg_b: 50,
+ };
+ vec![
+ vec![
+ background, background, bottom, bottom, bottom, bottom, bottom, bottom, bottom, bottom,
+ background, background,
+ ],
+ vec![
+ background, background, bottom, bottom, bottom, bottom, bottom, bottom, bottom, bottom,
+ background, background,
+ ],
+ vec![
+ background, background, background, background, background, background, top, top, top,
+ top, background, background,
+ ],
+ vec![
+ background, background, background, background, background, background, top, top, top,
+ top, background, background,
+ ],
+ vec![
+ background, background, background, background, top, top, top, top, background,
+ background, background, background,
+ ],
+ vec![
+ background, background, background, background, top, top, top, top, background,
+ background, background, background,
+ ],
+ ]
+}
+
+#[cfg(test)]
+#[path = "../tests/content/icons.rs"]
+mod tests;
diff --git a/src/instance/content/manifest.rs b/src/instance/content/manifest.rs
new file mode 100644
index 0000000..296aca0
--- /dev/null
+++ b/src/instance/content/manifest.rs
@@ -0,0 +1,464 @@
+use std::collections::{BTreeMap, HashMap};
+use std::io::{Read, Seek};
+use std::path::{Path, PathBuf};
+use std::sync::{Arc, LazyLock, Mutex};
+use std::time::{SystemTime, UNIX_EPOCH};
+
+use serde::{Deserialize, Serialize};
+use sha1::Digest as _;
+
+const MANIFEST_VERSION: u32 = 1;
+static MANIFEST_LOCKS: LazyLock>>>> =
+ LazyLock::new(|| Mutex::new(HashMap::new()));
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum ContentKind {
+ Mod,
+ ResourcePack,
+ Shader,
+ DataPack,
+}
+
+impl ContentKind {
+ pub fn directory(self) -> &'static str {
+ match self {
+ Self::Mod => "mods",
+ Self::ResourcePack => "resourcepacks",
+ Self::Shader => "shaderpacks",
+ Self::DataPack => "datapacks",
+ }
+ }
+
+ pub fn unavailable_message(self, loader: crate::instance::ModLoader) -> Option<&'static str> {
+ if loader != crate::instance::ModLoader::Vanilla {
+ return None;
+ }
+ match self {
+ Self::Mod => Some("Vanilla does not support mods."),
+ Self::Shader => Some("Vanilla does not support shaders."),
+ Self::ResourcePack | Self::DataPack => None,
+ }
+ }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct ProviderProject {
+ pub provider: String,
+ pub project_id: String,
+ pub version_id: String,
+}
+
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(tag = "status", rename_all = "snake_case")]
+pub enum Resolution {
+ #[default]
+ Pending,
+ Resolved {
+ project: ProviderProject,
+ },
+ Unmatched {
+ checked_at: i64,
+ providers: Vec,
+ },
+ Ambiguous {
+ candidates: Vec,
+ },
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct FileFingerprint {
+ pub size: u64,
+ pub modified_ns: u128,
+ pub hashes: BTreeMap,
+}
+
+impl FileFingerprint {
+ pub fn hash(&self, algorithm: &str) -> Option<&str> {
+ self.hashes.get(algorithm).map(String::as_str)
+ }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct ContentFileRecord {
+ pub relative_path: PathBuf,
+ pub kind: ContentKind,
+ pub enabled: bool,
+ pub fingerprint: FileFingerprint,
+ #[serde(default)]
+ pub resolution: Resolution,
+ #[serde(default)]
+ pub provider_aliases: Vec,
+ #[serde(default)]
+ pub provider_checks: Vec,
+ #[serde(default)]
+ pub required_dependencies: Vec,
+ #[serde(default)]
+ pub automatic_dependency: bool,
+ #[serde(default)]
+ pub cleanup_eligible: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ContentManifest {
+ pub version: u32,
+ #[serde(default)]
+ pub files: Vec,
+}
+
+impl Default for ContentManifest {
+ fn default() -> Self {
+ Self {
+ version: MANIFEST_VERSION,
+ files: Vec::new(),
+ }
+ }
+}
+
+impl ContentManifest {
+ pub fn load(path: &Path) -> Result {
+ if !path.exists() {
+ return Ok(Self::default());
+ }
+ let bytes = std::fs::read(path)?;
+ let manifest: Self = serde_json::from_slice(&bytes)?;
+ if manifest.version != MANIFEST_VERSION {
+ return Err(ManifestError::UnsupportedVersion(manifest.version));
+ }
+ Ok(manifest)
+ }
+
+ pub fn save(&self, path: &Path) -> Result<(), ManifestError> {
+ let parent = path.parent().ok_or_else(|| {
+ ManifestError::InvalidPath(format!("{} has no parent", path.display()))
+ })?;
+ std::fs::create_dir_all(parent)?;
+ let bytes = serde_json::to_vec_pretty(self)?;
+ crate::storage::write_atomic(path, &bytes)?;
+ Ok(())
+ }
+
+ pub fn update(
+ path: &Path,
+ update: impl FnOnce(&mut Self) -> Result,
+ ) -> Result {
+ let lock = {
+ let mut locks = MANIFEST_LOCKS
+ .lock()
+ .map_err(|_| ManifestError::LockPoisoned)?;
+ locks
+ .entry(path.to_owned())
+ .or_insert_with(|| Arc::new(Mutex::new(())))
+ .clone()
+ };
+ let _guard = lock.lock().map_err(|_| ManifestError::LockPoisoned)?;
+ let mut manifest = Self::load(path)?;
+ let result = update(&mut manifest)?;
+ manifest.save(path)?;
+ Ok(result)
+ }
+
+ pub fn record(&self, relative_path: &Path) -> Option<&ContentFileRecord> {
+ self.files
+ .iter()
+ .find(|record| record.relative_path == relative_path)
+ }
+
+ pub fn upsert(&mut self, record: ContentFileRecord) {
+ if let Some(existing) = self
+ .files
+ .iter_mut()
+ .find(|existing| existing.relative_path == record.relative_path)
+ {
+ *existing = record;
+ } else {
+ self.files.push(record);
+ self.files
+ .sort_by(|left, right| left.relative_path.cmp(&right.relative_path));
+ }
+ }
+
+ pub fn remove(&mut self, relative_path: &Path) {
+ self.files
+ .retain(|record| record.relative_path != relative_path);
+ }
+
+ pub fn rename_record(&mut self, from: &Path, to: &Path, enabled: bool) -> bool {
+ let Some(index) = self
+ .files
+ .iter()
+ .position(|record| record.relative_path == from || record.relative_path == to)
+ else {
+ return false;
+ };
+ let mut record = self.files.remove(index);
+ record.relative_path = to.to_owned();
+ record.enabled = enabled;
+ self.upsert(record);
+ true
+ }
+
+ pub fn resolved_project_path(
+ &self,
+ provider: &str,
+ project_id: &str,
+ minecraft_dir: &Path,
+ ) -> Option {
+ self.files.iter().find_map(|record| {
+ record
+ .matches_project(provider, project_id)
+ .then(|| minecraft_dir.join(&record.relative_path))
+ })
+ }
+
+ pub fn resolved_project_path_under(
+ &self,
+ provider: &str,
+ project_id: &str,
+ minecraft_dir: &Path,
+ directory: &Path,
+ ) -> Option {
+ self.files.iter().find_map(|record| {
+ let path = minecraft_dir.join(&record.relative_path);
+ (record.matches_project(provider, project_id) && path.starts_with(directory))
+ .then_some(path)
+ })
+ }
+
+ pub fn resolved_project_record(
+ &self,
+ provider: &str,
+ project_id: &str,
+ ) -> Option<&ContentFileRecord> {
+ self.files
+ .iter()
+ .find(|record| record.matches_project(provider, project_id))
+ }
+
+ pub fn dependent_paths(&self, relative_path: &Path) -> Vec {
+ let Some(target) = self.record(relative_path) else {
+ return Vec::new();
+ };
+ self.files
+ .iter()
+ .filter(|record| record.relative_path != relative_path)
+ .filter(|record| dependency_applies(target, record))
+ .map(|record| record.relative_path.clone())
+ .collect()
+ }
+
+ pub fn orphaned_dependencies_after_removing(&self, relative_path: &Path) -> Vec {
+ self.orphaned_dependencies_with_removed(std::iter::once(relative_path.to_owned()))
+ }
+
+ pub fn orphaned_dependencies(&self) -> Vec {
+ self.orphaned_dependencies_with_removed(std::iter::empty())
+ }
+
+ fn orphaned_dependencies_with_removed(
+ &self,
+ removed: impl IntoIterator
- ,
+ ) -> Vec {
+ let mut removed = removed
+ .into_iter()
+ .collect::>();
+ let mut orphans = Vec::new();
+ loop {
+ let mut found = false;
+ for candidate in &self.files {
+ if !candidate.automatic_dependency
+ || !candidate.cleanup_eligible
+ || removed.contains(&candidate.relative_path)
+ {
+ continue;
+ }
+ let still_required = self
+ .files
+ .iter()
+ .filter(|record| !removed.contains(&record.relative_path))
+ .any(|record| dependency_applies(candidate, record));
+ if !still_required {
+ removed.insert(candidate.relative_path.clone());
+ orphans.push(candidate.relative_path.clone());
+ found = true;
+ }
+ }
+ if !found {
+ break;
+ }
+ }
+ orphans
+ }
+}
+
+fn dependency_applies(candidate: &ContentFileRecord, dependent: &ContentFileRecord) -> bool {
+ let matches = dependent
+ .required_dependencies
+ .iter()
+ .any(|dependency| candidate.matches_project(&dependency.provider, &dependency.project_id));
+ if !matches || candidate.kind != ContentKind::DataPack {
+ return matches;
+ }
+ datapack_world(&candidate.relative_path) == datapack_world(&dependent.relative_path)
+}
+
+fn datapack_world(path: &Path) -> Option<&std::ffi::OsStr> {
+ let mut components = path.components();
+ (components.next()?.as_os_str() == "saves")
+ .then(|| components.next().map(std::path::Component::as_os_str))
+ .flatten()
+}
+
+impl ContentFileRecord {
+ pub fn resolved_project(&self) -> Option<&ProviderProject> {
+ match &self.resolution {
+ Resolution::Resolved { project } => Some(project),
+ _ => None,
+ }
+ }
+
+ pub fn matches_project(&self, provider: &str, project_id: &str) -> bool {
+ self.resolved_project()
+ .into_iter()
+ .chain(self.provider_aliases.iter())
+ .any(|project| project.provider == provider && project.project_id == project_id)
+ }
+
+ pub fn project_for_provider(
+ &self,
+ provider: &str,
+ project_id: &str,
+ ) -> Option<&ProviderProject> {
+ self.resolved_project()
+ .into_iter()
+ .chain(self.provider_aliases.iter())
+ .find(|project| project.provider == provider && project.project_id == project_id)
+ }
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum ManifestError {
+ #[error("I/O error: {0}")]
+ Io(#[from] std::io::Error),
+ #[error("JSON error: {0}")]
+ Json(#[from] serde_json::Error),
+ #[error("Unsupported content manifest version {0}")]
+ UnsupportedVersion(u32),
+ #[error("Invalid manifest path: {0}")]
+ InvalidPath(String),
+ #[error("Content manifest lock was poisoned")]
+ LockPoisoned,
+}
+
+pub fn fingerprint(path: &Path) -> Result {
+ let metadata = std::fs::metadata(path)?;
+ let modified_ns = metadata
+ .modified()
+ .unwrap_or(SystemTime::UNIX_EPOCH)
+ .duration_since(UNIX_EPOCH)
+ .unwrap_or_default()
+ .as_nanos();
+ let mut file = std::fs::File::open(path)?;
+ let mut sha1 = sha1::Sha1::new();
+ let mut sha512 = sha2::Sha512::new();
+ let mut curseforge_len = 0u32;
+ let mut buffer = [0u8; 64 * 1024];
+ loop {
+ let read = file.read(&mut buffer)?;
+ if read == 0 {
+ break;
+ }
+ sha1.update(&buffer[..read]);
+ sha512.update(&buffer[..read]);
+ curseforge_len = curseforge_len.saturating_add(
+ buffer[..read]
+ .iter()
+ .filter(|byte| !matches!(byte, b'\t' | b'\n' | b'\r' | b' '))
+ .count() as u32,
+ );
+ }
+ file.rewind()?;
+ let hashes = BTreeMap::from([
+ ("sha1".to_owned(), format!("{:x}", sha1.finalize())),
+ ("sha512".to_owned(), format!("{:x}", sha512.finalize())),
+ (
+ "curseforge".to_owned(),
+ curseforge_fingerprint(&mut file, curseforge_len)?.to_string(),
+ ),
+ ]);
+ Ok(FileFingerprint {
+ size: metadata.len(),
+ modified_ns,
+ hashes,
+ })
+}
+
+fn curseforge_fingerprint(reader: &mut impl Read, length: u32) -> std::io::Result {
+ const M: u32 = 0x5bd1e995;
+ let mut hash = 1 ^ length;
+ let mut block = [0u8; 4];
+ let mut block_len = 0;
+ let mut buffer = [0u8; 64 * 1024];
+ loop {
+ let read = reader.read(&mut buffer)?;
+ if read == 0 {
+ break;
+ }
+ for &byte in &buffer[..read] {
+ if matches!(byte, b'\t' | b'\n' | b'\r' | b' ') {
+ continue;
+ }
+ block[block_len] = byte;
+ block_len += 1;
+ if block_len == 4 {
+ let mut value = u32::from_le_bytes(block);
+ value = value.wrapping_mul(M);
+ value ^= value >> 24;
+ value = value.wrapping_mul(M);
+ hash = hash.wrapping_mul(M) ^ value;
+ block_len = 0;
+ }
+ }
+ }
+ match block_len {
+ 3 => {
+ hash ^= u32::from(block[2]) << 16;
+ hash ^= u32::from(block[1]) << 8;
+ hash ^= u32::from(block[0]);
+ hash = hash.wrapping_mul(M);
+ }
+ 2 => {
+ hash ^= u32::from(block[1]) << 8;
+ hash ^= u32::from(block[0]);
+ hash = hash.wrapping_mul(M);
+ }
+ 1 => {
+ hash ^= u32::from(block[0]);
+ hash = hash.wrapping_mul(M);
+ }
+ _ => {}
+ }
+ hash ^= hash >> 13;
+ hash = hash.wrapping_mul(M);
+ hash ^= hash >> 15;
+ Ok(hash)
+}
+
+pub fn fingerprint_metadata(path: &Path) -> Result {
+ let metadata = std::fs::metadata(path)?;
+ let modified_ns = metadata
+ .modified()
+ .unwrap_or(SystemTime::UNIX_EPOCH)
+ .duration_since(UNIX_EPOCH)
+ .unwrap_or_default()
+ .as_nanos();
+ Ok(FileFingerprint {
+ size: metadata.len(),
+ modified_ns,
+ hashes: BTreeMap::new(),
+ })
+}
+
+#[cfg(test)]
+#[path = "../tests/content/manifest.rs"]
+mod tests;
diff --git a/src/instance/content/mod.rs b/src/instance/content/mod.rs
index 6b66eb7..44c479a 100644
--- a/src/instance/content/mod.rs
+++ b/src/instance/content/mod.rs
@@ -1,13 +1,26 @@
// scanning and toggling instance content (mods, resource packs, shaders, worlds).
// minecraft uses a ".disabled" suffix convention for disabled content, so this leans on that heavily.
+pub mod datapacks;
+pub mod dependencies;
+pub mod entry;
+pub mod icons;
+pub mod manifest;
pub mod mods;
+mod packs;
+pub mod provider;
+pub mod reconcile;
pub mod resource_packs;
pub mod shaders;
+pub mod updates;
pub mod worlds;
-pub use mods::scan_one_mod;
-pub use mods::{ContentEntry, scan_mods, toggle_entry};
+pub use datapacks::scan_one_datapack;
+pub(crate) use icons::{
+ IconCell, fallback_icon, fallback_icon_large, make_icon_pixels, make_icon_pixels_from_image,
+ make_icon_quadrants_from_image,
+};
+pub use mods::{scan_mods, scan_one_mod};
pub use resource_packs::{scan_one_resource_pack, scan_resource_packs};
pub use shaders::{scan_one_shader, scan_shaders};
pub use worlds::{scan_one_world, scan_worlds};
diff --git a/src/instance/content/mods.rs b/src/instance/content/mods.rs
index 22e3d4a..63fce9d 100644
--- a/src/instance/content/mods.rs
+++ b/src/instance/content/mods.rs
@@ -1,37 +1,16 @@
-// mod scanning, metadata extraction, and icon rendering for the content list.
+// mod scanning and loader-specific metadata extraction.
// jar files are just zips, so it cracks them open looking for loader-specific
// metadata (fabric.mod.json, quilt.mod.json, mods.toml, mcmod.info) to get
// names, descriptions, and icons. if none of those work, falls back to common
// root-level icon paths (logo.png, icon.png, pack.png) or just the filename.
use std::io::Read;
-use std::path::{Path, PathBuf};
+use std::path::Path;
use serde::Deserialize;
-// a single "pixel" in the terminal icon. uses the unicode half-block trick
-// where each character cell shows two vertical pixels (fg = top, bg = bottom)
-#[derive(Debug, Clone, Copy)]
-pub struct IconCell {
- pub symbol: char,
- pub bg_r: u8,
- pub bg_g: u8,
- pub bg_b: u8,
- pub fg_r: u8,
- pub fg_g: u8,
- pub fg_b: u8,
-}
-
-#[derive(Debug, Clone)]
-pub struct ContentEntry {
- pub file_stem: String,
- pub name: String,
- pub description: String,
- pub enabled: bool,
- pub icon_bytes: Option>,
- pub path: PathBuf,
- pub icon_lines: Option>>,
-}
+use super::entry::ContentEntry;
+use super::icons::{fallback_icon, make_icon_pixels};
#[derive(Deserialize, Default)]
struct FabricModJson {
@@ -40,6 +19,8 @@ struct FabricModJson {
#[serde(default)]
description: String,
#[serde(default)]
+ version: String,
+ #[serde(default)]
icon: serde_json::Value,
}
@@ -72,6 +53,8 @@ struct QuiltModJson {
#[derive(Deserialize, Default)]
struct QuiltLoader {
+ #[serde(default)]
+ version: String,
#[serde(default)]
metadata: QuiltMetadata,
}
@@ -93,7 +76,7 @@ impl QuiltMetadata {
}
pub fn scan_one_mod(path: &Path, file_stem: &str, enabled: bool) -> ContentEntry {
- let (name, description, icon_bytes) = read_mod_metadata(path);
+ let (name, description, version, icon_bytes) = read_mod_metadata(path);
let icon_lines = icon_bytes
.as_ref()
.and_then(|bytes| make_icon_pixels(bytes, 6, 3))
@@ -108,9 +91,18 @@ pub fn scan_one_mod(path: &Path, file_stem: &str, enabled: bool) -> ContentEntry
ContentEntry {
file_stem: file_stem.to_owned(),
name: display_name,
+ source_slug: None,
+ installed_path: None,
+ provider_project: None,
+ world_details: None,
+ title_suffix: None,
+ footer_label: display_version(version),
+ footer_change: None,
description,
enabled,
icon_bytes,
+ provider_icon: false,
+ provider_description: false,
path: path.to_path_buf(),
icon_lines,
}
@@ -119,7 +111,7 @@ pub fn scan_one_mod(path: &Path, file_stem: &str, enabled: bool) -> ContentEntry
pub fn scan_mods(instances_dir: &Path, instance_name: &str) -> Vec {
let mods_dir = instances_dir
.join(instance_name)
- .join(".minecraft")
+ .join(crate::storage::MINECRAFT_DIR_NAME)
.join("mods");
let read_dir = match std::fs::read_dir(&mods_dir) {
@@ -151,12 +143,12 @@ pub fn scan_mods(instances_dir: &Path, instance_name: &str) -> Vec
// checks fabric.mod.json, quilt.mod.json, META-INF/mods.toml (forge),
// META-INF/neoforge.mods.toml, and mcmod.info (legacy forge). if none of
// those yield an icon, falls back to common root-level paths.
-fn read_mod_metadata(jar_path: &Path) -> (String, String, Option>) {
+fn read_mod_metadata(jar_path: &Path) -> (String, String, String, Option>) {
let file = match std::fs::File::open(jar_path) {
Ok(file) => file,
Err(e) => {
tracing::trace!("Failed to open mod JAR {}: {}", jar_path.display(), e);
- return (String::new(), String::new(), None);
+ return (String::new(), String::new(), String::new(), None);
}
};
@@ -168,13 +160,14 @@ fn read_mod_metadata(jar_path: &Path) -> (String, String, Option>) {
jar_path.display(),
e
);
- return (String::new(), String::new(), None);
+ return (String::new(), String::new(), String::new(), None);
}
};
// try each loader's metadata in order. if we get metadata but the
// declared icon path is missing, fall back to common root-level icons.
- type MetaReader = fn(&mut zip::ZipArchive) -> Option<(String, String, String)>;
+ type MetaReader =
+ fn(&mut zip::ZipArchive) -> Option<(String, String, String, String)>;
let readers: [MetaReader; 4] = [
read_fabric_meta,
read_quilt_meta,
@@ -183,7 +176,7 @@ fn read_mod_metadata(jar_path: &Path) -> (String, String, Option>) {
];
for reader in &readers {
- if let Some((name, description, icon_path)) = reader(&mut archive) {
+ if let Some((name, description, version, icon_path)) = reader(&mut archive) {
let icon_path = icon_path.trim_start_matches('/');
let icon = if icon_path.is_empty() {
None
@@ -197,7 +190,7 @@ fn read_mod_metadata(jar_path: &Path) -> (String, String, Option>) {
name,
!icon_path.is_empty()
);
- return (name, description, icon);
+ return (name, description, version, icon);
}
}
@@ -208,7 +201,12 @@ fn read_mod_metadata(jar_path: &Path) -> (String, String, Option>) {
jar_path.display(),
icon_bytes.is_some()
);
- (String::new(), String::new(), icon_bytes)
+ (String::new(), String::new(), String::new(), icon_bytes)
+}
+
+fn display_version(version: String) -> Option {
+ let version = version.trim();
+ (!version.is_empty() && !version.contains("${")).then(|| version.to_owned())
}
fn try_fallback_icons(archive: &mut zip::ZipArchive) -> Option> {
@@ -222,27 +220,28 @@ fn try_fallback_icons(archive: &mut zip::ZipArchive) -> Option,
-) -> Option<(String, String, String)> {
+) -> Option<(String, String, String, String)> {
let mut entry = archive.by_name("fabric.mod.json").ok()?;
let mut raw = String::new();
entry.read_to_string(&mut raw).ok()?;
let sanitized = sanitize_json_strings(&raw);
let data: FabricModJson = serde_json::from_str(&sanitized).ok()?;
let icon = data.icon_path();
- Some((data.name, data.description, icon))
+ Some((data.name, data.description, data.version, icon))
}
fn read_quilt_meta(
archive: &mut zip::ZipArchive,
-) -> Option<(String, String, String)> {
+) -> Option<(String, String, String, String)> {
let mut entry = archive.by_name("quilt.mod.json").ok()?;
let mut raw = String::new();
entry.read_to_string(&mut raw).ok()?;
let sanitized = sanitize_json_strings(&raw);
let data: QuiltModJson = serde_json::from_str(&sanitized).ok()?;
+ let version = data.quilt_loader.version;
let meta = data.quilt_loader.metadata;
let icon = meta.icon_path();
- Some((meta.name, meta.description, icon))
+ Some((meta.name, meta.description, version, icon))
}
// forge (META-INF/mods.toml) and neoforge (META-INF/neoforge.mods.toml)
@@ -252,7 +251,7 @@ fn read_quilt_meta(
// but no [[mods]] section. we still want the icon in that case.
fn read_forge_toml_meta(
archive: &mut zip::ZipArchive,
-) -> Option<(String, String, String)> {
+) -> Option<(String, String, String, String)> {
let raw = read_zip_string(archive, "META-INF/neoforge.mods.toml")
.or_else(|| read_zip_string(archive, "META-INF/mods.toml"))?;
let table: toml::Table = raw.parse().ok()?;
@@ -261,7 +260,7 @@ fn read_forge_toml_meta(
.and_then(|v| v.as_str())
.unwrap_or("")
.to_owned();
- let (name, description) = table
+ let (name, description, version) = table
.get("mods")
.and_then(|v| v.as_array())
.and_then(|a| a.first())
@@ -278,17 +277,22 @@ fn read_forge_toml_meta(
.unwrap_or("")
.trim()
.to_owned();
- (n, d)
+ let version = first
+ .get("version")
+ .and_then(|v| v.as_str())
+ .unwrap_or("")
+ .to_owned();
+ (n, d, version)
})
.unwrap_or_default();
- Some((name, description, logo))
+ Some((name, description, version, logo))
}
// legacy forge mcmod.info is either a bare json array of mod entries
// or an object with a "modList" key wrapping the array
fn read_mcmod_info(
archive: &mut zip::ZipArchive,
-) -> Option<(String, String, String)> {
+) -> Option<(String, String, String, String)> {
let mut entry = archive.by_name("mcmod.info").ok()?;
let mut raw = String::new();
entry.read_to_string(&mut raw).ok()?;
@@ -309,12 +313,17 @@ fn read_mcmod_info(
.and_then(|v| v.as_str())
.unwrap_or("")
.to_owned();
+ let version = first
+ .get("version")
+ .and_then(|v| v.as_str())
+ .unwrap_or("")
+ .to_owned();
let logo = first
.get("logoFile")
.and_then(|v| v.as_str())
.unwrap_or("")
.to_owned();
- Some((name, description, logo))
+ Some((name, description, version, logo))
}
fn read_zip_string(archive: &mut zip::ZipArchive, path: &str) -> Option {
@@ -368,619 +377,6 @@ fn read_zip_bytes(archive: &mut zip::ZipArchive, path: &str) -> O
Some(bytes)
}
-// downscales an icon to terminal resolution. resizes to height*2 because each
-// terminal cell renders two vertical pixels using half-block characters (▀)
-pub(crate) fn make_icon_pixels(
- bytes: &[u8],
- width: u16,
- height: u16,
-) -> Option>> {
- let img = image::load_from_memory(bytes).ok()?;
- Some(make_icon_pixels_from_image(&img, width, height))
-}
-
-pub(crate) fn make_icon_pixels_from_image(
- img: &image::DynamicImage,
- width: u16,
- height: u16,
-) -> Vec> {
- let resized = img.resize_exact(
- u32::from(width),
- u32::from(height) * 2,
- image::imageops::FilterType::Nearest,
- );
- let rgb = resized.to_rgb8();
-
- let mut rows = Vec::new();
- for row in 0..height {
- let mut cols = Vec::new();
- for col in 0..width {
- let top_y = u32::from(row) * 2;
- let bottom_y = (u32::from(row) * 2 + 1).min(rgb.height().saturating_sub(1));
- let [tr, tg, tb] = rgb.get_pixel(u32::from(col), top_y).0;
- let [br, bg, bb] = rgb.get_pixel(u32::from(col), bottom_y).0;
- cols.push(IconCell {
- symbol: '\u{2584}',
- bg_r: br,
- bg_g: bg,
- bg_b: bb,
- fg_r: tr,
- fg_g: tg,
- fg_b: tb,
- });
- }
- rows.push(cols);
- }
-
- rows
-}
-
-pub(crate) fn make_icon_quadrants_from_image(
- img: &image::DynamicImage,
- width: u16,
- height: u16,
-) -> Vec> {
- let resized = img
- .resize_exact(
- u32::from(width) * 2,
- u32::from(height) * 2,
- image::imageops::FilterType::Lanczos3,
- )
- .to_rgb8();
-
- (0..height)
- .map(|row| {
- (0..width)
- .map(|col| {
- let x = u32::from(col) * 2;
- let y = u32::from(row) * 2;
- let pixels = [
- resized.get_pixel(x, y).0,
- resized.get_pixel(x + 1, y).0,
- resized.get_pixel(x, y + 1).0,
- resized.get_pixel(x + 1, y + 1).0,
- ];
- quadrant_cell(pixels)
- })
- .collect()
- })
- .collect()
-}
-
-fn quadrant_cell(pixels: [[u8; 3]; 4]) -> IconCell {
- let mut pair = (0, 0);
- let mut max_distance = 0;
- for left in 0..pixels.len() {
- for right in (left + 1)..pixels.len() {
- let distance = color_distance(pixels[left], pixels[right]);
- if distance > max_distance {
- max_distance = distance;
- pair = (left, right);
- }
- }
- }
-
- let bg = pixels[pair.0];
- let fg = pixels[pair.1];
- let mask = pixels
- .iter()
- .enumerate()
- .fold(0_u8, |mask, (index, pixel)| {
- if color_distance(*pixel, fg) <= color_distance(*pixel, bg) {
- mask | (1 << index)
- } else {
- mask
- }
- });
- let symbol = match mask {
- 0 => ' ',
- 1 => '\u{2598}',
- 2 => '\u{259d}',
- 3 => '\u{2580}',
- 4 => '\u{2596}',
- 5 => '\u{258c}',
- 6 => '\u{259e}',
- 7 => '\u{259b}',
- 8 => '\u{2597}',
- 9 => '\u{259a}',
- 10 => '\u{2590}',
- 11 => '\u{259c}',
- 12 => '\u{2584}',
- 13 => '\u{2599}',
- 14 => '\u{259f}',
- _ => '\u{2588}',
- };
-
- IconCell {
- symbol,
- bg_r: bg[0],
- bg_g: bg[1],
- bg_b: bg[2],
- fg_r: fg[0],
- fg_g: fg[1],
- fg_b: fg[2],
- }
-}
-
-fn color_distance(left: [u8; 3], right: [u8; 3]) -> u32 {
- left.into_iter()
- .zip(right)
- .map(|(left, right)| {
- let delta = i32::from(left) - i32::from(right);
- (delta * delta) as u32
- })
- .sum()
-}
-
-// 6x3 fallback icon showing a "?" pattern for mods without icons.
-pub(super) fn fallback_icon() -> Vec> {
- let b = IconCell {
- symbol: '\u{2584}',
- bg_r: 50,
- bg_g: 50,
- bg_b: 50,
- fg_r: 50,
- fg_g: 50,
- fg_b: 50,
- };
- let tb = IconCell {
- symbol: '\u{2584}',
- bg_r: 50,
- bg_g: 50,
- bg_b: 50,
- fg_r: 130,
- fg_g: 130,
- fg_b: 130,
- };
- let bt = IconCell {
- symbol: '\u{2584}',
- bg_r: 130,
- bg_g: 130,
- bg_b: 130,
- fg_r: 50,
- fg_g: 50,
- fg_b: 50,
- };
- vec![
- vec![b, tb, tb, tb, tb, b],
- vec![b, b, b, bt, bt, b],
- vec![b, b, bt, bt, b, b],
- ]
-}
-
-// 12x6 fallback icon showing a "?" pattern for worlds without icons.
-pub(super) fn fallback_icon_large() -> Vec> {
- let b = IconCell {
- symbol: '\u{2584}',
- bg_r: 50,
- bg_g: 50,
- bg_b: 50,
- fg_r: 50,
- fg_g: 50,
- fg_b: 50,
- };
- let tb = IconCell {
- symbol: '\u{2584}',
- bg_r: 50,
- bg_g: 50,
- bg_b: 50,
- fg_r: 130,
- fg_g: 130,
- fg_b: 130,
- };
- let bt = IconCell {
- symbol: '\u{2584}',
- bg_r: 130,
- bg_g: 130,
- bg_b: 130,
- fg_r: 50,
- fg_g: 50,
- fg_b: 50,
- };
- vec![
- vec![b, b, tb, tb, tb, tb, tb, tb, tb, tb, b, b],
- vec![b, b, tb, tb, tb, tb, tb, tb, tb, tb, b, b],
- vec![b, b, b, b, b, b, bt, bt, bt, bt, b, b],
- vec![b, b, b, b, b, b, bt, bt, bt, bt, b, b],
- vec![b, b, b, b, bt, bt, bt, bt, b, b, b, b],
- vec![b, b, b, b, bt, bt, bt, bt, b, b, b, b],
- ]
-}
-
-// enable/disable by renaming the file with/without ".disabled" suffix.
-// the minecraft way, apparently.
-pub fn toggle_entry(entry: &ContentEntry) -> Result<(), std::io::Error> {
- let file_name = match entry.path.file_name().and_then(|name| name.to_str()) {
- Some(name) => name,
- None => return Ok(()),
- };
-
- let new_name = if entry.enabled {
- format!("{file_name}.disabled")
- } else {
- file_name.trim_end_matches(".disabled").to_string()
- };
-
- let mut new_path = entry.path.clone();
- new_path.set_file_name(new_name);
- std::fs::rename(&entry.path, new_path)
-}
-
#[cfg(test)]
-mod tests {
- use super::*;
-
- #[test]
- fn quadrant_raster_has_requested_dimensions() {
- let image = image::DynamicImage::ImageRgb8(image::RgbImage::from_pixel(
- 2,
- 2,
- image::Rgb([12, 34, 56]),
- ));
- let rows = make_icon_quadrants_from_image(&image, 7, 3);
-
- assert_eq!(rows.len(), 3);
- assert!(rows.iter().all(|row| row.len() == 7));
- assert!(rows.iter().flatten().all(|cell| cell.symbol == '\u{2588}'));
- }
-
- fn setup_mods_dir(tmp: &Path, instance: &str) -> PathBuf {
- let dir = tmp.join(instance).join(".minecraft").join("mods");
- std::fs::create_dir_all(&dir).unwrap();
- dir
- }
-
- #[test]
- fn scan_mods_empty_dir() {
- let tmp = tempfile::tempdir().unwrap();
- setup_mods_dir(tmp.path(), "inst");
- let mods = scan_mods(tmp.path(), "inst");
- assert!(mods.is_empty());
- }
-
- #[test]
- fn scan_mods_missing_dir_returns_empty() {
- let tmp = tempfile::tempdir().unwrap();
- let mods = scan_mods(tmp.path(), "ghost");
- assert!(mods.is_empty());
- }
-
- #[test]
- fn scan_mods_finds_jar_files() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- std::fs::write(dir.join("cool-mod.jar"), b"PK\x03\x04").unwrap();
- std::fs::write(dir.join("other-mod.jar.disabled"), b"PK\x03\x04").unwrap();
- let mods = scan_mods(tmp.path(), "inst");
- assert_eq!(mods.len(), 2);
- }
-
- #[test]
- fn scan_mods_enabled_disabled_flags() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- std::fs::write(dir.join("active.jar"), b"PK\x03\x04").unwrap();
- std::fs::write(dir.join("inactive.jar.disabled"), b"PK\x03\x04").unwrap();
- let mods = scan_mods(tmp.path(), "inst");
- let active = mods.iter().find(|m| m.file_stem == "active").unwrap();
- let inactive = mods.iter().find(|m| m.file_stem == "inactive").unwrap();
- assert!(active.enabled);
- assert!(!inactive.enabled);
- }
-
- #[test]
- fn scan_mods_ignores_non_jar() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- std::fs::write(dir.join("readme.txt"), "not a mod").unwrap();
- std::fs::write(dir.join("config.json"), "{}").unwrap();
- std::fs::write(dir.join("real.jar"), b"PK\x03\x04").unwrap();
- let mods = scan_mods(tmp.path(), "inst");
- assert_eq!(mods.len(), 1);
- }
-
- #[test]
- fn scan_mods_sorted_case_insensitive() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- std::fs::write(dir.join("Zebra.jar"), b"PK\x03\x04").unwrap();
- std::fs::write(dir.join("alpha.jar"), b"PK\x03\x04").unwrap();
- std::fs::write(dir.join("Beta.jar"), b"PK\x03\x04").unwrap();
- let mods = scan_mods(tmp.path(), "inst");
- let names: Vec<&str> = mods.iter().map(|m| m.name.as_str()).collect();
- assert_eq!(names, vec!["alpha", "Beta", "Zebra"]);
- }
-
- #[test]
- fn toggle_entry_enable() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- let disabled_path = dir.join("mymod.jar.disabled");
- std::fs::write(&disabled_path, b"PK\x03\x04").unwrap();
-
- let entry = ContentEntry {
- file_stem: "mymod".to_string(),
- name: "mymod".to_string(),
- description: String::new(),
- enabled: false,
- icon_bytes: None,
- path: disabled_path.clone(),
- icon_lines: None,
- };
-
- toggle_entry(&entry).unwrap();
- assert!(!disabled_path.exists());
- assert!(dir.join("mymod.jar").exists());
- }
-
- use std::io::Write as _;
-
- fn make_jar(dir: &Path, name: &str, entries: &[(&str, &[u8])]) {
- let path = dir.join(name);
- let file = std::fs::File::create(&path).unwrap();
- let mut zip = zip::ZipWriter::new(file);
- let options: zip::write::FileOptions<()> =
- zip::write::FileOptions::default().compression_method(zip::CompressionMethod::Stored);
- for (entry_name, data) in entries {
- zip.start_file(*entry_name, options).unwrap();
- zip.write_all(data).unwrap();
- }
- zip.finish().unwrap();
- }
-
- #[test]
- fn scan_mods_reads_fabric_metadata() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- let meta = r#"{"name":"Fabric Mod","description":"A fabric mod","icon":"icon.png"}"#;
- make_jar(
- &dir,
- "fabric-mod.jar",
- &[("fabric.mod.json", meta.as_bytes())],
- );
- let mods = scan_mods(tmp.path(), "inst");
- assert_eq!(mods.len(), 1);
- assert_eq!(mods[0].name, "Fabric Mod");
- assert_eq!(mods[0].description, "A fabric mod");
- }
-
- #[test]
- fn scan_mods_reads_quilt_metadata() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- let meta =
- r#"{"quilt_loader":{"metadata":{"name":"Quilt Mod","description":"A quilt mod"}}}"#;
- make_jar(
- &dir,
- "quilt-mod.jar",
- &[("quilt.mod.json", meta.as_bytes())],
- );
- let mods = scan_mods(tmp.path(), "inst");
- assert_eq!(mods.len(), 1);
- assert_eq!(mods[0].name, "Quilt Mod");
- assert_eq!(mods[0].description, "A quilt mod");
- }
-
- #[test]
- fn scan_mods_reads_forge_toml_metadata() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- let meta = r#"
-logoFile = "logo.png"
-
-[[mods]]
-displayName = "Forge Mod"
-description = "A forge mod"
-"#;
- make_jar(
- &dir,
- "forge-mod.jar",
- &[("META-INF/mods.toml", meta.as_bytes())],
- );
- let mods = scan_mods(tmp.path(), "inst");
- assert_eq!(mods.len(), 1);
- assert_eq!(mods[0].name, "Forge Mod");
- assert_eq!(mods[0].description, "A forge mod");
- }
-
- #[test]
- fn scan_mods_reads_neoforge_toml_metadata() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- let meta = r#"
-logoFile = "logo.png"
-
-[[mods]]
-displayName = "NeoForge Mod"
-description = "A neoforge mod"
-"#;
- make_jar(
- &dir,
- "neoforge-mod.jar",
- &[("META-INF/neoforge.mods.toml", meta.as_bytes())],
- );
- let mods = scan_mods(tmp.path(), "inst");
- assert_eq!(mods.len(), 1);
- assert_eq!(mods[0].name, "NeoForge Mod");
- assert_eq!(mods[0].description, "A neoforge mod");
- }
-
- #[test]
- fn scan_mods_reads_mcmod_info_array() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- let meta = r#"[{"name":"Legacy Mod","description":"An old forge mod"}]"#;
- make_jar(&dir, "legacy-mod.jar", &[("mcmod.info", meta.as_bytes())]);
- let mods = scan_mods(tmp.path(), "inst");
- assert_eq!(mods.len(), 1);
- assert_eq!(mods[0].name, "Legacy Mod");
- assert_eq!(mods[0].description, "An old forge mod");
- }
-
- #[test]
- fn scan_mods_reads_mcmod_info_modlist() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- let meta = r#"{"modList":[{"name":"Wrapped Mod","description":"Has modList wrapper"}]}"#;
- make_jar(&dir, "wrapped-mod.jar", &[("mcmod.info", meta.as_bytes())]);
- let mods = scan_mods(tmp.path(), "inst");
- assert_eq!(mods.len(), 1);
- assert_eq!(mods[0].name, "Wrapped Mod");
- assert_eq!(mods[0].description, "Has modList wrapper");
- }
-
- #[test]
- fn scan_mods_prefers_fabric_over_forge() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- let fabric = r#"{"name":"Fabric Name","description":"fabric desc"}"#;
- let forge = "[[mods]]\ndisplayName = \"Forge Name\"\ndescription = \"forge desc\"\n";
- make_jar(
- &dir,
- "multi.jar",
- &[
- ("fabric.mod.json", fabric.as_bytes()),
- ("META-INF/mods.toml", forge.as_bytes()),
- ],
- );
- let mods = scan_mods(tmp.path(), "inst");
- assert_eq!(mods[0].name, "Fabric Name");
- }
-
- #[test]
- fn scan_mods_prefers_quilt_over_forge() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- let quilt = r#"{"quilt_loader":{"id":"x","version":"1","metadata":{"name":"Quilt Name","description":"quilt desc"}}}"#;
- let forge = "[[mods]]\ndisplayName = \"Forge Name\"\ndescription = \"forge desc\"\n";
- make_jar(
- &dir,
- "quilt-over-forge.jar",
- &[
- ("quilt.mod.json", quilt.as_bytes()),
- ("META-INF/mods.toml", forge.as_bytes()),
- ],
- );
- let mods = scan_mods(tmp.path(), "inst");
- assert_eq!(mods[0].name, "Quilt Name");
- }
-
- #[test]
- fn scan_mods_prefers_forge_toml_over_mcmod_info() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- let forge = "[[mods]]\ndisplayName = \"Forge Name\"\ndescription = \"forge desc\"\n";
- let mcmod = r#"[{"modid":"legacy","name":"Legacy Name","description":"legacy desc"}]"#;
- make_jar(
- &dir,
- "forge-over-legacy.jar",
- &[
- ("META-INF/mods.toml", forge.as_bytes()),
- ("mcmod.info", mcmod.as_bytes()),
- ],
- );
- let mods = scan_mods(tmp.path(), "inst");
- assert_eq!(mods[0].name, "Forge Name");
- }
-
- // when both neoforge.mods.toml and mods.toml exist in the same jar (the
- // shape a dual-format mod might ship), the neoforge one wins because
- // read_forge_toml_meta tries it first via .or_else.
- #[test]
- fn scan_mods_prefers_neoforge_toml_over_forge_toml() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- let neoforge =
- "[[mods]]\ndisplayName = \"NeoForge Name\"\ndescription = \"neoforge desc\"\n";
- let forge = "[[mods]]\ndisplayName = \"Forge Name\"\ndescription = \"forge desc\"\n";
- make_jar(
- &dir,
- "neoforge-over-forge.jar",
- &[
- ("META-INF/neoforge.mods.toml", neoforge.as_bytes()),
- ("META-INF/mods.toml", forge.as_bytes()),
- ],
- );
- let mods = scan_mods(tmp.path(), "inst");
- assert_eq!(mods[0].name, "NeoForge Name");
- }
-
- // a mods.toml with logoFile but no [[mods]] array (e.g. a dependency-only
- // library jar) should still surface as a scanned mod with empty name +
- // description but with the icon resolved.
- #[test]
- fn scan_mods_reads_mods_toml_without_mods_array() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- let mods_toml = "logoFile = \"icon.png\"\n";
- let png_bytes = b"\x89PNG fake icon";
- make_jar(
- &dir,
- "lib-only.jar",
- &[
- ("META-INF/mods.toml", mods_toml.as_bytes()),
- ("icon.png", png_bytes),
- ],
- );
- let mods = scan_mods(tmp.path(), "inst");
- assert_eq!(mods.len(), 1);
- // file-stem fallback when metadata name is empty - covered here
- // because no other test exercises an empty-name + present-logo combo.
- assert_eq!(mods[0].name, "lib-only");
- assert_eq!(mods[0].icon_bytes.as_deref(), Some(png_bytes.as_slice()));
- }
-
- #[test]
- fn scan_mods_fallback_icon_paths() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- let png_bytes = b"\x89PNG fake";
- make_jar(&dir, "no-meta.jar", &[("logo.png", png_bytes)]);
- let mods = scan_mods(tmp.path(), "inst");
- assert_eq!(mods.len(), 1);
- assert_eq!(mods[0].name, "no-meta");
- assert_eq!(mods[0].icon_bytes.as_deref(), Some(png_bytes.as_slice()));
- }
-
- #[test]
- fn icon_path_from_value_string() {
- let val = serde_json::json!("assets/icon.png");
- assert_eq!(icon_path_from_value(&val), "assets/icon.png");
- }
-
- #[test]
- fn icon_path_from_value_map() {
- // serde_json::Map is a BTreeMap, so iteration is sorted by key.
- // "128" sorts before "64" lexicographically, so the first value wins.
- let val = serde_json::json!({"64": "icon_64.png", "128": "icon_128.png"});
- assert_eq!(icon_path_from_value(&val), "icon_128.png");
- }
-
- #[test]
- fn icon_path_from_value_null() {
- let val = serde_json::Value::Null;
- assert_eq!(icon_path_from_value(&val), "");
- }
-
- #[test]
- fn toggle_entry_disable() {
- let tmp = tempfile::tempdir().unwrap();
- let dir = setup_mods_dir(tmp.path(), "inst");
- let enabled_path = dir.join("mymod.jar");
- std::fs::write(&enabled_path, b"PK\x03\x04").unwrap();
-
- let entry = ContentEntry {
- file_stem: "mymod".to_string(),
- name: "mymod".to_string(),
- description: String::new(),
- enabled: true,
- icon_bytes: None,
- path: enabled_path.clone(),
- icon_lines: None,
- };
-
- toggle_entry(&entry).unwrap();
- assert!(!enabled_path.exists());
- assert!(dir.join("mymod.jar.disabled").exists());
- }
-}
+#[path = "../tests/content/mods.rs"]
+mod tests;
diff --git a/src/instance/content/packs.rs b/src/instance/content/packs.rs
new file mode 100644
index 0000000..12a7de4
--- /dev/null
+++ b/src/instance/content/packs.rs
@@ -0,0 +1,126 @@
+// shared pack.mcmeta scanning for resource packs and shader packs.
+
+use std::path::Path;
+
+use serde::Deserialize;
+
+use super::entry::ContentEntry;
+use super::{fallback_icon, make_icon_pixels};
+
+#[derive(Deserialize, Default)]
+struct PackMcMeta {
+ #[serde(default)]
+ pack: PackInfo,
+}
+
+#[derive(Deserialize, Default)]
+struct PackInfo {
+ #[serde(default)]
+ description: serde_json::Value,
+}
+
+pub(crate) fn extract_description(value: &serde_json::Value) -> String {
+ match value {
+ serde_json::Value::String(text) => text.clone(),
+ serde_json::Value::Object(object) => object
+ .get("text")
+ .and_then(|value| value.as_str())
+ .unwrap_or("")
+ .to_owned(),
+ serde_json::Value::Array(values) => values
+ .iter()
+ .filter_map(|value| match value {
+ serde_json::Value::String(text) => Some(text.as_str()),
+ serde_json::Value::Object(object) => {
+ object.get("text").and_then(|value| value.as_str())
+ }
+ _ => None,
+ })
+ .collect::>()
+ .join(""),
+ _ => String::new(),
+ }
+}
+
+pub(crate) fn scan_one_pack(path: &Path, file_stem: &str, enabled: bool) -> ContentEntry {
+ let (description, icon_bytes) = if path.is_dir() {
+ read_metadata_from_dir(path)
+ } else {
+ read_metadata_from_zip(path)
+ };
+ let icon_lines = icon_bytes
+ .as_ref()
+ .and_then(|bytes| make_icon_pixels(bytes, 6, 3))
+ .or_else(|| Some(fallback_icon()));
+
+ ContentEntry {
+ file_stem: file_stem.to_owned(),
+ name: file_stem.to_owned(),
+ source_slug: None,
+ installed_path: None,
+ provider_project: None,
+ world_details: None,
+ title_suffix: None,
+ footer_label: None,
+ footer_change: None,
+ description,
+ enabled,
+ icon_bytes,
+ provider_icon: false,
+ provider_description: false,
+ path: path.to_path_buf(),
+ icon_lines,
+ }
+}
+
+pub(crate) fn scan_packs(
+ instances_dir: &Path,
+ instance_name: &str,
+ directory: &str,
+) -> Vec {
+ let directory = instances_dir
+ .join(instance_name)
+ .join(crate::storage::MINECRAFT_DIR_NAME)
+ .join(directory);
+ let Ok(entries) = std::fs::read_dir(directory) else {
+ return Vec::new();
+ };
+ let mut packs = entries
+ .flatten()
+ .filter_map(|entry| {
+ let path = entry.path();
+ let file_name = path.file_name()?.to_str()?;
+ let (enabled, file_stem) = if path.is_dir() {
+ super::parse_enabled_stem_dir(file_name)
+ } else {
+ super::parse_enabled_stem(file_name, ".zip")?
+ };
+ Some(scan_one_pack(&path, &file_stem, enabled))
+ })
+ .collect::>();
+ packs.sort_by_cached_key(|entry| entry.name.to_lowercase());
+ packs
+}
+
+fn read_metadata_from_zip(path: &Path) -> (String, Option>) {
+ let Some(mut archive) = super::open_zip(path) else {
+ return (String::new(), None);
+ };
+ let description = archive
+ .by_name("pack.mcmeta")
+ .ok()
+ .and_then(|entry| serde_json::from_reader::<_, PackMcMeta>(entry).ok())
+ .map(|meta| extract_description(&meta.pack.description))
+ .unwrap_or_default();
+ let icon_bytes = super::read_icon_from_zip(&mut archive);
+ (description, icon_bytes)
+}
+
+fn read_metadata_from_dir(path: &Path) -> (String, Option>) {
+ let description = std::fs::read_to_string(path.join("pack.mcmeta"))
+ .ok()
+ .and_then(|content| serde_json::from_str::(&content).ok())
+ .map(|meta| extract_description(&meta.pack.description))
+ .unwrap_or_default();
+ (description, std::fs::read(path.join("pack.png")).ok())
+}
diff --git a/src/instance/content/provider.rs b/src/instance/content/provider.rs
new file mode 100644
index 0000000..8fc72ee
--- /dev/null
+++ b/src/instance/content/provider.rs
@@ -0,0 +1,425 @@
+use std::collections::HashMap;
+
+use async_trait::async_trait;
+
+use crate::instance::content::manifest::{ContentKind, FileFingerprint, ProviderProject};
+use crate::instance::{InstanceConfig, ModLoader};
+use crate::net::modrinth::{DiscoveryResults, VersionInfo};
+
+#[derive(Debug, Clone)]
+pub struct FingerprintQuery {
+ pub key: String,
+ pub kind: ContentKind,
+ pub fingerprint: FileFingerprint,
+}
+
+#[derive(Debug, Clone)]
+pub struct ResolvedFile {
+ pub key: String,
+ pub project: ProviderProject,
+}
+
+#[async_trait]
+pub trait ContentProvider: Send + Sync {
+ fn id(&self) -> &'static str;
+
+ async fn search(
+ &self,
+ kind: ContentKind,
+ query: &str,
+ instance: &InstanceConfig,
+ offset: usize,
+ limit: usize,
+ ) -> Result;
+
+ async fn search_modpacks(
+ &self,
+ query: &str,
+ offset: usize,
+ limit: usize,
+ ) -> Result;
+
+ async fn resolve_files(
+ &self,
+ files: &[FingerprintQuery],
+ ) -> Result, crate::net::NetError>;
+
+ async fn project(
+ &self,
+ project_id: &str,
+ ) -> Result;
+
+ async fn compatible_versions(
+ &self,
+ project_id: &str,
+ kind: ContentKind,
+ game_version: &str,
+ loader: ModLoader,
+ ) -> Result, crate::net::NetError>;
+
+ async fn version(&self, version_id: &str) -> Result;
+
+ async fn icon(&self, url: &str) -> Result, crate::net::NetError>;
+
+ async fn download_version(
+ &self,
+ version: &VersionInfo,
+ destination: &std::path::Path,
+ installed_path: Option<&std::path::Path>,
+ ) -> Result;
+}
+
+#[derive(Clone)]
+pub struct ModrinthProvider {
+ client: crate::net::HttpClient,
+}
+
+impl ModrinthProvider {
+ pub fn new(client: crate::net::HttpClient) -> Self {
+ Self { client }
+ }
+}
+
+#[async_trait]
+impl ContentProvider for ModrinthProvider {
+ fn id(&self) -> &'static str {
+ "modrinth"
+ }
+
+ async fn search(
+ &self,
+ kind: ContentKind,
+ query: &str,
+ instance: &InstanceConfig,
+ offset: usize,
+ limit: usize,
+ ) -> Result {
+ crate::net::modrinth::search_discovery(
+ &self.client,
+ kind,
+ query,
+ &instance.game_version,
+ instance.loader,
+ offset,
+ limit,
+ )
+ .await
+ }
+
+ async fn search_modpacks(
+ &self,
+ query: &str,
+ offset: usize,
+ limit: usize,
+ ) -> Result {
+ crate::net::modrinth::search_modpacks(&self.client, query, offset, limit).await
+ }
+
+ async fn resolve_files(
+ &self,
+ files: &[FingerprintQuery],
+ ) -> Result, crate::net::NetError> {
+ let mut by_hash = HashMap::>::new();
+ for file in files {
+ if let Some(hash) = file.fingerprint.hash("sha512") {
+ by_hash
+ .entry(hash.to_owned())
+ .or_default()
+ .push(file.key.clone());
+ }
+ }
+ let hashes = by_hash.keys().cloned().collect::>();
+ let versions =
+ crate::net::modrinth::resolve_version_files(&self.client, &hashes, "sha512").await?;
+ Ok(versions
+ .into_iter()
+ .flat_map(|(hash, version)| {
+ let keys = by_hash.get(&hash).cloned().unwrap_or_default();
+ if version.project_id.is_empty() {
+ return Vec::new();
+ }
+ keys.into_iter()
+ .map(|key| ResolvedFile {
+ key,
+ project: ProviderProject {
+ provider: self.id().to_owned(),
+ project_id: version.project_id.clone(),
+ version_id: version.id.clone(),
+ },
+ })
+ .collect()
+ })
+ .collect())
+ }
+
+ async fn project(
+ &self,
+ project_id: &str,
+ ) -> Result {
+ crate::net::modrinth::fetch_project(&self.client, project_id).await
+ }
+
+ async fn compatible_versions(
+ &self,
+ project_id: &str,
+ kind: ContentKind,
+ game_version: &str,
+ loader: ModLoader,
+ ) -> Result, crate::net::NetError> {
+ crate::net::modrinth::fetch_content_versions(
+ &self.client,
+ project_id,
+ kind,
+ game_version,
+ loader,
+ )
+ .await
+ }
+
+ async fn version(&self, version_id: &str) -> Result {
+ crate::net::modrinth::fetch_version(&self.client, version_id).await
+ }
+
+ async fn icon(&self, url: &str) -> Result, crate::net::NetError> {
+ self.client
+ .get_bytes_limited(url, crate::net::MAX_PROVIDER_ASSET_BYTES)
+ .await
+ }
+
+ async fn download_version(
+ &self,
+ version: &VersionInfo,
+ destination: &std::path::Path,
+ installed_path: Option<&std::path::Path>,
+ ) -> Result {
+ if let Some(installed_path) = installed_path {
+ crate::net::modrinth::download_version_file_for_update(
+ &self.client,
+ version,
+ destination,
+ installed_path,
+ )
+ .await
+ } else {
+ crate::net::modrinth::download_version_file(&self.client, version, destination).await
+ }
+ }
+}
+
+#[derive(Clone)]
+pub struct CurseForgeProvider {
+ client: crate::net::HttpClient,
+ api_key: String,
+}
+
+impl CurseForgeProvider {
+ pub fn new(client: crate::net::HttpClient, api_key: impl Into) -> Self {
+ Self {
+ client,
+ api_key: api_key.into(),
+ }
+ }
+}
+
+#[async_trait]
+impl ContentProvider for CurseForgeProvider {
+ fn id(&self) -> &'static str {
+ "curseforge"
+ }
+
+ async fn search(
+ &self,
+ kind: ContentKind,
+ query: &str,
+ instance: &InstanceConfig,
+ offset: usize,
+ limit: usize,
+ ) -> Result {
+ crate::net::curseforge::search_discovery(
+ &self.client,
+ &self.api_key,
+ kind,
+ query,
+ &instance.game_version,
+ instance.loader,
+ offset,
+ limit,
+ )
+ .await
+ }
+
+ async fn search_modpacks(
+ &self,
+ query: &str,
+ offset: usize,
+ limit: usize,
+ ) -> Result {
+ crate::net::curseforge::search_modpacks(&self.client, &self.api_key, query, offset, limit)
+ .await
+ }
+
+ async fn resolve_files(
+ &self,
+ files: &[FingerprintQuery],
+ ) -> Result, crate::net::NetError> {
+ let mut by_fingerprint = HashMap::>::new();
+ for file in files {
+ if let Some(fingerprint) = file
+ .fingerprint
+ .hash("curseforge")
+ .and_then(|value| value.parse().ok())
+ {
+ by_fingerprint
+ .entry(fingerprint)
+ .or_default()
+ .push(file.key.clone());
+ }
+ }
+ let fingerprints = by_fingerprint.keys().copied().collect::>();
+ let matches = crate::net::curseforge::resolve_fingerprints(
+ &self.client,
+ &self.api_key,
+ &fingerprints,
+ )
+ .await?;
+ Ok(matches
+ .into_iter()
+ .flat_map(|(fingerprint, project_id, version_id)| {
+ by_fingerprint
+ .get(&fingerprint)
+ .cloned()
+ .unwrap_or_default()
+ .into_iter()
+ .map(move |key| ResolvedFile {
+ key,
+ project: ProviderProject {
+ provider: self.id().to_owned(),
+ project_id: project_id.clone(),
+ version_id: version_id.clone(),
+ },
+ })
+ })
+ .collect())
+ }
+
+ async fn project(
+ &self,
+ project_id: &str,
+ ) -> Result {
+ crate::net::curseforge::fetch_project(&self.client, &self.api_key, project_id).await
+ }
+
+ async fn compatible_versions(
+ &self,
+ project_id: &str,
+ kind: ContentKind,
+ game_version: &str,
+ loader: ModLoader,
+ ) -> Result, crate::net::NetError> {
+ crate::net::curseforge::fetch_versions(
+ &self.client,
+ &self.api_key,
+ project_id,
+ game_version,
+ (kind == ContentKind::Mod).then_some(loader),
+ )
+ .await
+ }
+
+ async fn version(&self, version_id: &str) -> Result {
+ let id = version_id.parse::().map_err(|_| {
+ crate::net::NetError::Parse(format!("Invalid CurseForge file id '{version_id}'"))
+ })?;
+ crate::net::curseforge::fetch_file_versions(&self.client, &self.api_key, &[id])
+ .await?
+ .into_iter()
+ .next()
+ .ok_or_else(|| {
+ crate::net::NetError::Parse(format!("CurseForge file '{version_id}' was not found"))
+ })
+ }
+
+ async fn icon(&self, url: &str) -> Result, crate::net::NetError> {
+ self.client
+ .get_bytes_limited(url, crate::net::MAX_PROVIDER_ASSET_BYTES)
+ .await
+ }
+
+ async fn download_version(
+ &self,
+ version: &VersionInfo,
+ destination: &std::path::Path,
+ installed_path: Option<&std::path::Path>,
+ ) -> Result {
+ let mut version = version.clone();
+ crate::net::curseforge::ensure_download_url(&self.client, &self.api_key, &mut version)
+ .await?;
+ if let Some(installed_path) = installed_path {
+ crate::net::modrinth::download_version_file_for_update(
+ &self.client,
+ &version,
+ destination,
+ installed_path,
+ )
+ .await
+ } else {
+ crate::net::modrinth::download_version_file(&self.client, &version, destination).await
+ }
+ }
+}
+
+pub struct ProviderRegistry {
+ providers: Vec>,
+}
+
+pub(crate) fn has_newer_compatible_version(
+ versions: &[VersionInfo],
+ installed_version_id: &str,
+) -> bool {
+ versions
+ .iter()
+ .position(|version| version.id == installed_version_id)
+ .is_some_and(|position| position > 0)
+}
+
+impl ProviderRegistry {
+ pub(crate) fn new(providers: Vec>) -> Self {
+ Self { providers }
+ }
+
+ pub fn modrinth(client: crate::net::HttpClient) -> Self {
+ Self::new(vec![Box::new(ModrinthProvider::new(client))])
+ }
+
+ pub fn configured(client: crate::net::HttpClient) -> Self {
+ let mut providers: Vec> =
+ vec![Box::new(ModrinthProvider::new(client.clone()))];
+ if let Some(api_key) = crate::net::curseforge::api_key() {
+ providers.push(Box::new(CurseForgeProvider::new(client, api_key)));
+ }
+ Self::new(providers)
+ }
+
+ pub fn providers(&self) -> &[Box] {
+ &self.providers
+ }
+
+ pub fn preferred(&self, id: &str) -> Option<&dyn ContentProvider> {
+ self.providers
+ .iter()
+ .find(|provider| provider.id() == id)
+ .map(Box::as_ref)
+ .or_else(|| self.providers.first().map(Box::as_ref))
+ }
+
+ pub fn get(&self, id: &str) -> Option<&dyn ContentProvider> {
+ self.providers
+ .iter()
+ .find(|provider| provider.id() == id)
+ .map(Box::as_ref)
+ }
+}
+
+#[cfg(test)]
+#[path = "../tests/content/provider.rs"]
+mod tests;
diff --git a/src/instance/content/reconcile.rs b/src/instance/content/reconcile.rs
new file mode 100644
index 0000000..c71832f
--- /dev/null
+++ b/src/instance/content/reconcile.rs
@@ -0,0 +1,673 @@
+use std::collections::{HashMap, HashSet, VecDeque};
+use std::path::{Path, PathBuf};
+use std::sync::{Arc, LazyLock, Mutex};
+use std::time::{SystemTime, UNIX_EPOCH};
+
+use crate::feedback::progress::{ProgressTask, ProgressTaskHandle};
+use crate::instance::InstanceConfig;
+use crate::instance::content::manifest::{
+ ContentFileRecord, ContentKind, ContentManifest, FileFingerprint, ProviderProject, Resolution,
+ fingerprint, fingerprint_metadata,
+};
+use crate::instance::content::provider::{FingerprintQuery, ProviderRegistry};
+use crate::storage::InstancePaths;
+
+#[derive(Debug)]
+pub struct ReconcileResult {
+ pub instance_name: String,
+ pub instance_created: chrono::DateTime,
+ pub manifest: ContentManifest,
+ pub error: Option,
+}
+
+pub static PENDING_RECONCILIATIONS: LazyLock>>> =
+ LazyLock::new(|| Arc::new(Mutex::new(Vec::new())));
+
+#[derive(Clone)]
+struct ReconcileJob {
+ instance: InstanceConfig,
+ instances_dir: PathBuf,
+ client: crate::net::HttpClient,
+}
+
+#[derive(Default)]
+struct ReconcileCoordinator {
+ queue: VecDeque,
+ scheduled: HashSet<(String, chrono::DateTime)>,
+ rerun: HashSet<(String, chrono::DateTime)>,
+ worker_running: bool,
+}
+
+impl ReconcileCoordinator {
+ fn enqueue(&mut self, job: ReconcileJob, rerun_if_scheduled: bool) -> bool {
+ let instance = (job.instance.name.clone(), job.instance.created);
+ if !self.scheduled.insert(instance.clone()) {
+ if rerun_if_scheduled {
+ self.rerun.insert(instance);
+ }
+ return false;
+ }
+ self.queue.push_back(job);
+ if self.worker_running {
+ false
+ } else {
+ self.worker_running = true;
+ true
+ }
+ }
+}
+
+static RECONCILE_COORDINATOR: LazyLock> =
+ LazyLock::new(|| Mutex::new(ReconcileCoordinator::default()));
+
+pub fn spawn(instance: InstanceConfig, instances_dir: PathBuf, client: crate::net::HttpClient) {
+ schedule(instance, instances_dir, client, false);
+}
+
+pub fn spawn_after_change(
+ instance: InstanceConfig,
+ instances_dir: PathBuf,
+ client: crate::net::HttpClient,
+) {
+ schedule(instance, instances_dir, client, true);
+}
+
+fn schedule(
+ instance: InstanceConfig,
+ instances_dir: PathBuf,
+ client: crate::net::HttpClient,
+ rerun_if_scheduled: bool,
+) {
+ let start_worker = {
+ let Ok(mut coordinator) = RECONCILE_COORDINATOR.lock() else {
+ return;
+ };
+ coordinator.enqueue(
+ ReconcileJob {
+ instance,
+ instances_dir,
+ client,
+ },
+ rerun_if_scheduled,
+ )
+ };
+ if start_worker {
+ tokio::spawn(reconcile_worker());
+ }
+}
+
+async fn reconcile_worker() {
+ let task = ProgressTask::start("Preparing content index");
+ loop {
+ let job = {
+ let Ok(mut coordinator) = RECONCILE_COORDINATOR.lock() else {
+ task.finish();
+ return;
+ };
+ match coordinator.queue.pop_front() {
+ Some(job) => job,
+ None => {
+ coordinator.worker_running = false;
+ task.finish();
+ return;
+ }
+ }
+ };
+ let instance = (job.instance.name.clone(), job.instance.created);
+ let rerun_job = job.clone();
+ let result = reconcile(job, &task).await;
+ if let Ok(mut results) = PENDING_RECONCILIATIONS.lock() {
+ results.retain(|pending| {
+ (pending.instance_name.as_str(), pending.instance_created)
+ != (instance.0.as_str(), instance.1)
+ });
+ results.push(result);
+ }
+ if let Ok(mut coordinator) = RECONCILE_COORDINATOR.lock() {
+ if coordinator.rerun.remove(&instance) {
+ coordinator.queue.push_back(rerun_job);
+ } else {
+ coordinator.scheduled.remove(&instance);
+ }
+ }
+ crate::feedback::request_redraw();
+ }
+}
+
+async fn reconcile(job: ReconcileJob, task: &ProgressTask) -> ReconcileResult {
+ let ReconcileJob {
+ instance,
+ instances_dir,
+ client,
+ } = job;
+ let instance_name = instance.name;
+ let instance_created = instance.created;
+ task.set_action(format!("Checking content for {instance_name}"));
+ task.set_sub_action("Reading saved content index");
+ task.set_progress(0, 1);
+ let paths = InstancePaths::new(instances_dir.join(&instance_name));
+ let manifest_path = paths.content_manifest();
+ let minecraft_dir = paths.minecraft();
+ let retry_hours = crate::config::SETTINGS.content.unmatched_retry_hours;
+ let max_fingerprint_size_mib = crate::config::SETTINGS.content.max_fingerprint_size_mib;
+ let inventory_progress = task.handle();
+ let inventory_minecraft_dir = minecraft_dir.clone();
+ let inventory = tokio::task::spawn_blocking(move || {
+ reconcile_inventory(
+ &manifest_path,
+ &inventory_minecraft_dir,
+ retry_hours,
+ max_fingerprint_size_mib,
+ &inventory_progress,
+ )
+ .map(|result| (result, manifest_path))
+ })
+ .await;
+
+ match inventory {
+ Ok(Ok((mut inventory, manifest_path))) => {
+ let registry = ProviderRegistry::configured(client);
+ task.set_action(format!("Identifying content for {instance_name}"));
+ task.set_sub_action(format!("{} file(s) need matching", inventory.queries.len()));
+ if !inventory.queries.is_empty() {
+ task.set_progress(0, inventory.queries.len() as u64);
+ }
+ let resolution_result =
+ resolve_queries(®istry, &inventory.queries, &mut inventory.manifest).await;
+ if !inventory.queries.is_empty() {
+ task.set_progress(
+ inventory.queries.len() as u64,
+ inventory.queries.len() as u64,
+ );
+ }
+ match resolution_result {
+ Ok(()) => match save_reconciled_manifest(
+ &manifest_path,
+ &minecraft_dir,
+ inventory.manifest,
+ ) {
+ Ok(manifest) => ReconcileResult {
+ instance_name,
+ instance_created,
+ manifest,
+ error: None,
+ },
+ Err(error) => ReconcileResult {
+ instance_name,
+ instance_created,
+ manifest: ContentManifest::default(),
+ error: Some(error.to_string()),
+ },
+ },
+ Err(error) => {
+ let saved = save_reconciled_manifest(
+ &manifest_path,
+ &minecraft_dir,
+ inventory.manifest,
+ );
+ ReconcileResult {
+ instance_name,
+ instance_created,
+ manifest: saved.unwrap_or_default(),
+ error: Some(error.to_string()),
+ }
+ }
+ }
+ }
+ Ok(Err(error)) => ReconcileResult {
+ instance_name,
+ instance_created,
+ manifest: ContentManifest::default(),
+ error: Some(error.to_string()),
+ },
+ Err(error) => ReconcileResult {
+ instance_name,
+ instance_created,
+ manifest: ContentManifest::default(),
+ error: Some(error.to_string()),
+ },
+ }
+}
+
+fn save_reconciled_manifest(
+ manifest_path: &Path,
+ minecraft_dir: &Path,
+ reconciled: ContentManifest,
+) -> Result {
+ let reconciled_paths = reconciled
+ .files
+ .iter()
+ .map(|record| record.relative_path.clone())
+ .collect::>();
+ ContentManifest::update(manifest_path, |current| {
+ current.files.retain(|record| {
+ reconciled_paths.contains(&record.relative_path)
+ || minecraft_dir.join(&record.relative_path).exists()
+ });
+ for record in reconciled.files {
+ let keep_resolved = current
+ .record(&record.relative_path)
+ .is_some_and(|existing| {
+ existing.fingerprint == record.fingerprint
+ && existing.resolved_project().is_some_and(|current| {
+ record.resolved_project().is_none_or(|resolved| {
+ current.provider != resolved.provider
+ || current.project_id != resolved.project_id
+ })
+ })
+ });
+ if !keep_resolved {
+ current.upsert(record);
+ }
+ }
+ Ok(current.clone())
+ })
+}
+
+struct Inventory {
+ manifest: ContentManifest,
+ queries: Vec,
+}
+
+trait InventoryProgress {
+ fn set_sub_action(&self, text: &str);
+ fn set_progress(&self, current: u64, total: u64);
+}
+
+impl InventoryProgress for ProgressTaskHandle {
+ fn set_sub_action(&self, text: &str) {
+ ProgressTaskHandle::set_sub_action(self, text);
+ }
+
+ fn set_progress(&self, current: u64, total: u64) {
+ ProgressTaskHandle::set_progress(self, current, total);
+ }
+}
+
+fn reconcile_inventory(
+ manifest_path: &Path,
+ minecraft_dir: &Path,
+ unmatched_retry_hours: u64,
+ max_fingerprint_size_mib: u64,
+ task: &impl InventoryProgress,
+) -> Result> {
+ let previous = ContentManifest::load(manifest_path)?;
+ let files = content_files(minecraft_dir)?;
+ let file_count = files.len() as u64;
+ if file_count == 0 {
+ task.set_sub_action("No local content files");
+ task.set_progress(1, 1);
+ } else {
+ task.set_progress(0, file_count);
+ }
+ let now = chrono::Utc::now().timestamp();
+ let retry_seconds = unmatched_retry_hours.saturating_mul(60 * 60) as i64;
+ let mut manifest = ContentManifest::default();
+ let mut queries = Vec::new();
+
+ for (index, (kind, path)) in files.into_iter().enumerate() {
+ task.set_sub_action(
+ path.file_name()
+ .and_then(|name| name.to_str())
+ .unwrap_or("content"),
+ );
+ let relative_path = path.strip_prefix(minecraft_dir)?.to_path_buf();
+ let enabled = !path
+ .file_name()
+ .and_then(|name| name.to_str())
+ .is_some_and(|name| name.ends_with(".disabled"));
+ let metadata = std::fs::metadata(&path)?;
+ let is_directory = metadata.is_dir();
+ let metadata_fingerprint = if is_directory {
+ directory_fingerprint_metadata(&path)?
+ } else {
+ fingerprint_metadata(&path)?
+ };
+ let modified_ns = metadata_fingerprint.modified_ns;
+ let existing = previous.record(&relative_path);
+ let unchanged = existing.is_some_and(|record| {
+ record.fingerprint.size == metadata_fingerprint.size
+ && record.fingerprint.modified_ns == modified_ns
+ });
+ let oversized = !is_directory
+ && max_fingerprint_size_mib > 0
+ && metadata.len() > max_fingerprint_size_mib.saturating_mul(1024 * 1024);
+ let mut record = if unchanged {
+ existing.cloned().unwrap()
+ } else if is_directory {
+ ContentFileRecord {
+ relative_path: relative_path.clone(),
+ kind,
+ enabled,
+ fingerprint: metadata_fingerprint,
+ resolution: Resolution::Unmatched {
+ checked_at: now,
+ providers: Vec::new(),
+ },
+ provider_aliases: Vec::new(),
+ provider_checks: Vec::new(),
+ required_dependencies: Vec::new(),
+ automatic_dependency: false,
+ cleanup_eligible: false,
+ }
+ } else if oversized {
+ tracing::debug!(
+ "Skipping automatic provider matching for {} ({} bytes exceeds {} MiB limit)",
+ path.display(),
+ metadata.len(),
+ max_fingerprint_size_mib
+ );
+ ContentFileRecord {
+ relative_path: relative_path.clone(),
+ kind,
+ enabled,
+ fingerprint: fingerprint_metadata(&path)?,
+ resolution: Resolution::Unmatched {
+ checked_at: now,
+ providers: Vec::new(),
+ },
+ provider_aliases: Vec::new(),
+ provider_checks: Vec::new(),
+ required_dependencies: Vec::new(),
+ automatic_dependency: false,
+ cleanup_eligible: false,
+ }
+ } else {
+ ContentFileRecord {
+ relative_path: relative_path.clone(),
+ kind,
+ enabled,
+ fingerprint: fingerprint(&path)?,
+ resolution: Resolution::Pending,
+ provider_aliases: Vec::new(),
+ provider_checks: Vec::new(),
+ required_dependencies: Vec::new(),
+ automatic_dependency: false,
+ cleanup_eligible: false,
+ }
+ };
+ record.kind = kind;
+ record.enabled = enabled;
+
+ if oversized && matches!(record.resolution, Resolution::Pending) {
+ record.resolution = Resolution::Unmatched {
+ checked_at: now,
+ providers: Vec::new(),
+ };
+ }
+ let provider_unchecked = ["modrinth", "curseforge"].into_iter().any(|provider| {
+ crate::config::SETTINGS
+ .content
+ .discovery_provider_enabled(provider)
+ && provider_was_not_checked(&record, provider)
+ });
+ if !is_directory
+ && !oversized
+ && provider_unchecked
+ && record.fingerprint.hash("curseforge").is_none()
+ {
+ record.fingerprint = fingerprint(&path)?;
+ }
+ let should_query = !is_directory
+ && !oversized
+ && (provider_unchecked
+ || match &record.resolution {
+ Resolution::Pending => true,
+ Resolution::Unmatched { checked_at, .. } => {
+ now.saturating_sub(*checked_at) >= retry_seconds
+ }
+ Resolution::Resolved { .. } | Resolution::Ambiguous { .. } => false,
+ });
+ if should_query {
+ if !matches!(&record.resolution, Resolution::Resolved { .. }) {
+ record.resolution = Resolution::Pending;
+ }
+ queries.push(FingerprintQuery {
+ key: relative_path.to_string_lossy().into_owned(),
+ kind,
+ fingerprint: record.fingerprint.clone(),
+ });
+ }
+ manifest.upsert(record);
+ task.set_progress(index as u64 + 1, file_count);
+ }
+ Ok(Inventory { manifest, queries })
+}
+
+fn provider_was_not_checked(record: &ContentFileRecord, provider: &str) -> bool {
+ let identified = record
+ .resolved_project()
+ .into_iter()
+ .chain(record.provider_aliases.iter())
+ .any(|project| project.provider == provider);
+ let checked_as_unmatched = matches!(
+ &record.resolution,
+ Resolution::Unmatched { providers, .. }
+ if providers.iter().any(|checked| checked == provider)
+ );
+ !identified
+ && !checked_as_unmatched
+ && !record
+ .provider_checks
+ .iter()
+ .any(|checked| checked == provider)
+}
+
+async fn resolve_queries(
+ registry: &ProviderRegistry,
+ queries: &[FingerprintQuery],
+ manifest: &mut ContentManifest,
+) -> Result<(), crate::net::NetError> {
+ if queries.is_empty() {
+ return Ok(());
+ }
+ let mut matches: HashMap> = HashMap::new();
+ let mut checked = Vec::new();
+ let mut last_error = None;
+ for provider in registry.providers() {
+ let provider_id = provider.id();
+ match tokio::time::timeout(
+ std::time::Duration::from_secs(10),
+ provider.resolve_files(queries),
+ )
+ .await
+ {
+ Ok(Ok(resolved_files)) => {
+ checked.push(provider_id.to_owned());
+ for resolved in resolved_files {
+ matches
+ .entry(resolved.key)
+ .or_default()
+ .push(resolved.project);
+ }
+ }
+ Ok(Err(error)) => {
+ tracing::warn!(
+ "Skipping {provider_id} content matching after provider error: {error}"
+ );
+ last_error = Some(error.to_string());
+ }
+ Err(_) => {
+ tracing::warn!(
+ "Skipping {provider_id} content matching after the 10 second timeout"
+ );
+ last_error = Some(format!("{provider_id} content matching timed out"));
+ }
+ }
+ }
+ if checked.is_empty() {
+ return Err(crate::net::NetError::TaskFailed(last_error.unwrap_or_else(
+ || "No content providers are available".to_owned(),
+ )));
+ }
+ let query_keys = queries
+ .iter()
+ .map(|query| query.key.as_str())
+ .collect::>();
+ let checked_at = chrono::Utc::now().timestamp();
+ for record in &mut manifest.files {
+ let key = record.relative_path.to_string_lossy();
+ if !query_keys.contains(key.as_ref()) {
+ continue;
+ }
+ let installed = record.resolved_project().cloned();
+ let mut candidates = matches.remove(key.as_ref()).unwrap_or_default();
+ for alias in &record.provider_aliases {
+ if !candidates.iter().any(|candidate| {
+ candidate.provider == alias.provider && candidate.project_id == alias.project_id
+ }) {
+ candidates.push(alias.clone());
+ }
+ }
+ let (resolution, aliases) = if let Some(installed) = installed {
+ let project = candidates
+ .iter()
+ .find(|candidate| {
+ candidate.provider == installed.provider
+ && candidate.project_id == installed.project_id
+ })
+ .cloned()
+ .unwrap_or(installed);
+ candidates.retain(|candidate| {
+ candidate.provider != project.provider || candidate.project_id != project.project_id
+ });
+ (Resolution::Resolved { project }, candidates)
+ } else {
+ match candidates.as_slice() {
+ [] => (
+ Resolution::Unmatched {
+ checked_at,
+ providers: checked.clone(),
+ },
+ Vec::new(),
+ ),
+ [project] => (
+ Resolution::Resolved {
+ project: project.clone(),
+ },
+ Vec::new(),
+ ),
+ _ if !crate::config::SETTINGS.content.ask_on_provider_conflict => {
+ let preferred = crate::config::SETTINGS.content.preferred_provider();
+ if let Some(project) = candidates
+ .iter()
+ .find(|project| project.provider == preferred)
+ {
+ (
+ Resolution::Resolved {
+ project: project.clone(),
+ },
+ candidates
+ .iter()
+ .filter(|candidate| *candidate != project)
+ .cloned()
+ .collect(),
+ )
+ } else {
+ (Resolution::Ambiguous { candidates }, Vec::new())
+ }
+ }
+ _ => (Resolution::Ambiguous { candidates }, Vec::new()),
+ }
+ };
+ record.resolution = resolution;
+ record.provider_aliases = aliases;
+ for provider in &checked {
+ if !record.provider_checks.contains(provider) {
+ record.provider_checks.push(provider.clone());
+ }
+ }
+ }
+ Ok(())
+}
+
+fn content_files(minecraft_dir: &Path) -> std::io::Result> {
+ let mut files = Vec::new();
+ for kind in [
+ ContentKind::Mod,
+ ContentKind::ResourcePack,
+ ContentKind::Shader,
+ ] {
+ let directory = minecraft_dir.join(kind.directory());
+ let Ok(entries) = std::fs::read_dir(directory) else {
+ continue;
+ };
+ for entry in entries.flatten() {
+ let path = entry.path();
+ if supported_content_path(kind, &path) {
+ files.push((kind, path));
+ }
+ }
+ }
+ if let Ok(worlds) = std::fs::read_dir(minecraft_dir.join("saves")) {
+ for world in worlds.flatten().filter(|entry| entry.path().is_dir()) {
+ let Ok(entries) = std::fs::read_dir(world.path().join("datapacks")) else {
+ continue;
+ };
+ for entry in entries.flatten() {
+ let path = entry.path();
+ if supported_content_path(ContentKind::DataPack, &path) {
+ files.push((ContentKind::DataPack, path));
+ }
+ }
+ }
+ }
+ files.sort_by(|left, right| left.1.cmp(&right.1));
+ Ok(files)
+}
+
+fn supported_content_path(kind: ContentKind, path: &Path) -> bool {
+ if path.is_dir() {
+ return matches!(
+ kind,
+ ContentKind::ResourcePack | ContentKind::Shader | ContentKind::DataPack
+ );
+ }
+ if !path.is_file() {
+ return false;
+ }
+ let Some(name) = path.file_name().and_then(|name| name.to_str()) else {
+ return false;
+ };
+ match kind {
+ ContentKind::Mod => name.ends_with(".jar") || name.ends_with(".jar.disabled"),
+ ContentKind::ResourcePack | ContentKind::Shader | ContentKind::DataPack => {
+ name.ends_with(".zip") || name.ends_with(".zip.disabled")
+ }
+ }
+}
+
+fn directory_fingerprint_metadata(path: &Path) -> Result {
+ fn accumulate(path: &Path, size: &mut u64, modified_ns: &mut u128) -> std::io::Result<()> {
+ for entry in std::fs::read_dir(path)? {
+ let entry = entry?;
+ let metadata = entry.metadata()?;
+ let modified = metadata
+ .modified()
+ .unwrap_or(SystemTime::UNIX_EPOCH)
+ .duration_since(UNIX_EPOCH)
+ .unwrap_or_default()
+ .as_nanos();
+ *modified_ns = (*modified_ns).max(modified);
+ if metadata.is_dir() {
+ accumulate(&entry.path(), size, modified_ns)?;
+ } else if metadata.is_file() {
+ *size = size.saturating_add(metadata.len());
+ }
+ }
+ Ok(())
+ }
+
+ let mut size = 0;
+ let mut modified_ns = 0;
+ accumulate(path, &mut size, &mut modified_ns)?;
+ Ok(FileFingerprint {
+ size,
+ modified_ns,
+ hashes: Default::default(),
+ })
+}
+
+#[cfg(test)]
+#[path = "../tests/content/reconcile.rs"]
+mod tests;
diff --git a/src/instance/content/resource_packs.rs b/src/instance/content/resource_packs.rs
index a308426..4818571 100644
--- a/src/instance/content/resource_packs.rs
+++ b/src/instance/content/resource_packs.rs
@@ -1,164 +1,17 @@
-// resource pack scanning. packs can be either .zip files or plain directories,
-// and metadata lives in pack.mcmeta (which mojang decided should have like 3
-// different ways to encode a description, because why not)
+// resource pack scanner backed by the shared pack.mcmeta reader.
use std::path::Path;
-use serde::Deserialize;
-
-use super::mods::{ContentEntry, make_icon_pixels};
-
-#[derive(Deserialize, Default)]
-pub(crate) struct PackMcMeta {
- #[serde(default)]
- pub pack: PackInfo,
-}
-
-#[derive(Deserialize, Default)]
-pub(crate) struct PackInfo {
- #[serde(default)]
- pub description: serde_json::Value,
-}
-
-// description can be a plain string, a chat component object with "text",
-// or an array mixing both. thanks mojang, very cool.
-pub(crate) fn extract_description(value: &serde_json::Value) -> String {
- match value {
- serde_json::Value::String(s) => s.clone(),
- serde_json::Value::Object(obj) => obj
- .get("text")
- .and_then(|v| v.as_str())
- .unwrap_or("")
- .to_string(),
- serde_json::Value::Array(arr) => arr
- .iter()
- .filter_map(|v| match v {
- serde_json::Value::String(s) => Some(s.as_str()),
- serde_json::Value::Object(obj) => obj.get("text").and_then(|v| v.as_str()),
- _ => None,
- })
- .collect::>()
- .join(""),
- _ => String::new(),
- }
-}
+use super::entry::ContentEntry;
pub fn scan_one_resource_pack(path: &Path, file_stem: &str, enabled: bool) -> ContentEntry {
- let is_dir = path.is_dir();
- let (name, description, icon_bytes) = if is_dir {
- read_pack_metadata_from_dir(path)
- } else {
- read_pack_metadata_from_zip(path)
- };
-
- let icon_lines = icon_bytes
- .as_ref()
- .and_then(|bytes| make_icon_pixels(bytes, 6, 3))
- .or_else(|| Some(super::mods::fallback_icon()));
-
- let display_name = if name.is_empty() {
- file_stem.to_owned()
- } else {
- name
- };
-
- ContentEntry {
- file_stem: file_stem.to_owned(),
- name: display_name,
- description,
- enabled,
- icon_bytes,
- path: path.to_path_buf(),
- icon_lines,
- }
+ super::packs::scan_one_pack(path, file_stem, enabled)
}
pub fn scan_resource_packs(instances_dir: &Path, instance_name: &str) -> Vec {
- let packs_dir = instances_dir
- .join(instance_name)
- .join(".minecraft")
- .join("resourcepacks");
-
- let read_dir = match std::fs::read_dir(&packs_dir) {
- Ok(rd) => rd,
- Err(_) => return Vec::new(),
- };
-
- let mut entries = Vec::new();
-
- for entry in read_dir.flatten() {
- let path = entry.path();
- let file_name = match path.file_name().and_then(|n| n.to_str()) {
- Some(n) => n.to_string(),
- None => continue,
- };
-
- let (enabled, file_stem) = if path.is_dir() {
- super::parse_enabled_stem_dir(&file_name)
- } else if let Some(pair) = super::parse_enabled_stem(&file_name, ".zip") {
- pair
- } else {
- continue;
- };
-
- entries.push(scan_one_resource_pack(&path, &file_stem, enabled));
- }
-
- entries.sort_by_cached_key(|e| e.name.to_lowercase());
- entries
-}
-
-fn read_pack_metadata_from_zip(zip_path: &Path) -> (String, String, Option>) {
- let Some(mut archive) = super::open_zip(zip_path) else {
- return (String::new(), String::new(), None);
- };
- let description = read_pack_description(&mut archive);
- let icon_bytes = super::read_icon_from_zip(&mut archive);
- (String::new(), description, icon_bytes)
-}
-
-fn read_pack_description(archive: &mut zip::ZipArchive) -> String {
- archive
- .by_name("pack.mcmeta")
- .ok()
- .and_then(|entry| serde_json::from_reader::<_, PackMcMeta>(entry).ok())
- .map(|meta| extract_description(&meta.pack.description))
- .unwrap_or_default()
-}
-
-fn read_pack_metadata_from_dir(dir: &Path) -> (String, String, Option>) {
- let description = std::fs::read_to_string(dir.join("pack.mcmeta"))
- .ok()
- .and_then(|content| serde_json::from_str::(&content).ok())
- .map(|meta| extract_description(&meta.pack.description))
- .unwrap_or_default();
-
- let icon_bytes = std::fs::read(dir.join("pack.png")).ok();
-
- (String::new(), description, icon_bytes)
+ super::packs::scan_packs(instances_dir, instance_name, "resourcepacks")
}
#[cfg(test)]
-mod tests {
- use super::*;
- use serde_json::json;
-
- // every case exercises a distinct match arm in extract_description.
- // string + object{text} + object{no text} + array(string) +
- // array(object) + array(mixed) + array(empty) + null + number + bool.
- // mutating any arm to fall through to "" would fail at least one case.
- #[rstest::rstest]
- #[case::string(json!("Simple pack"), "Simple pack")]
- #[case::object_with_text(json!({"text": "Hello world"}), "Hello world")]
- #[case::object_without_text(json!({"color": "red"}), "")]
- #[case::array_of_strings(json!(["Hello", " ", "world"]), "Hello world")]
- #[case::array_of_objects(json!([{"text": "A"}, {"text": "B"}]), "AB")]
- #[case::mixed_array(json!(["Prefix ", {"text": "suffix"}]), "Prefix suffix")]
- #[case::empty_array(json!([]), "")]
- #[case::null(serde_json::Value::Null, "")]
- #[case::number(json!(42), "")]
- #[case::bool(json!(true), "")]
- fn extract_description_handles(#[case] input: serde_json::Value, #[case] expected: &str) {
- assert_eq!(extract_description(&input), expected);
- }
-}
+#[path = "../tests/content/resource_packs.rs"]
+mod tests;
diff --git a/src/instance/content/shaders.rs b/src/instance/content/shaders.rs
index 0492085..0434d99 100644
--- a/src/instance/content/shaders.rs
+++ b/src/instance/content/shaders.rs
@@ -1,91 +1,13 @@
-// shader pack scanning. structurally almost identical to resource packs
-// (zip or dir, pack.mcmeta for metadata, pack.png for icon)
+// shader pack scanner backed by the shared pack.mcmeta reader.
use std::path::Path;
-use super::mods::{ContentEntry, make_icon_pixels};
-use super::resource_packs::{PackMcMeta, extract_description};
+use super::entry::ContentEntry;
pub fn scan_one_shader(path: &Path, file_stem: &str, enabled: bool) -> ContentEntry {
- let is_dir = path.is_dir();
- let (description, icon_bytes) = if is_dir {
- read_shader_metadata_from_dir(path)
- } else {
- read_shader_metadata_from_zip(path)
- };
-
- let icon_lines = icon_bytes
- .as_ref()
- .and_then(|bytes| make_icon_pixels(bytes, 6, 3));
-
- ContentEntry {
- file_stem: file_stem.to_owned(),
- name: file_stem.to_owned(),
- description,
- enabled,
- icon_bytes,
- path: path.to_path_buf(),
- icon_lines,
- }
+ super::packs::scan_one_pack(path, file_stem, enabled)
}
pub fn scan_shaders(instances_dir: &Path, instance_name: &str) -> Vec {
- let shaders_dir = instances_dir
- .join(instance_name)
- .join(".minecraft")
- .join("shaderpacks");
-
- let read_dir = match std::fs::read_dir(&shaders_dir) {
- Ok(rd) => rd,
- Err(_) => return Vec::new(),
- };
-
- let mut entries = Vec::new();
-
- for entry in read_dir.flatten() {
- let path = entry.path();
- let file_name = match path.file_name().and_then(|n| n.to_str()) {
- Some(n) => n.to_string(),
- None => continue,
- };
-
- let (enabled, file_stem) = if path.is_dir() {
- super::parse_enabled_stem_dir(&file_name)
- } else if let Some(pair) = super::parse_enabled_stem(&file_name, ".zip") {
- pair
- } else {
- continue;
- };
-
- entries.push(scan_one_shader(&path, &file_stem, enabled));
- }
-
- entries.sort_by_cached_key(|e| e.name.to_lowercase());
- entries
-}
-
-fn read_shader_metadata_from_zip(zip_path: &Path) -> (String, Option>) {
- let Some(mut archive) = super::open_zip(zip_path) else {
- return (String::new(), None);
- };
- let description = archive
- .by_name("pack.mcmeta")
- .ok()
- .and_then(|entry| serde_json::from_reader::<_, PackMcMeta>(entry).ok())
- .map(|meta| extract_description(&meta.pack.description))
- .unwrap_or_default();
- let icon_bytes = super::read_icon_from_zip(&mut archive);
- (description, icon_bytes)
-}
-
-fn read_shader_metadata_from_dir(dir: &Path) -> (String, Option>) {
- let description = std::fs::read_to_string(dir.join("pack.mcmeta"))
- .ok()
- .and_then(|content| serde_json::from_str::(&content).ok())
- .map(|meta| extract_description(&meta.pack.description))
- .unwrap_or_default();
-
- let icon_bytes = std::fs::read(dir.join("pack.png")).ok();
-
- (description, icon_bytes)
+ super::packs::scan_packs(instances_dir, instance_name, "shaderpacks")
}
diff --git a/src/instance/content/updates.rs b/src/instance/content/updates.rs
new file mode 100644
index 0000000..ed3bcd0
--- /dev/null
+++ b/src/instance/content/updates.rs
@@ -0,0 +1,488 @@
+use std::sync::{Arc, LazyLock, Mutex};
+
+use serde::{Deserialize, Serialize};
+
+use crate::instance::{ContentKind, ContentManifest, InstanceConfig, ModLoader, ProviderProject};
+use crate::net::modrinth::VersionInfo;
+
+use super::dependencies::{DependencyPlan, InstallRoot};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct AvailableUpdate {
+ pub installed: ProviderProject,
+ #[serde(default)]
+ pub current: Option,
+ pub target: VersionInfo,
+ pub kind: ContentKind,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct UpdateSnapshot {
+ pub game_version: String,
+ pub loader: ModLoader,
+ #[serde(default)]
+ pub inventory: Vec,
+ pub updates: Vec,
+ pub failures: Vec,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct UpdateCheckFailure {
+ pub installed: ProviderProject,
+ pub kind: ContentKind,
+ pub reason: String,
+}
+
+pub struct PendingUpdateSnapshot {
+ pub instance_name: String,
+ pub instance_created: chrono::DateTime,
+ pub snapshot: UpdateSnapshot,
+}
+
+#[derive(Debug, Clone)]
+pub struct UpdateRequest {
+ pub title: String,
+ pub installed_path: std::path::PathBuf,
+ pub target_world: Option,
+ pub update: AvailableUpdate,
+}
+
+#[derive(Debug, Clone)]
+pub struct PlannedRootUpdate {
+ pub title: String,
+ pub installed_path: std::path::PathBuf,
+ pub current_version: String,
+ pub target: VersionInfo,
+}
+
+#[derive(Debug, Clone)]
+pub struct UpdateConflict {
+ pub title: String,
+ pub installed_path: std::path::PathBuf,
+ pub reason: String,
+}
+
+#[derive(Debug, Clone)]
+pub struct BulkUpdatePlan {
+ pub dependency_plan: DependencyPlan,
+ pub roots: Vec,
+ pub conflicts: Vec,
+}
+
+pub static PENDING_UPDATE_SNAPSHOTS: LazyLock>>> =
+ LazyLock::new(|| Arc::new(Mutex::new(Vec::new())));
+
+impl UpdateSnapshot {
+ pub fn load(path: &std::path::Path) -> Option {
+ std::fs::read(path)
+ .ok()
+ .and_then(|bytes| serde_json::from_slice(&bytes).ok())
+ }
+
+ pub fn applies_to(&self, instance: &InstanceConfig) -> bool {
+ self.game_version == instance.game_version && self.loader == instance.loader
+ }
+
+ pub fn matches_manifest(&self, manifest: &ContentManifest) -> bool {
+ self.inventory == resolved_inventory(manifest)
+ }
+
+ pub fn update_for(&self, installed: &ProviderProject) -> Option<&AvailableUpdate> {
+ self.updates.iter().find(|update| {
+ update.installed.provider == installed.provider
+ && update.installed.project_id == installed.project_id
+ && update.installed.version_id == installed.version_id
+ })
+ }
+}
+
+pub fn spawn(instance: InstanceConfig, manifest: ContentManifest, path: std::path::PathBuf) {
+ tokio::spawn(async move {
+ let snapshot = scan(&instance, &manifest).await;
+ if let Ok(bytes) = serde_json::to_vec_pretty(&snapshot)
+ && let Err(error) = crate::storage::write_atomic(&path, &bytes)
+ {
+ tracing::debug!("Could not cache content update snapshot: {error}");
+ }
+ if let Ok(mut pending) = PENDING_UPDATE_SNAPSHOTS.lock() {
+ pending.push(PendingUpdateSnapshot {
+ instance_name: instance.name,
+ instance_created: instance.created,
+ snapshot,
+ });
+ crate::feedback::request_redraw();
+ }
+ });
+}
+
+pub async fn scan(instance: &InstanceConfig, manifest: &ContentManifest) -> UpdateSnapshot {
+ let mut projects = manifest
+ .files
+ .iter()
+ .filter_map(|record| {
+ record
+ .resolved_project()
+ .cloned()
+ .map(|project| (project, record.kind))
+ })
+ .collect::>();
+ projects.sort_by(|left, right| {
+ (&left.0.provider, &left.0.project_id, &left.0.version_id).cmp(&(
+ &right.0.provider,
+ &right.0.project_id,
+ &right.0.version_id,
+ ))
+ });
+ projects.dedup_by(|left, right| {
+ left.0.provider == right.0.provider
+ && left.0.project_id == right.0.project_id
+ && left.0.version_id == right.0.version_id
+ });
+ let inventory = projects
+ .iter()
+ .map(|(project, _)| project.clone())
+ .collect();
+
+ let slots = Arc::new(tokio::sync::Semaphore::new(8));
+ let mut tasks = tokio::task::JoinSet::new();
+ for (installed, kind) in projects {
+ let slots = slots.clone();
+ let game_version = instance.game_version.clone();
+ let loader = instance.loader;
+ tasks.spawn(async move {
+ let result = async {
+ let _permit = slots
+ .acquire_owned()
+ .await
+ .map_err(|error| error.to_string())?;
+ let registry = crate::instance::content::provider::ProviderRegistry::configured(
+ crate::net::HttpClient::new(),
+ );
+ let provider = registry.get(&installed.provider).ok_or_else(|| {
+ format!("{} content provider is unavailable", installed.provider)
+ })?;
+ let versions = provider
+ .compatible_versions(&installed.project_id, kind, &game_version, loader)
+ .await
+ .map_err(|error| error.to_string())?;
+ let current = versions
+ .iter()
+ .find(|version| version.id == installed.version_id)
+ .cloned();
+ let target = versions.first().cloned().filter(|_| {
+ crate::instance::content::provider::has_newer_compatible_version(
+ &versions,
+ &installed.version_id,
+ )
+ });
+ Ok::<_, String>(target.map(|target| (current, target)))
+ }
+ .await;
+ (installed, kind, result)
+ });
+ }
+
+ let mut updates = Vec::new();
+ let mut failures = Vec::new();
+ while let Some(result) = tasks.join_next().await {
+ match result {
+ Ok((installed, kind, Ok(Some((current, target))))) => updates.push(AvailableUpdate {
+ installed,
+ current,
+ target,
+ kind,
+ }),
+ Ok((_, _, Ok(None))) => {}
+ Ok((installed, kind, Err(reason))) => failures.push(UpdateCheckFailure {
+ installed,
+ kind,
+ reason,
+ }),
+ Err(error) => tracing::debug!("Content update task failed: {error}"),
+ }
+ }
+ updates.sort_by(|left, right| {
+ (&left.installed.provider, &left.installed.project_id)
+ .cmp(&(&right.installed.provider, &right.installed.project_id))
+ });
+ UpdateSnapshot {
+ game_version: instance.game_version.clone(),
+ loader: instance.loader,
+ inventory,
+ updates,
+ failures,
+ }
+}
+
+fn resolved_inventory(manifest: &ContentManifest) -> Vec {
+ let mut inventory = manifest
+ .files
+ .iter()
+ .filter_map(|record| record.resolved_project().cloned())
+ .collect::>();
+ inventory.sort_by(|left, right| {
+ (&left.provider, &left.project_id, &left.version_id).cmp(&(
+ &right.provider,
+ &right.project_id,
+ &right.version_id,
+ ))
+ });
+ inventory.dedup();
+ inventory
+}
+
+pub async fn plan_bulk(
+ instance: &InstanceConfig,
+ manifest: &ContentManifest,
+ minecraft_dir: &std::path::Path,
+ requests: Vec,
+ mut conflicts: Vec,
+) -> BulkUpdatePlan {
+ let registry = crate::instance::content::provider::ProviderRegistry::configured(
+ crate::net::HttpClient::new(),
+ );
+ let projected_manifest = project_updates(manifest, minecraft_dir, &requests);
+ let mut accepted = Vec::new();
+ let mut roots = Vec::new();
+ for request in requests {
+ let root = InstallRoot {
+ provider: request.update.installed.provider.clone(),
+ project_id: request.update.installed.project_id.clone(),
+ title: request.title.clone(),
+ version: request.update.target.clone(),
+ installed_path: Some(request.installed_path.clone()),
+ kind: request.update.kind,
+ target_world: request.target_world.clone(),
+ force_reinstall: false,
+ };
+ let mut resolution_manifest = projected_manifest.clone();
+ if let Ok(relative_path) = request.installed_path.strip_prefix(minecraft_dir)
+ && let Some(current) = manifest.record(relative_path)
+ && let Some(projected) = resolution_manifest
+ .files
+ .iter_mut()
+ .find(|record| record.relative_path == relative_path)
+ {
+ projected.resolution = current.resolution.clone();
+ }
+ let plan = match super::dependencies::resolve(
+ ®istry,
+ &resolution_manifest,
+ minecraft_dir,
+ instance,
+ root,
+ )
+ .await
+ {
+ Ok(plan) => plan,
+ Err(error) => {
+ conflicts.push(UpdateConflict {
+ title: request.title,
+ installed_path: request.installed_path,
+ reason: error.to_string(),
+ });
+ continue;
+ }
+ };
+ let mut proposed = accepted.clone();
+ proposed.push(plan.clone());
+ if let Err(error) = super::dependencies::merge(proposed) {
+ conflicts.push(UpdateConflict {
+ title: request.title,
+ installed_path: request.installed_path,
+ reason: error.to_string(),
+ });
+ continue;
+ }
+ roots.push(PlannedRootUpdate {
+ title: request.title,
+ installed_path: request.installed_path,
+ current_version: request.update.current.as_ref().map_or_else(
+ || request.update.installed.version_id.clone(),
+ |version| version.version_number.clone(),
+ ),
+ target: request.update.target,
+ });
+ accepted.push(plan);
+ }
+ BulkUpdatePlan {
+ dependency_plan: super::dependencies::merge(accepted).unwrap_or(DependencyPlan {
+ items: Vec::new(),
+ root_count: 0,
+ optional_dependencies: 0,
+ }),
+ roots,
+ conflicts,
+ }
+}
+
+fn project_updates(
+ manifest: &ContentManifest,
+ minecraft_dir: &std::path::Path,
+ requests: &[UpdateRequest],
+) -> ContentManifest {
+ let mut projected = manifest.clone();
+ for request in requests {
+ let Ok(relative_path) = request.installed_path.strip_prefix(minecraft_dir) else {
+ continue;
+ };
+ let Some(record) = projected
+ .files
+ .iter_mut()
+ .find(|record| record.relative_path == relative_path)
+ else {
+ continue;
+ };
+ record.resolution = crate::instance::Resolution::Resolved {
+ project: ProviderProject {
+ provider: request.update.installed.provider.clone(),
+ project_id: request.update.installed.project_id.clone(),
+ version_id: request.update.target.id.clone(),
+ },
+ };
+ }
+ projected
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use crate::net::modrinth::{VersionFile, VersionType};
+
+ fn version(id: &str) -> VersionInfo {
+ VersionInfo {
+ id: id.to_owned(),
+ project_id: "project".to_owned(),
+ name: id.to_owned(),
+ version_number: id.to_owned(),
+ game_versions: vec!["1.21.1".to_owned()],
+ loaders: vec!["fabric".to_owned()],
+ version_type: VersionType::Release,
+ dependencies: Vec::new(),
+ date_published: String::new(),
+ files: Vec::::new(),
+ }
+ }
+
+ #[test]
+ fn cached_updates_match_the_exact_installed_version() {
+ let installed = ProviderProject {
+ provider: "modrinth".to_owned(),
+ project_id: "project".to_owned(),
+ version_id: "old".to_owned(),
+ };
+ let snapshot = UpdateSnapshot {
+ game_version: "1.21.1".to_owned(),
+ loader: ModLoader::Fabric,
+ inventory: vec![installed.clone()],
+ updates: vec![AvailableUpdate {
+ installed: installed.clone(),
+ current: Some(version("old")),
+ target: version("new"),
+ kind: ContentKind::Mod,
+ }],
+ failures: Vec::new(),
+ };
+
+ assert!(snapshot.update_for(&installed).is_some());
+ assert!(
+ snapshot
+ .update_for(&ProviderProject {
+ version_id: "different".to_owned(),
+ ..installed
+ })
+ .is_none()
+ );
+ }
+
+ #[test]
+ fn cached_updates_require_the_same_content_inventory() {
+ let project = ProviderProject {
+ provider: "modrinth".to_owned(),
+ project_id: "project".to_owned(),
+ version_id: "old".to_owned(),
+ };
+ let snapshot = UpdateSnapshot {
+ game_version: "1.21.1".to_owned(),
+ loader: ModLoader::Fabric,
+ inventory: vec![project.clone()],
+ updates: Vec::new(),
+ failures: Vec::new(),
+ };
+ let mut manifest = ContentManifest::default();
+ manifest.files.push(crate::instance::ContentFileRecord {
+ relative_path: "mods/example.jar".into(),
+ kind: ContentKind::Mod,
+ enabled: true,
+ fingerprint: crate::instance::FileFingerprint {
+ size: 0,
+ modified_ns: 0,
+ hashes: Default::default(),
+ },
+ resolution: crate::instance::Resolution::Resolved { project },
+ provider_aliases: Vec::new(),
+ provider_checks: vec!["modrinth".to_owned()],
+ required_dependencies: Vec::new(),
+ automatic_dependency: false,
+ cleanup_eligible: false,
+ });
+
+ assert!(snapshot.matches_manifest(&manifest));
+ manifest.files[0].resolution = crate::instance::Resolution::Unmatched {
+ checked_at: 0,
+ providers: Vec::new(),
+ };
+ assert!(!snapshot.matches_manifest(&manifest));
+ }
+
+ #[test]
+ fn bulk_planning_projects_other_selected_updates() {
+ let minecraft = std::path::Path::new("/instance/minecraft");
+ let installed = ProviderProject {
+ provider: "modrinth".to_owned(),
+ project_id: "library".to_owned(),
+ version_id: "old".to_owned(),
+ };
+ let mut manifest = ContentManifest::default();
+ manifest.files.push(crate::instance::ContentFileRecord {
+ relative_path: "mods/library.jar".into(),
+ kind: ContentKind::Mod,
+ enabled: true,
+ fingerprint: crate::instance::FileFingerprint {
+ size: 1,
+ modified_ns: 1,
+ hashes: Default::default(),
+ },
+ resolution: crate::instance::Resolution::Resolved {
+ project: installed.clone(),
+ },
+ provider_aliases: Vec::new(),
+ provider_checks: vec!["modrinth".to_owned()],
+ required_dependencies: Vec::new(),
+ automatic_dependency: true,
+ cleanup_eligible: true,
+ });
+ let requests = vec![UpdateRequest {
+ title: "Library".to_owned(),
+ installed_path: minecraft.join("mods/library.jar"),
+ target_world: None,
+ update: AvailableUpdate {
+ installed,
+ current: Some(version("old")),
+ target: version("new"),
+ kind: ContentKind::Mod,
+ },
+ }];
+
+ let projected = project_updates(&manifest, minecraft, &requests);
+
+ assert_eq!(
+ projected.files[0].resolved_project().unwrap().version_id,
+ "new"
+ );
+ assert_eq!(
+ manifest.files[0].resolved_project().unwrap().version_id,
+ "old"
+ );
+ }
+}
diff --git a/src/instance/content/worlds.rs b/src/instance/content/worlds.rs
index eff69be..4097dbb 100644
--- a/src/instance/content/worlds.rs
+++ b/src/instance/content/worlds.rs
@@ -2,34 +2,88 @@
// their icon as icon.png. also computes an approximate size from top-level
// files + region data so the user gets some sense of how chonky their world is.
-use std::path::Path;
+use std::{fs::File, path::Path};
-use super::mods::{ContentEntry, make_icon_pixels};
+use flate2::read::GzDecoder;
+use serde::Deserialize;
+
+use super::entry::{ContentEntry, WorldDetails, WorldGameMode};
+use super::{fallback_icon_large, make_icon_pixels};
pub fn scan_one_world(path: &Path, file_stem: &str, enabled: bool) -> ContentEntry {
let icon_bytes = std::fs::read(path.join("icon.png")).ok();
let icon_lines = icon_bytes
.as_ref()
.and_then(|bytes| make_icon_pixels(bytes, 12, 6))
- .or_else(|| Some(super::mods::fallback_icon_large()));
-
- let description = world_description(path);
+ .or_else(|| Some(fallback_icon_large()));
+
+ let metadata = read_world_metadata(path);
+ let last_played = world_last_played(path, metadata.as_ref());
+ let size = dir_size_approx(path);
+ let world_details = WorldDetails {
+ game_mode: metadata.as_ref().and_then(WorldMetadata::game_mode),
+ last_played,
+ minecraft_version: metadata
+ .as_ref()
+ .and_then(|metadata| metadata.version.as_ref())
+ .and_then(|version| version.name.as_deref())
+ .filter(|version| !version.trim().is_empty())
+ .map(str::to_owned),
+ size: (size > 0).then(|| format_size(size)),
+ datapacks: datapack_names(path),
+ };
ContentEntry {
- name: file_stem.to_owned(),
+ name: metadata
+ .as_ref()
+ .and_then(|metadata| metadata.level_name.as_deref())
+ .filter(|name| !name.trim().is_empty())
+ .unwrap_or(file_stem)
+ .to_owned(),
file_stem: file_stem.to_owned(),
- description,
+ source_slug: None,
+ installed_path: None,
+ provider_project: None,
+ world_details: Some(world_details),
+ title_suffix: None,
+ footer_label: None,
+ footer_change: None,
+ description: String::new(),
enabled,
icon_bytes,
+ provider_icon: false,
+ provider_description: false,
path: path.to_path_buf(),
icon_lines,
}
}
+pub(crate) fn datapack_names(world: &Path) -> Vec {
+ let Ok(entries) = std::fs::read_dir(world.join("datapacks")) else {
+ return Vec::new();
+ };
+ let mut names = entries
+ .flatten()
+ .filter_map(|entry| {
+ let path = entry.path();
+ let name = path.file_name()?.to_str()?;
+ if path.is_dir() {
+ Some(name.trim_end_matches(".disabled").to_owned())
+ } else {
+ name.strip_suffix(".zip")
+ .or_else(|| name.strip_suffix(".zip.disabled"))
+ .map(str::to_owned)
+ }
+ })
+ .collect::>();
+ names.sort_by_key(|name| name.to_lowercase());
+ names
+}
+
pub fn scan_worlds(instances_dir: &Path, instance_name: &str) -> Vec {
let saves_dir = instances_dir
.join(instance_name)
- .join(".minecraft")
+ .join(crate::storage::MINECRAFT_DIR_NAME)
.join("saves");
let read_dir = match std::fs::read_dir(&saves_dir) {
@@ -58,44 +112,80 @@ pub fn scan_worlds(instances_dir: &Path, instance_name: &str) -> Vec String {
- let level_dat = world_dir.join("level.dat");
-
- let created = world_dir
- .metadata()
- .ok()
- .and_then(|m| m.created().ok().or_else(|| m.modified().ok()))
- .and_then(|t| t.duration_since(std::time::UNIX_EPOCH).ok())
- .map(|d| d.as_secs());
-
- let modified = level_dat
- .metadata()
- .ok()
- .and_then(|m| m.modified().ok())
- .and_then(|t| t.duration_since(std::time::UNIX_EPOCH).ok())
- .map(|d| d.as_secs());
-
- let dir_size = dir_size_approx(world_dir);
+#[derive(Debug, Deserialize)]
+struct LevelDat {
+ #[serde(rename = "Data")]
+ data: WorldMetadata,
+}
- let mut lines = Vec::new();
+#[derive(Debug, Deserialize)]
+struct WorldMetadata {
+ #[serde(rename = "LevelName")]
+ level_name: Option,
+ #[serde(rename = "GameType")]
+ game_type: Option,
+ #[serde(rename = "hardcore")]
+ hardcore: Option,
+ #[serde(rename = "LastPlayed")]
+ last_played: Option,
+ #[serde(rename = "Version")]
+ version: Option,
+}
- if let Some(secs) = created
- && let Some(dt) = chrono::DateTime::from_timestamp(secs as i64, 0)
- {
- lines.push(format!("Created: {}", dt.format("%Y-%m-%d %H:%M")));
- }
+#[derive(Debug, Deserialize)]
+struct WorldVersion {
+ #[serde(rename = "Name")]
+ name: Option,
+}
- if let Some(secs) = modified
- && let Some(dt) = chrono::DateTime::from_timestamp(secs as i64, 0)
- {
- lines.push(format!("Played: {}", dt.format("%Y-%m-%d %H:%M")));
+impl WorldMetadata {
+ fn game_mode(&self) -> Option {
+ if self.hardcore.is_some_and(|hardcore| hardcore != 0) {
+ return Some(WorldGameMode::Hardcore);
+ }
+ Some(match self.game_type? {
+ 0 => WorldGameMode::Survival,
+ 1 => WorldGameMode::Creative,
+ 2 => WorldGameMode::Adventure,
+ 3 => WorldGameMode::Spectator,
+ _ => return None,
+ })
}
+}
- if dir_size > 0 {
- lines.push(format!("Size: {}", format_size(dir_size)));
+fn read_world_metadata(world_dir: &Path) -> Option {
+ let path = world_dir.join("level.dat");
+ let file = File::open(&path).ok()?;
+ match fastnbt::from_reader::<_, LevelDat>(GzDecoder::new(file)) {
+ Ok(level) => Some(level.data),
+ Err(error) => {
+ tracing::debug!(
+ "Could not read world metadata from {}: {error}",
+ path.display()
+ );
+ None
+ }
}
+}
- lines.join("\n")
+fn world_last_played(
+ world_dir: &Path,
+ metadata: Option<&WorldMetadata>,
+) -> Option> {
+ let level_dat = world_dir.join("level.dat");
+ metadata
+ .and_then(|metadata| metadata.last_played)
+ .filter(|millis| *millis > 0)
+ .map(|millis| millis / 1000)
+ .or_else(|| {
+ level_dat
+ .metadata()
+ .ok()
+ .and_then(|m| m.modified().ok())
+ .and_then(|t| t.duration_since(std::time::UNIX_EPOCH).ok())
+ .map(|d| d.as_secs() as i64)
+ })
+ .and_then(|seconds| chrono::DateTime::from_timestamp(seconds, 0))
}
// only counts top-level files + region/ contents, not a full recursive walk.
@@ -134,3 +224,7 @@ fn format_size(bytes: u64) -> String {
format!("{:.2} GB", bytes as f64 / (1024.0 * 1024.0 * 1024.0))
}
}
+
+#[cfg(test)]
+#[path = "../tests/content/worlds.rs"]
+mod tests;
diff --git a/src/instance/desktop.rs b/src/instance/desktop.rs
index 08cc959..5ec802d 100644
--- a/src/instance/desktop.rs
+++ b/src/instance/desktop.rs
@@ -190,35 +190,5 @@ fn sanitize(name: &str) -> String {
}
#[cfg(test)]
-mod tests {
- use super::*;
-
- #[test]
- fn sanitize_keeps_alphanumeric() {
- assert_eq!(sanitize("my-instance_123"), "my-instance_123");
- }
-
- #[test]
- fn sanitize_replaces_special_chars() {
- assert_eq!(sanitize("my instance!"), "my_instance_");
- assert_eq!(sanitize("path/traversal"), "path_traversal");
- }
-
- #[test]
- #[cfg(target_os = "linux")]
- fn build_content_linux() {
- let content = build_content("TestPack", None);
- assert!(content.contains("Name=Minecraft - TestPack"));
- assert!(content.contains("Exec=rmcl instance launch \"TestPack\""));
- assert!(content.contains("Terminal=false"));
- assert!(content.contains("Categories=Game;"));
- }
-
- #[test]
- #[cfg(target_os = "linux")]
- fn build_content_linux_with_icon() {
- let icon = PathBuf::from("/tmp/icon.png");
- let content = build_content("TestPack", Some(&icon));
- assert!(content.contains("Icon=/tmp/icon.png"));
- }
-}
+#[path = "tests/desktop.rs"]
+mod tests;
diff --git a/src/instance/import/curseforge.rs b/src/instance/import/curseforge.rs
new file mode 100644
index 0000000..b58f254
--- /dev/null
+++ b/src/instance/import/curseforge.rs
@@ -0,0 +1,282 @@
+// curseforge modpack archives: manifest.json references provider file ids,
+// while the overrides directory contains configs and other bundled files.
+
+use std::path::Path;
+
+use serde::Deserialize;
+
+use crate::feedback::progress;
+use crate::instance::{InstanceConfig, InstanceManager, ModLoader};
+
+use super::{ImportSummary, PackFormat};
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct Manifest {
+ name: String,
+ version: String,
+ minecraft: Minecraft,
+ #[serde(default)]
+ files: Vec,
+ #[serde(default = "default_overrides")]
+ overrides: String,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct Minecraft {
+ version: String,
+ #[serde(default)]
+ mod_loaders: Vec,
+}
+
+#[derive(Debug, Deserialize)]
+struct ManifestLoader {
+ id: String,
+ #[serde(default)]
+ primary: bool,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct ManifestFile {
+ #[serde(rename = "projectID")]
+ _project_id: u64,
+ #[serde(rename = "fileID")]
+ file_id: u64,
+ #[serde(default = "required_by_default")]
+ required: bool,
+}
+
+fn default_overrides() -> String {
+ "overrides".to_owned()
+}
+
+fn required_by_default() -> bool {
+ true
+}
+
+fn parse(path: &Path) -> Result {
+ let file = std::fs::File::open(path).map_err(|error| error.to_string())?;
+ let mut archive = zip::ZipArchive::new(file).map_err(|error| error.to_string())?;
+ let entry = archive
+ .by_name("manifest.json")
+ .map_err(|_| "Missing manifest.json in CurseForge pack".to_owned())?;
+ serde_json::from_reader(entry).map_err(|error| format!("Invalid CurseForge manifest: {error}"))
+}
+
+fn loader(manifest: &Manifest) -> (ModLoader, Option) {
+ let id = manifest
+ .minecraft
+ .mod_loaders
+ .iter()
+ .find(|loader| loader.primary)
+ .or_else(|| manifest.minecraft.mod_loaders.first())
+ .map(|loader| loader.id.as_str());
+ let Some(id) = id else {
+ return (ModLoader::Vanilla, None);
+ };
+ let (name, version) = id.split_once('-').unwrap_or((id, ""));
+ let loader = match name.to_ascii_lowercase().as_str() {
+ "fabric" => ModLoader::Fabric,
+ "forge" => ModLoader::Forge,
+ "neoforge" => ModLoader::NeoForge,
+ "quilt" => ModLoader::Quilt,
+ _ => ModLoader::Vanilla,
+ };
+ (
+ loader,
+ (!version.is_empty() && loader != ModLoader::Vanilla).then(|| version.to_owned()),
+ )
+}
+
+pub fn build_summary(path: &Path) -> Result {
+ let manifest = parse(path)?;
+ let (loader, loader_version) = loader(&manifest);
+ let override_count = count_overrides(path, &manifest.overrides)?;
+ Ok(ImportSummary {
+ name: manifest.name,
+ pack_version: manifest.version,
+ game_version: manifest.minecraft.version,
+ loader,
+ loader_version,
+ mod_count: manifest.files.iter().filter(|file| file.required).count(),
+ override_count,
+ format: PackFormat::CurseForge,
+ archive_path: path.to_owned(),
+ source: None,
+ })
+}
+
+pub async fn execute_import(
+ summary: &ImportSummary,
+ manager: &InstanceManager,
+) -> Result> {
+ let name = super::unique_instance_name(&summary.name, &manager.instances_dir);
+ progress::set_action(format!("Importing '{name}'..."));
+ progress::set_sub_action(format!("{} {}", summary.game_version, summary.loader));
+ let config = manager
+ .create(
+ &name,
+ &summary.game_version,
+ summary.loader,
+ summary.loader_version.as_deref(),
+ )
+ .await
+ .map_err(|error| -> Box