盘上已经铺好的版本(多半是 PCL/HMCL 装的)今天在 ULL 里看不见,用户只能重装一遍。这个 commit 把它们登记成实例,**只读外部、只写自己的配置**:不搬文件、不补清单、不改任何外部 文件的 mtime(versions/ libraries/ assets/ 一个字节都不写)。 core(`game::adopt`,新模块): - `scan` / `inspect`:只读扫描 + 逐项检查,坏 JSON(带行列号)/ 缺 id / id 与目录名不一致 / 缺父 / 成环 / 读不出来 / 越界 / 同名冲突一律**结构化**报错(稳定 `code`),不吞成空列表; `versions/` 不存在才是空结果,读不了就是错误; - 越界判据用 canonicalize 后的前缀比较,同时覆盖**符号链接、Windows 目录联接(junction)与 祖先链接**(junction 不需要管理员权限,是最常见的「把别人版本目录挂进来」);越界条目在 边界检查就停手,一个字节都不去读; - `plan`(零写盘,喂 dry-run 与后续 GUI 预检)/ `adopt`(plan + 只写自己的配置): **缺省运行目录落 ULL 数据区 `<data>/instances/<实例目录名>`(custom 档),绝不沿用全局 `isolated`**——那条缺省的运行目录正是 `versions/<versionId>/`,会在他人的版本目录里长出 mods/saves/config;`shared` / `isolated` 必须显式选,且 `target_notes()` 给出后果话术; - 缺省运行目录已存在且非空 ⇒ 拒绝(不覆盖、不猜「合并进已有实例」);数据区里已有的祖先 若解析到数据根之外(符号链接/联接)⇒ 拒绝,不沿它写盘; - 登记与隔离档一次写清:`install/instance` 拆出 `register` 子模块,新增 `register_with(InstanceSettings)`;写盘顺序改成「先实例设置、后 profiles」(中断只留孤立 设置文件,不会留下按全局档启动的实例),profiles 写失败会撤掉刚写的设置。`register` 签名与行为不变(`register` = `register_with(inherit)`;同版本同名的幂等复用照旧)。 CLI: - `ull instances scan`(只读列出候选与原因)、`ull instances adopt <version-id> [--name N] [--isolation shared|isolated|custom] [--game-dir DIR] [--dry-run]`;`--game-dir` 单独给即 custom,相对路径在解析期就报用法错误; - 人读/`--json`/help 三条出口齐备(`error.detail.problems` 逐条可分流),已有命令未改。 测试(真磁盘夹具,`cargo test -p unlucky-core --test adopt` 22 passed / `cargo test -p unlucky-cli --test adopt_test` 10 passed): - 一份「别的启动器铺好的」`.minecraft`(versions/libraries/assets/mods/saves/config + launcher_profiles.json),扫描与登记前后做「路径集合 + 字节数 + 内容哈希 + mtime」全等断言; - 正常 / 缺清单 / 坏 JSON / 缺父 / 成环 / id 不匹配 / 非法 id / 符号链接越界 / 根内符号链接 放行 / **junction 越界** / 数据区 junction 写盘边界 / 缺省非 isolated / shared 与 isolated 的话术 / 重名 / 重复 / 非空目录 / 空目录复用 / dry-run 零写盘; - CLI 侧验 `launch --dry-run` 的 `--gameDir` 指向选定运行目录(argv 已脱敏,比尾段; `data.game_dir` 全等); - 变异核对(只改实现、跑完即回滚):缺省档改 `VersionDir` ⇒ 红;边界判据摘掉 ⇒ 符号链接与 junction 两条红;写盘边界摘掉 ⇒ 数据区 junction 那条红;缺父当链终点 ⇒ 两条红。 界限:没有启动真实 Minecraft;GUI(presenter/app-iced)接线另派;D20 单游戏根模型未改 (不扫第二个 `.minecraft`)。
141 lines
4.8 KiB
Rust
141 lines
4.8 KiB
Rust
//! CLI 侧夹具:一个「别的启动器铺好了 `.minecraft`」的数据根 + 全量快照工具。
|
|
|
|
use std::collections::hash_map::DefaultHasher;
|
|
use std::collections::BTreeMap;
|
|
use std::hash::{Hash, Hasher};
|
|
use std::path::Path;
|
|
use std::time::UNIX_EPOCH;
|
|
|
|
/// 造一份「别的启动器已经铺好的」数据根(`<root>/.minecraft` + `<root>/.ULL`):
|
|
///
|
|
/// | 路径 | 用意 |
|
|
/// | --- | --- |
|
|
/// | `versions/1.20.1/` | 正常版本(清单 + jar),可登记、可 `launch --dry-run` |
|
|
/// | `versions/1.20.1-orphan/` | 缺父版本 ⇒ 不可登记 |
|
|
/// | `libraries/` `assets/` | 恒共享层(登记不该碰) |
|
|
/// | `mods/` `saves/` | 玩家数据(登记不该碰) |
|
|
/// | `launcher_profiles.json` | 别的启动器的元数据(连读都不该读,更不该写) |
|
|
pub fn foreign_data_root(root: &Path) {
|
|
let minecraft = root.join(".minecraft");
|
|
let versions = minecraft.join("versions");
|
|
write_version(&versions, "1.20.1", MANIFEST_OK, true);
|
|
write_version(&versions, "1.20.1-orphan", MANIFEST_ORPHAN, true);
|
|
write_file(
|
|
&minecraft.join("libraries/com/mojang/brigadier/1.0.18/brigadier-1.0.18.jar"),
|
|
b"library-bytes",
|
|
);
|
|
write_file(
|
|
&minecraft.join("assets/indexes/5.json"),
|
|
b"{\"objects\":{}}",
|
|
);
|
|
write_file(&minecraft.join("mods/jei.jar"), b"mod-bytes");
|
|
write_file(&minecraft.join("saves/World/level.dat"), b"save-bytes");
|
|
write_file(
|
|
&minecraft.join("launcher_profiles.json"),
|
|
br#"{"profiles":{"1.20.1":{"name":"1.20.1","lastVersionId":"1.20.1"}}}"#,
|
|
);
|
|
}
|
|
|
|
/// 全量快照:相对路径 → (字节数, mtime 纳秒, 内容哈希)。
|
|
pub fn snapshot(dir: &Path) -> BTreeMap<String, (u64, u128, u64)> {
|
|
let mut out = BTreeMap::new();
|
|
walk(dir, dir, &mut out);
|
|
out
|
|
}
|
|
|
|
fn walk(root: &Path, dir: &Path, out: &mut BTreeMap<String, (u64, u128, u64)>) {
|
|
let Ok(entries) = std::fs::read_dir(dir) else {
|
|
return;
|
|
};
|
|
for entry in entries.flatten() {
|
|
let path = entry.path();
|
|
let Ok(meta) = std::fs::symlink_metadata(&path) else {
|
|
continue;
|
|
};
|
|
if meta.is_dir() {
|
|
walk(root, &path, out);
|
|
continue;
|
|
}
|
|
let relative = path
|
|
.strip_prefix(root)
|
|
.unwrap_or(&path)
|
|
.to_string_lossy()
|
|
.into_owned();
|
|
let bytes = std::fs::read(&path).expect("文件应可读");
|
|
let mtime = meta
|
|
.modified()
|
|
.ok()
|
|
.and_then(|time| time.duration_since(UNIX_EPOCH).ok())
|
|
.map_or(0, |duration| duration.as_nanos());
|
|
out.insert(relative, (bytes.len() as u64, mtime, hash(&bytes)));
|
|
}
|
|
}
|
|
|
|
fn hash(bytes: &[u8]) -> u64 {
|
|
let mut hasher = DefaultHasher::new();
|
|
bytes.hash(&mut hasher);
|
|
hasher.finish()
|
|
}
|
|
|
|
/// 断言两次快照完全一致(路径集合 / 字节数 / 内容哈希 / mtime)。
|
|
///
|
|
/// 抓得住:命令写了、删了、改了任何外部文件(含「内容相同但重写一遍」——mtime 会变)。
|
|
/// 抓不住:只读打开(没有可观测痕迹)。
|
|
pub fn assert_unchanged(
|
|
before: &BTreeMap<String, (u64, u128, u64)>,
|
|
after: &BTreeMap<String, (u64, u128, u64)>,
|
|
what: &str,
|
|
) {
|
|
assert_eq!(
|
|
before.keys().collect::<Vec<_>>(),
|
|
after.keys().collect::<Vec<_>>(),
|
|
"{what}:路径集合变了"
|
|
);
|
|
for (path, before) in before {
|
|
assert_eq!(
|
|
before,
|
|
after.get(path).expect("同一路径"),
|
|
"{what}:文件被改动 -> {path}"
|
|
);
|
|
}
|
|
}
|
|
|
|
fn write_version(versions: &Path, id: &str, manifest: &str, jar: bool) {
|
|
let dir = versions.join(id);
|
|
std::fs::create_dir_all(&dir).expect("建版本目录");
|
|
std::fs::write(dir.join(format!("{id}.json")), manifest.as_bytes()).expect("写清单");
|
|
if jar {
|
|
std::fs::write(dir.join(format!("{id}.jar")), b"junk").expect("写 jar");
|
|
}
|
|
}
|
|
|
|
fn write_file(path: &Path, bytes: &[u8]) {
|
|
if let Some(parent) = path.parent() {
|
|
std::fs::create_dir_all(parent).expect("建父目录");
|
|
}
|
|
std::fs::write(path, bytes).expect("写文件");
|
|
}
|
|
|
|
const MANIFEST_OK: &str = r#"{
|
|
"id": "1.20.1",
|
|
"type": "release",
|
|
"mainClass": "net.minecraft.client.main.Main",
|
|
"assets": "5",
|
|
"assetIndex": { "id": "5" },
|
|
"arguments": {
|
|
"game": ["--username", "${auth_player_name}", "--version", "${version_name}",
|
|
"--gameDir", "${game_directory}"],
|
|
"jvm": ["-Djava.library.path=${natives_directory}", "-cp", "${classpath}"]
|
|
},
|
|
"libraries": [],
|
|
"downloads": { "client": { "size": 4, "url": "http://example.invalid/client.jar" } }
|
|
}"#;
|
|
|
|
const MANIFEST_ORPHAN: &str = r#"{
|
|
"id": "1.20.1-orphan",
|
|
"type": "release",
|
|
"inheritsFrom": "1.20.1-not-on-disk",
|
|
"mainClass": "net.minecraft.client.main.Main",
|
|
"libraries": []
|
|
}"#;
|