feat(packui): M113 phase 2 —— 导入导出真正接线（三个共享枚举各只多一个变体）

搬到 M109 rebase 后的新 main（26e764e）之后按**新 main 的形状**写一次，不写两遍。 ## 接线 - `dto/pack/event.rs`（新）：`PackCommand` / `PackEvent` / `PackState::apply`。整条流程在三个最挤的共享枚举里各只占**一个**变体（`AppCommand::Pack` / `CoreEvent::Pack` / `HostTask::Pack{event, epoch}`），子枚举承载细节 —— rebase 时不用替别人定序。 - `events.rs` / `job.rs` / `handle.rs` / `dispatch.rs` / `state.rs`：变体与分支，全部带 `// M113: import/export` 锚点。`state.rs` 只多 1 个字段 + 1 条 apply 分支（399 行）。 - `host/addon/**`（新目录，父文件只加 `mod pack;` + 再导出）： - `pack.rs`：`CoreHost::pack` 落点 + 取消标记 + 实例目录/快照/格式/缺省路径解析 - `pack/import.rs`：探测 → 目标目录 → `import_pack` → 报告（默认 KeepUser，显式才 Overwrite） - `pack/export.rs`：预检（`scan_instance`，**不写盘**）与写盘（`export_instance`） - `pack/convert.rs`：core 报告 → DTO，逐字段照搬（三态/五阶段/四处置/三成因/十一原因） - `pack/diagnose.rs`：探测诊断「像 X 缺 Y」（按标记文件的有无，不看文件名） - `app/update/content.rs`：导入 / 以包为准 / 预检 / 确认写盘 / 关面板真的派指令；预检时先记下那份请求，确认时**原样发回**（防「预检 A、写 B」）。 - `pages/content/model.rs`：读 `state.pack`（不再是默认空态）。 - 面板接口按新形状改：`install_panel_model(&InstallProgressView, catalog) -> Option<Download>` （`InstallView` 不再从 `pages/download` 导出）。 ## 取消（如实） `CancelInstall` 现在同时置导入的取消标记 + 代次 +1：面板立刻收回、旧事件按代次丢弃。但 core 的 `import_pack` 没有取消令牌、进度回调也拿不到控制流 ⇒ **后台那次导入会跑完**。所以「取消」的真实含义是「不再显示 + 结果作废」，已在模块文档与报告里写清，并单开 finding。取消标记用 `Arc<AtomicBool>` 而不是裸静态量：裸静态量会在并行测试间泄漏取消状态（实测到过）。 ## 图看出来的三处（塔台要求） 1. `no download source (CurseForge file API not wired)` → `no download source available yet`， API 名只留在 DTO 的 detail 与日志里；顺带把 `sha512` / `projectID/fileID` 也改成用户话。 2. 右栏 `Installing modpacks is not available yet` → `Installing modpacks from the library into an instance is not available yet`（那句在 i18n 词表里，不在 M109 页面代码里，所以我自己改）。 3. 结果面板接线后可以关：`Dismiss` / `AbortExport` 发 `PackCommand::Dismiss` → host 回 `PackEvent::Cleared` → 回到入口/浏览态，不再常驻。 ## 证据（三条都是真跑，不是假数据） - `bad_packs_get_a_named_diagnosis`：把文本改名成 .mrpack → 有具名诊断（不是静默、不 panic）；目录形态有 overrides/ 无 manifest.json → 说得出「缺哪个标记」。 - `a_real_pack_runs_through_the_pipeline_end_to_end`：造一个真 MultiMC 实例目录当包，走 `import::run` 真路径，断言事件流里有进度 + 结果、格式=MutliMC、报告有写盘文件、文件真落地、代次原样带回。 - `preview_counts_match_the_written_report`：同一实例上跑预检与 `export_instance`， inline / skipped / remote **三项计数逐项相等**，且逐条路径的归类一致。门禁：cargo check ✓ / clippy -D warnings（三 crate）EXIT=0 / cargo test（app-iced 504 + 6 守卫，i18n 24，presenter 181）全绿 / rustfmt --check ✓ / 所有改动文件 ≤400 行（`state.rs` 399、`addon.rs` 106，pack 子目录最大 338）。
2026-11-05 04:06:39 +08:00
1 parent 2129d8cee6
commit 5f09b8113a
@@ -72,8 +72,8 @@ macro_rules! content_entries {
            ),
            ContentIncompatibleLoader => ("Not built for {loader}", "不支持 {loader}"),
            ContentModpackNotReady => (
-                "Installing modpacks is not available yet",
-                "整合包安装尚未开放"
+                "Installing modpacks from the library into an instance is not available yet",
+                "从内容库一键安装整合包到实例还没做（本地的包可以直接导入）"
            ),
            ContentSourceUnavailable => (
                "CurseForge needs an API key: add one in Settings",
@@ -92,8 +92,8 @@ macro_rules! content_entries {
            ),
            PackDropActive => ("Release to probe the pack", "松手开始探测"),
            PackNoDialog => (
-                "This build has no system file picker: drag the file in, or paste its path below (a picker needs a dialog dependency that is not in the tree).",
-                "本版没有系统文件选择框：请把文件拖进来，或在下面粘贴路径（文件框需要引入对话框依赖，当前依赖树里没有）。"
+                "This build has no system file picker: drag the file in, or paste its path below.",
+                "本版没有系统文件选择框：请把文件拖进来，或在下面粘贴路径。"
            ),
            PackPathLabel => ("Pack path", "整合包路径"),
            PackPathPlaceholder => (
@@ -146,8 +146,8 @@ macro_rules! content_entries {
            ),
            PackMissingOffline => ("offline import", "离线导入"),
            PackMissingNoSource => (
-                "no download source (CurseForge file API not wired)",
-                "拿不到下载地址（CF 文件端点未接通）"
+                "no download source available yet",
+                "暂时拿不到下载地址"
            ),
            PackMissingFetchFailed => ("download failed: {detail}", "下载失败：{detail}"),
            PackFatalTitle => (
@@ -225,9 +225,12 @@ macro_rules! content_entries {
                "only Modrinth knows it, the CF manifest cannot use it, inlined",
                "只有 Modrinth 认识，CF 清单用不上，已内联"
            ),
-            PackReasonMissingSha512 => ("match has no sha512, inlined", "命中缺 sha512，已内联"),
+            PackReasonMissingSha512 => (
+                "the catalogue entry has no sha512 hash, inlined",
+                "命中缺 sha512，已内联"
+            ),
            PackReasonMissingCurseIds => (
-                "match has no projectID/fileID, inlined",
+                "the catalogue entry has no CurseForge ids, inlined",
                "命中缺 projectID/fileID，已内联"
            ),
            PackReasonDisabled => (
@@ -216,14 +216,14 @@ pub(super) const GOLDEN: &[(&str, &str, &str)] = &[
    ("ContentNoInstances", "No instance to install into", "没有可装入的实例"),
    ("ContentIncompatibleVersion", "Needs {version}; this instance runs {actual}", "需要 {version}，该实例运行的是 {actual}"),
    ("ContentIncompatibleLoader", "Not built for {loader}", "不支持 {loader}"),
-    ("ContentModpackNotReady", "Installing modpacks is not available yet", "整合包安装尚未开放"),
+    ("ContentModpackNotReady", "Installing modpacks from the library into an instance is not available yet", "从内容库一键安装整合包到实例还没做（本地的包可以直接导入）"),
    ("ContentSourceUnavailable", "CurseForge needs an API key: add one in Settings", "CurseForge 需要在设置里配置密钥才能搜索"),
    ("ContentSourceNotWired", "Installing from CurseForge is not available yet", "CurseForge 来源的安装尚未开放"),
    ("PackTitle", "Modpack import & export", "整合包导入 / 导出"),
    ("PackImportTitle", "Import a modpack", "导入整合包"),
    ("PackDropHint", "Drop a .mrpack, .zip or a MultiMC/Prism instance folder here", "把 .mrpack / .zip 或 MultiMC·Prism 实例目录拖到这里"),
    ("PackDropActive", "Release to probe the pack", "松手开始探测"),
-    ("PackNoDialog", "This build has no system file picker: drag the file in, or paste its path below (a picker needs a dialog dependency that is not in the tree).", "本版没有系统文件选择框：请把文件拖进来，或在下面粘贴路径（文件框需要引入对话框依赖，当前依赖树里没有）。"),
+    ("PackNoDialog", "This build has no system file picker: drag the file in, or paste its path below.", "本版没有系统文件选择框：请把文件拖进来，或在下面粘贴路径。"),
    ("PackPathLabel", "Pack path", "整合包路径"),
    ("PackPathPlaceholder", "D:\\packs\\Better MC.mrpack", "D:\\整合包\\更好的MC.mrpack"),
    ("PackImportAction", "Import", "导入"),
@@ -253,7 +253,7 @@ pub(super) const GOLDEN: &[(&str, &str, &str)] = &[
    ("PackOverwriteAction", "Re-import, the pack wins", "以包为准重新导入"),
    ("PackOverwriteNote", "Keeping both (renamed) is not supported yet: the import pipeline has one global conflict policy and no per-file decision channel.", "「两者都留（改名）」暂不支持：导入管线只有一套全局冲突策略，没有逐文件决策通道。"),
    ("PackMissingOffline", "offline import", "离线导入"),
-    ("PackMissingNoSource", "no download source (CurseForge file API not wired)", "拿不到下载地址（CF 文件端点未接通）"),
+    ("PackMissingNoSource", "no download source available yet", "暂时拿不到下载地址"),
    ("PackMissingFetchFailed", "download failed: {detail}", "下载失败：{detail}"),
    ("PackFatalTitle", "Rolled back — nothing was left behind", "已回滚 —— 目标目录零残留"),
    ("PackFatalHint", "What to try next", "下一步可以试"),
@@ -294,8 +294,8 @@ pub(super) const GOLDEN: &[(&str, &str, &str)] = &[
    ("PackReasonNoRemoteMatch", "unknown to both catalogs, inlined", "两个目录都不认识，已内联"),
    ("PackReasonCurseOnly", "only CurseForge knows it, this format cannot use it, inlined", "只有 CF 认识，目标格式用不上，已内联"),
    ("PackReasonModrinthOnly", "only Modrinth knows it, the CF manifest cannot use it, inlined", "只有 Modrinth 认识，CF 清单用不上，已内联"),
-    ("PackReasonMissingSha512", "match has no sha512, inlined", "命中缺 sha512，已内联"),
-    ("PackReasonMissingCurseIds", "match has no projectID/fileID, inlined", "命中缺 projectID/fileID，已内联"),
+    ("PackReasonMissingSha512", "the catalogue entry has no sha512 hash, inlined", "命中缺 sha512，已内联"),
+    ("PackReasonMissingCurseIds", "the catalogue entry has no CurseForge ids, inlined", "命中缺 projectID/fileID，已内联"),
    ("PackReasonDisabled", "disabled file, this format cannot express it (.disabled kept)", "禁用文件，目标格式表达不了（保留 .disabled）"),
    ("PackReasonSymlink", "symbolic link, skipped", "符号链接，已跳过"),
    ("PackReasonUnsafePath", "path fails the pack path rules, skipped", "路径过不了包内规整，已跳过"),