feat(app-iced): M90 —— app.rs 拆成 src/app/ + presenter 真接线 + 实例页端到端
拆分（行为不变，截图四件套逐字节相同）：
- 400 行的 app.rs 拆成 src/app/{mod,state,message,update,subscription,view,boot,tests}.rs，
每个文件 ≤ 300 行；components 的 #[path] 跟着搬到 src/app/mod.rs（逻辑路径仍是 crate::app::components），
可见性放到 pub(crate) 让页面层能用真组件。
- 拆分前后各出 shell/gallery 浅深四张图，cmp 全部 IDENTICAL。
presenter 接线（crate 文档 §4）：
- App 持有 Box<dyn Backend> + SettingsBridge + AppState；启动 build_backend + SettingsBridge::open + AppState::new。
- 截图通道强制 mock（D30 可复现）；交互模式走真 host，--data-dir 从 M90 起真的被消费。
- Boot 抽干首屏快照（第 3 帧落盘，等节拍会把空页面拍进图）；节拍 = 帧事件 + 33ms 时间闸门
（iced::time::every 要 tokio/smol，见 finding），tick → drain_events → AppState::apply。
- 用户动作不乐观回显：Launch/Stop 走 Backend::dispatch，状态等事件回来才变。
- 路由：pages::Message::Navigate(Route) 直接进 AppState::navigate，选中项 = 路由栈顶（不再有本地副本）；
首屏自动选中第一行（list-detail 桌面惯例），只做一次。
实例页打通（其余三页保留占位视觉 + Message/update + 路由）：
- 列表行换成 components::navigation::ListItem（真五态/选中），页头与详情动作换成 components::buttons
（Play 是唯一的实心 accent），分隔线换成 components::divider。
- 数据全部来自 presenter 快照：VERSION/LOADER/ISOLATION/VERSION ID/FILES/LAST PLAYED + 运行状态行。
- 导航轨换成真 NavigationRail（88），5 项各自压/替换路由。
版面约束未破（实测）：列表列 336、正文列 424（元信息卡 206+12+206，右缘 896）、rail 88（药丸 16..71）、
断点 600/840 走 frame_metrics；新增 pages/tests.rs 的 9 条数值断言钉住它们。
This commit is contained in:
AskaEth committed
1 parent
270026338f
commit
b484998fc9
17 files changed
+1990
-676
No files matched your search
@@ -0,0 +1,105 @@
|
||||
//! 启动：后端探测 → 字体求值 → `iced::application(..).run()`。
|
||||
|
||||
use std::time::Instant;
|
||||
|
||||
use iced::{window, Task};
|
||||
|
||||
use unlucky_design::color::SchemeFlavor;
|
||||
|
||||
use crate::cli::Options;
|
||||
use crate::fonts;
|
||||
use crate::probe;
|
||||
use crate::theme::Families;
|
||||
|
||||
use super::message::Message;
|
||||
use super::state::{App, STARTED};
|
||||
use super::{MIN_SIZE, WINDOW_SIZE};
|
||||
|
||||
/// 启动 iced（阻塞到退出）。`--diff` 不走这里，见 `main.rs`。
|
||||
pub(crate) fn run(options: Options) -> iced::Result {
|
||||
let _ = STARTED.set(Instant::now());
|
||||
|
||||
boot_probe(&options);
|
||||
|
||||
let font_started = Instant::now();
|
||||
let resolved = fonts::resolve();
|
||||
eprintln!(
|
||||
"[font] 求值耗时 {:.0} ms",
|
||||
font_started.elapsed().as_secs_f64() * 1000.0
|
||||
);
|
||||
eprintln!("{}", resolved.describe());
|
||||
if resolved.has_synthetic() {
|
||||
eprintln!(
|
||||
"[font] 警告：有字重落在「合成加粗」档（观感降级），D28 后半（CDN 字体/按档换族）要处理"
|
||||
);
|
||||
}
|
||||
let families = resolved.families();
|
||||
|
||||
// 截图模式：`--screenshot-theme` > `--theme` > **Light**（唯一取值口在 `Options::capture_flavor`）。
|
||||
// 这里**不再有**「等系统主题到达」的闸门——CI 的 xvfb 没有主题会话，等它就是挂死（见 cli 文档）。
|
||||
if options.screenshot.is_some() && options.shot_flavor().is_none() {
|
||||
eprintln!("[shot] 未指定主题，按 Light 出图（D30 可复现；CI 冒烟依赖这条默认值）");
|
||||
}
|
||||
let flavor = options.capture_flavor().unwrap_or(SchemeFlavor::Light);
|
||||
let boot_options = options.clone();
|
||||
|
||||
let application = iced::application(
|
||||
move || {
|
||||
(
|
||||
App::new(boot_options.clone(), families, flavor),
|
||||
Task::done(Message::Boot),
|
||||
)
|
||||
},
|
||||
App::update,
|
||||
App::view,
|
||||
)
|
||||
.title(App::title)
|
||||
.theme(App::theme)
|
||||
.subscription(App::subscription)
|
||||
.default_font(default_font(families))
|
||||
.window(window::Settings {
|
||||
size: WINDOW_SIZE,
|
||||
min_size: Some(MIN_SIZE),
|
||||
decorations: false,
|
||||
resizable: true,
|
||||
..window::Settings::default()
|
||||
});
|
||||
|
||||
match options.scale_factor {
|
||||
Some(scale) => application.scale_factor(move |_| scale).run(),
|
||||
None => application.run(),
|
||||
}
|
||||
}
|
||||
|
||||
/// 渲染后端探测 + 写 `ICED_BACKEND`。
|
||||
fn boot_probe(options: &Options) {
|
||||
let probe_started = Instant::now();
|
||||
// 只有 `auto` 需要探测：`cpu` 与 `gpu` 的决策与「有没有硬件 GPU」无关，
|
||||
// 而枚举 13 个适配器在本机要 0.65~1.2 s（实测），纯属白花。
|
||||
let needs_probe = options.backend == crate::Backend::Auto;
|
||||
let probe = if needs_probe {
|
||||
probe::Probe::run()
|
||||
} else {
|
||||
probe::Probe::default()
|
||||
};
|
||||
let probe_ms = probe_started.elapsed().as_secs_f64() * 1000.0;
|
||||
probe::apply(options.backend, &probe);
|
||||
if cfg!(feature = "gpu") {
|
||||
if needs_probe {
|
||||
eprintln!("[probe] 探测耗时 {probe_ms:.0} ms（wgpu 实例 + 全后端适配器枚举）");
|
||||
} else {
|
||||
eprintln!(
|
||||
"[probe] 探测耗时 {probe_ms:.0} ms（--renderer={} 与硬件无关，跳过枚举）",
|
||||
options.backend.name()
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 默认字体（正文档解析出来的族）。
|
||||
fn default_font(families: Families) -> iced::Font {
|
||||
iced::Font {
|
||||
family: iced::font::Family::Name(families.text),
|
||||
..iced::Font::DEFAULT
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
//! 应用消息：单一大枚举。
|
||||
//!
|
||||
//! 纪律：本枚举是**唯一**的消息类型，`view` 产出的所有回调都必须落到这里；组件库与页面层
|
||||
//! 各自用自己的 `Message`（组件契约 §2 的泛型纪律），由 `view` 做一次 `.map` 接上。
|
||||
//!
|
||||
//! ## 三类输入（M90）
|
||||
//!
|
||||
//! | 来源 | 变体 | 落点 |
|
||||
//! |---|---|---|
|
||||
//! | 窗口/框架 | `Boot` / `WindowReady` / `Window` / `Frame` / `Captured` / 三个 caption | [`super::update`] 直接处理 |
|
||||
//! | **时间** | `Frame` + 33 ms 时间闸门 | presenter 的 TICK 节拍：`backend.tick` + `drain_events` + `apply` |
|
||||
//! | **页面** | `Page(pages::Message)` | 导航 → `AppState::navigate`；启动/停止 → `AppCommand` |
|
||||
|
||||
use iced::{window, window::Direction};
|
||||
|
||||
use unlucky_presenter::router::Route;
|
||||
|
||||
use crate::pages;
|
||||
use crate::shell::NavItem;
|
||||
|
||||
use super::components;
|
||||
|
||||
/// 消息（单一大枚举）。
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum Message {
|
||||
/// 启动即发一次（`iced::application` 的 boot 闭包）。
|
||||
Boot,
|
||||
/// `window::latest()` 的结果。
|
||||
WindowReady(Option<window::Id>),
|
||||
/// 系统主题探测结果（只可能在**交互模式**出现，截图模式必有主题）。
|
||||
SystemTheme(iced::theme::Mode),
|
||||
/// 一帧画完（只有截图模式才订阅）。
|
||||
Frame,
|
||||
/// 窗口事件（M90：`Resized` 决定布局档位，600 / 840 两条断点靠它生效）。
|
||||
Window(window::Event),
|
||||
/// 页面消息（导航 / 启动 / 停止 / 占位动作）。
|
||||
Page(pages::Message),
|
||||
/// 外壳导航轨点选（`src/shell/nav.rs` 的回调仍然发这一条；收到就翻成同一个路由跳转）。
|
||||
///
|
||||
/// M90 起产品界面用 `pages` 里的真 `NavigationRail`，这条变体是给**外壳回退路径**
|
||||
/// （`Route::Agent`）留的——`shell` 不在本 mission 的 scope 里，不能删它的消息。
|
||||
Select(NavItem),
|
||||
/// 按下标题栏 → 拖窗。
|
||||
DragWindow,
|
||||
/// 边缘热区：开始缩放（方向由坐标决定）。
|
||||
ResizeStart(Direction),
|
||||
/// 最小化。
|
||||
Minimize,
|
||||
/// 最大化/还原。
|
||||
ToggleMaximize,
|
||||
/// 关窗退出。
|
||||
Close,
|
||||
/// 截图回来了。
|
||||
Captured(window::Screenshot),
|
||||
/// gallery（组件库 harness）里的演示交互。
|
||||
Demo(components::gallery::DemoMessage),
|
||||
}
|
||||
|
||||
/// 外壳导航项 → 路由（导航项只在一级页之间有对应；AI 项对应 [`Route::Agent`]）。
|
||||
///
|
||||
/// 这是 `NavItem → Route` 的**唯一**转换点：外壳（`src/shell/nav.rs`）与页面导航轨
|
||||
/// （`pages::NAV`）最终都落到同一个 `Route`，所以两条入口不会各走一套页面语义。
|
||||
pub(super) fn route_of(nav: NavItem) -> Route {
|
||||
match nav {
|
||||
NavItem::Instances => Route::Instances,
|
||||
NavItem::Download => Route::Download,
|
||||
NavItem::Logs => Route::Logs,
|
||||
NavItem::Settings => Route::Settings,
|
||||
NavItem::Ai => Route::Agent,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
//! Elm 三件套：`State` / `Message` / `update` + `view` 接线，以及启动序列。
|
||||
//!
|
||||
//! 启动序列：①探测渲染后端并写 `ICED_BACKEND`（必须在 `run()` 之前，M60 Q1）→ ②求值字体栈
|
||||
//! （D28 前半）→ ③`iced::application(..).run()`（1180×760、无边框自绘标题栏）→ ④首个 `view()`
|
||||
//! 打耗时；截图模式第 3 帧落盘后退出（无边框窗首帧可能是旧尺寸，M60 坑 #5）。
|
||||
//!
|
||||
//! ## 为什么拆成目录（M90）
|
||||
//!
|
||||
//! 本文件原来是**单个 400 行的 `app.rs`**：正好卡在「单文件 ≤400 行、动它前必须先拆」的硬门槛上
|
||||
//! （AGENTS 的文件上限 + 本 mission 的第一条任务）。拆法与职责：
|
||||
//!
|
||||
//! | 文件 | 职责（**只做这一件事**） |
|
||||
//! |---|---|
|
||||
//! | [`state`] | [`App`] 字段 + 构造（presenter 三件在此持有）+ 主题切换 |
|
||||
//! | [`message`] | [`Message`] 枚举与「导航项 → 路由」的翻译 |
|
||||
//! | [`update`] | 全部 `Message` 分支 + 「用户动作 → `AppCommand`」的派发与事件回流 |
|
||||
//! | [`subscription`] | 帧事件（截图）与 presenter 的 TICK 节拍 |
|
||||
//! | [`view`] | `view` / `theme` / `title` |
|
||||
//! | [`boot`] | [`run`]：后端探测 → 字体 → `iced::application(..)` |
|
||||
//!
|
||||
//! 拆分的每一步都保持**可观察行为不变**（截图四件套 `--screenshot` / `--screenshot-theme` /
|
||||
//! `--screen=gallery` / `--diff` 出图逐字节相同），presenter 接线是在拆分**之后**另一步做的。
|
||||
//!
|
||||
//! ## 组件库为什么还在本模块下声明
|
||||
//!
|
||||
//! `src/lib.rs` 是五条组件线共用的文件，改它必然冲突；`#[path]` 保证物理路径仍是
|
||||
//! `src/components/`（组件目录自己的归属规则不变），逻辑路径仍是 `crate::app::components`
|
||||
//! （组件源码里的文档与测试都按这个路径写）。
|
||||
|
||||
mod boot;
|
||||
mod message;
|
||||
mod state;
|
||||
mod subscription;
|
||||
mod update;
|
||||
mod view;
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests;
|
||||
|
||||
pub(crate) use boot::run;
|
||||
pub use message::Message;
|
||||
|
||||
// 组件库（D39）在本文件声明：`src/lib.rs` 是五条组件线共用的文件，改它必然冲突；
|
||||
// `#[path]` 保证物理路径仍是 `src/components/`（组件目录自己的归属规则不变）。
|
||||
//
|
||||
// M90：可见性从 `mod` 放到 `pub(crate) mod` —— 页面层（`src/pages/**`）要**用**真组件
|
||||
// （`components::buttons` / `navigation` / `divider`），而 `app` 不是它的父模块。
|
||||
// 只放开 crate 内可见，组件目录的归属规则一字不改。
|
||||
#[path = "../components/mod.rs"]
|
||||
pub(crate) mod components;
|
||||
|
||||
/// 验收窗口尺寸（1180×760 @100% DPI —— D30 的硬要求）。
|
||||
pub const WINDOW_SIZE: iced::Size = iced::Size {
|
||||
width: 1180.0,
|
||||
height: 760.0,
|
||||
};
|
||||
|
||||
/// 产品名（自绘标题栏的标题；`'static` 好让 view 借用）。
|
||||
pub const APP_TITLE: &str = "Unlucky Launcher";
|
||||
|
||||
/// 窗口最小尺寸（再小骨架会挤坏：88 导航 + 页面留白 + 卡片）。
|
||||
const MIN_SIZE: iced::Size = iced::Size {
|
||||
width: 880.0,
|
||||
height: 560.0,
|
||||
};
|
||||
|
||||
/// 截图落盘的帧号（见模块文档）。
|
||||
const CAPTURE_AT_FRAME: u32 = 3;
|
||||
@@ -0,0 +1,189 @@
|
||||
//! 应用状态：**只放字段与构造**，不放消息分支（那是 [`super::update`] 的事）。
|
||||
//!
|
||||
//! ## presenter 三件（`crates/presenter/src/lib.rs` crate 文档 §4）
|
||||
//!
|
||||
//! | 字段 | 谁给 | 干什么 |
|
||||
//! |---|---|---|
|
||||
//! | `backend: Box<dyn Backend>` | [`build_backend`](unlucky_presenter::backend::build_backend) | 派发 [`AppCommand`](unlucky_presenter::dto::AppCommand)、收 [`AppEvent`](unlucky_presenter::dto::AppEvent) |
|
||||
//! | `bridge: SettingsBridge` | [`SettingsBridge::open`](unlucky_presenter::settings_bridge::SettingsBridge::open) | 读一次外观/主题，之后每 N 拍问「文件变了吗」 |
|
||||
//! | `state: AppState` | [`AppState::new`](unlucky_presenter::state::AppState::new) | **唯一**的状态写入口（`apply` / `navigate`） |
|
||||
//!
|
||||
//! `view: pages::Model` 是**展示转换的缓存**：presenter 快照 → 页面要画的东西，每拍重建一次
|
||||
//! （presenter 文档的原话：「`self.view = ViewModel::from(&self.state)`」）。缓存成字段是为了让
|
||||
//! `view(&self)` 能只借 `&self`——iced 的 `view` 签名不允许返回一棵借用局部变量的树。
|
||||
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::OnceLock;
|
||||
use std::time::Instant;
|
||||
|
||||
use iced::window;
|
||||
|
||||
use unlucky_design::color::SchemeFlavor;
|
||||
use unlucky_presenter::backend::{build_backend, AppOptions};
|
||||
use unlucky_presenter::dto::Backend;
|
||||
use unlucky_presenter::prefs::ThemeMode;
|
||||
use unlucky_presenter::settings_bridge::SettingsBridge;
|
||||
use unlucky_presenter::state::AppState;
|
||||
|
||||
use crate::cli::Options;
|
||||
use crate::pages;
|
||||
use crate::theme::{Families, Ui};
|
||||
|
||||
use super::WINDOW_SIZE;
|
||||
|
||||
/// presenter 的 TICK 节拍（33 ms ≈ 30 fps）。
|
||||
///
|
||||
/// 与 Slint 版的 `TICK_MS` 同值：`backend.tick(..)` 的时间推进、toast 过期、
|
||||
/// `theme::config_poll_due` 的计数都按这个节拍走，两个 UI 版的时间语义因此一致。
|
||||
pub(super) const TICK: std::time::Duration = std::time::Duration::from_millis(33);
|
||||
|
||||
/// 进程内「run() 开始」的时刻（首帧耗时基线）。
|
||||
pub(super) static STARTED: OnceLock<Instant> = OnceLock::new();
|
||||
/// 首帧日志只打一次。
|
||||
pub(super) static FIRST_FRAME_LOGGED: AtomicBool = AtomicBool::new(false);
|
||||
|
||||
/// 应用状态：UI 状态 + presenter 三件 + 展示转换缓存。
|
||||
pub struct App {
|
||||
/// 启动参数（截图/主题/画面开关）。
|
||||
pub(super) options: Options,
|
||||
/// 字体族（切主题时重建 [`Ui`] 要用）。
|
||||
pub(super) families: Families,
|
||||
/// 令牌求值器（浅/深两套）。
|
||||
pub(super) ui: Ui,
|
||||
/// 后端通道（真 host 或 mock）。
|
||||
pub(super) backend: Box<dyn Backend>,
|
||||
/// 设置持久化桥。
|
||||
pub(super) bridge: SettingsBridge,
|
||||
/// presenter 的全局状态（唯一写入口是 `apply`）。
|
||||
pub(super) state: AppState,
|
||||
/// 已推进的拍数（`theme::config_poll_due` 的输入）。
|
||||
pub(super) ticks: u64,
|
||||
/// 上一次推进节拍的时刻（节拍由帧事件驱动，按真实流逝时间累加）。
|
||||
pub(super) last_tick: Instant,
|
||||
/// 窗口宽度（布局档位的判据；交互模式跟着 resize 事件走）。
|
||||
pub(super) width: f32,
|
||||
/// 展示转换缓存（presenter 快照 → 页面视图模型）。
|
||||
pub(super) view: pages::Model,
|
||||
/// 窗口句柄（`window::latest()` 之后才有）。
|
||||
pub(super) window: Option<window::Id>,
|
||||
/// 已画的帧数（截图闸门用）。
|
||||
pub(super) frames: u32,
|
||||
/// 首屏快照到位后是否已经自动选中过第一行（list-detail 的桌面惯例，见 `update::auto_select`）。
|
||||
pub(super) auto_selected: bool,
|
||||
}
|
||||
|
||||
impl App {
|
||||
/// 生产构造：按启动参数选后端、打开设置桥。
|
||||
///
|
||||
/// **截图通道强制 mock**：出图要可复现（D30），真 host 会按本机盘上的实例清单画面，
|
||||
/// 同一份代码在两台机器上出不了同一张图。交互模式走真 host（数据根解析不出来时
|
||||
/// [`build_backend`] 自己退回 mock）。
|
||||
pub(super) fn new(options: Options, families: Families, flavor: SchemeFlavor) -> Self {
|
||||
let backend = build_backend(&app_options(&options));
|
||||
let bridge = SettingsBridge::open();
|
||||
Self::with_presenter(options, families, flavor, backend, bridge)
|
||||
}
|
||||
|
||||
/// 注入式构造（单测用：后端与桥都由调用方给，**不碰磁盘**）。
|
||||
pub(super) fn with_presenter(
|
||||
options: Options,
|
||||
families: Families,
|
||||
flavor: SchemeFlavor,
|
||||
backend: Box<dyn Backend>,
|
||||
bridge: SettingsBridge,
|
||||
) -> Self {
|
||||
let width = WINDOW_SIZE.width;
|
||||
let view = pages::Model::new(
|
||||
pages::Screen::Instances,
|
||||
width,
|
||||
Some(pages::Screen::Instances.nav()),
|
||||
);
|
||||
|
||||
Self {
|
||||
ui: Ui::new(flavor, families),
|
||||
families,
|
||||
options,
|
||||
backend,
|
||||
bridge,
|
||||
state: AppState::new(),
|
||||
ticks: 0,
|
||||
last_tick: Instant::now(),
|
||||
width,
|
||||
view,
|
||||
window: None,
|
||||
frames: 0,
|
||||
auto_selected: false,
|
||||
}
|
||||
}
|
||||
|
||||
/// 本次进程是否走截图通道。
|
||||
pub(super) fn has_screenshot(&self) -> bool {
|
||||
self.options.screenshot.is_some()
|
||||
}
|
||||
|
||||
/// 切主题：只重建 [`Ui`]（= 重建 Style），**不动任何 UI 状态**。
|
||||
pub(super) fn set_flavor(&mut self, flavor: SchemeFlavor) {
|
||||
if self.ui.flavor() == flavor {
|
||||
return;
|
||||
}
|
||||
|
||||
let next = Ui::new(flavor, self.families);
|
||||
eprintln!(
|
||||
"[theme] {} -> {} (Theme::name 变化触发缓存重算)",
|
||||
self.ui.name(),
|
||||
next.name()
|
||||
);
|
||||
self.ui = next;
|
||||
}
|
||||
|
||||
/// 把 presenter 的快照转换成页面视图模型（**展示转换在 UI 侧做**）。
|
||||
pub(super) fn refresh_view(&mut self) {
|
||||
self.view = super::view::model(&self.state, self.width);
|
||||
}
|
||||
|
||||
/// 按设置文件里的主题模式切一次外观；`--theme` 显式给了就不动。
|
||||
///
|
||||
/// **截图通道直接跳过**：`--screenshot` 的主题唯一取值口是 `Options::capture_flavor`
|
||||
/// （D30 可复现），读本机 `launcher.json` 会让同一份代码在两台机器上出不同的图。
|
||||
///
|
||||
/// `ThemeMode::Auto` 不在这里处理：那要看系统主题（`iced::system::theme()` 的结果在
|
||||
/// `Message::SystemTheme` 里落地）。
|
||||
pub(super) fn apply_config_theme(&mut self) {
|
||||
if self.has_screenshot() || self.options.theme.is_some() {
|
||||
return;
|
||||
}
|
||||
match self.bridge.load().1 {
|
||||
ThemeMode::Light => self.set_flavor(SchemeFlavor::Light),
|
||||
ThemeMode::Dark => self.set_flavor(SchemeFlavor::Dark),
|
||||
ThemeMode::Auto => {}
|
||||
}
|
||||
}
|
||||
|
||||
/// 当前令牌求值器（测试与截图日志用）。
|
||||
pub(super) fn ui(&self) -> &Ui {
|
||||
&self.ui
|
||||
}
|
||||
}
|
||||
|
||||
/// 启动参数 → presenter 的后端选项。
|
||||
fn app_options(options: &Options) -> AppOptions {
|
||||
AppOptions {
|
||||
// `--data-dir`：M90 起**真的消费**它（此前是「接受并忽略」的翻牌兼容参数）。
|
||||
// 截图通道强制 mock，所以 CI 冒烟那条 `--data-dir <tmp>` 不会往那个目录写东西。
|
||||
data_root: options.data_dir.clone(),
|
||||
mock: options.screenshot.is_some(),
|
||||
}
|
||||
}
|
||||
|
||||
/// 首帧耗时日志（只在第一次 `view()` 打一行）。
|
||||
pub(super) fn log_first_frame() {
|
||||
if FIRST_FRAME_LOGGED.swap(true, Ordering::Relaxed) {
|
||||
return;
|
||||
}
|
||||
if let Some(started) = STARTED.get() {
|
||||
eprintln!(
|
||||
"[boot] first frame in {:.0} ms（run() 开始 → 首次 view，含后端探测与字体扫描）",
|
||||
started.elapsed().as_secs_f64() * 1000.0
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
//! 订阅：帧事件（截图闸门 + presenter 的 TICK 节拍）与窗口尺寸事件。
|
||||
//!
|
||||
//! ## 为什么节拍挂在帧事件上，而不是 `iced::time::every`
|
||||
//!
|
||||
//! `iced::time::every` 只有 `tokio` / `smol` 两个异步后端提供；本 crate 关掉了 iced 的默认 features，
|
||||
//! 执行器是 `thread-pool`（M60 踩坑 Q2），拿不到那个函数。想用它就得改 `Cargo.toml` 开一个异步
|
||||
//! 运行时（不在本 mission 的 scope 内，已报 finding）。
|
||||
//!
|
||||
//! 所以节拍走**帧事件 + 时间闸门**：`window::frames()` 每帧给一条 `Frame`，app 侧按真实流逝时间
|
||||
//! 判断「够不够 33 ms」，够了才推进一拍 presenter（`backend.tick(elapsed)` / `drain_events`）。
|
||||
//! 好处是**按真实时间推进**（不是「数了多少帧 × 33 ms」，掉帧也不会把游戏启动进度拖慢），
|
||||
//! 代价是交互模式下窗口会持续重绘（30 帧的活干在 vsync 的节拍上）。
|
||||
//!
|
||||
//! 截图模式下这条订阅原本就在（第 3 帧落盘），合并之后两条路径共用同一个计时器。
|
||||
|
||||
use iced::{window, Subscription};
|
||||
|
||||
use super::message::Message;
|
||||
use super::state::App;
|
||||
|
||||
impl App {
|
||||
/// 本次进程的订阅表。
|
||||
pub(super) fn subscription(&self) -> Subscription<Message> {
|
||||
let mut subscriptions = vec![window::frames().map(|_| Message::Frame)];
|
||||
|
||||
// 断点 600 / 840 要跟着真窗口宽度走；截图模式的窗口尺寸由参数钉死，不吃 resize。
|
||||
if !self.has_screenshot() {
|
||||
subscriptions.push(window::events().map(|(_, event)| Message::Window(event)));
|
||||
}
|
||||
|
||||
Subscription::batch(subscriptions)
|
||||
}
|
||||
|
||||
/// 是否订阅帧事件（= 截图模式要帧数闸门）。
|
||||
pub(super) fn wants_frames(&self) -> bool {
|
||||
self.has_screenshot()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,263 @@
|
||||
//! `app` 的单测：主题切换、窗口尺寸、截图闸门、gallery 能构图，以及**presenter 接线的闭环**。
|
||||
//!
|
||||
//! 闭环测试用的是 `MockBackend`（presenter 自带的假后端）：它走的是与真 host 完全相同的
|
||||
//! `dispatch → drain_events → AppState::apply → 视图模型` 通道，所以「点 Play → 状态真的变」
|
||||
//! 这件事在这里就能判死，不必等图形环境。
|
||||
|
||||
use unlucky_design::color::SchemeFlavor;
|
||||
use unlucky_presenter::mock::MockBackend;
|
||||
use unlucky_presenter::router::Route;
|
||||
use unlucky_presenter::settings_bridge::SettingsBridge;
|
||||
|
||||
use super::message::Message;
|
||||
use super::state::App;
|
||||
use super::{APP_TITLE, WINDOW_SIZE};
|
||||
use crate::cli::{Options, Screen};
|
||||
use crate::pages;
|
||||
use crate::theme::Families;
|
||||
|
||||
const FAMILIES: Families = Families {
|
||||
text: "Segoe UI",
|
||||
display: "Segoe UI",
|
||||
mono: "Consolas",
|
||||
};
|
||||
|
||||
/// 不碰磁盘的 App（mock 后端 + 内存设置桥）。
|
||||
fn headless(options: Options, flavor: SchemeFlavor) -> App {
|
||||
App::with_presenter(
|
||||
options,
|
||||
FAMILIES,
|
||||
flavor,
|
||||
Box::new(MockBackend::new()),
|
||||
SettingsBridge::memory_only(),
|
||||
)
|
||||
}
|
||||
|
||||
fn screenshot_options() -> Options {
|
||||
Options {
|
||||
screenshot: Some(std::path::PathBuf::from("x.png")),
|
||||
..Options::default()
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn switching_flavor_rebuilds_styles_but_keeps_ui_state() {
|
||||
let mut app = headless(Options::default(), SchemeFlavor::Light);
|
||||
app.state.navigate(Route::Logs);
|
||||
app.refresh_view();
|
||||
assert_eq!(app.ui().name(), "ull-m3-light");
|
||||
|
||||
app.set_flavor(SchemeFlavor::Dark);
|
||||
|
||||
assert_eq!(app.ui().name(), "ull-m3-dark", "切主题要换主题名");
|
||||
assert_eq!(app.state.route(), &Route::Logs, "切主题不许重置 UI 状态");
|
||||
assert_eq!(app.view.screen, pages::Screen::Logs, "视图模型跟着路由");
|
||||
assert!(app.options.screenshot.is_none(), "切主题不许改启动参数");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn window_size_is_the_acceptance_size() {
|
||||
assert_eq!((WINDOW_SIZE.width, WINDOW_SIZE.height), (1180.0, 760.0));
|
||||
assert_eq!(APP_TITLE, "Unlucky Launcher");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn screenshot_mode_never_waits_for_the_system_theme() {
|
||||
// 门禁依赖：CI 的 runtime-smoke 不带主题，xvfb 里也没有主题会话。
|
||||
let options = screenshot_options();
|
||||
assert!(!options.wants_system_theme(), "截图模式不许等系统主题");
|
||||
assert_eq!(options.capture_flavor(), Some(SchemeFlavor::Light));
|
||||
|
||||
let app = headless(options, SchemeFlavor::Light);
|
||||
assert!(app.has_screenshot() && app.ui().name() == "ull-m3-light");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn gallery_screen_builds_a_tree() {
|
||||
assert_eq!(Options::default().screen, Screen::Shell, "默认仍是产品骨架");
|
||||
let options = Options {
|
||||
screen: Screen::Gallery,
|
||||
..Options::default()
|
||||
};
|
||||
let app = headless(options, SchemeFlavor::Light);
|
||||
// 真实像素由 `--screen=gallery --screenshot` 出图 + `gallery::probe` 量
|
||||
let _ = app.view();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn frames_are_only_requested_in_screenshot_mode() {
|
||||
let mut app = headless(Options::default(), SchemeFlavor::Light);
|
||||
assert!(!app.wants_frames(), "普通运行不订阅帧，避免每帧重绘");
|
||||
|
||||
app.options.screenshot = Some(std::path::PathBuf::from("x.png"));
|
||||
assert!(
|
||||
app.wants_frames(),
|
||||
"截图模式必须订阅帧事件才能在第 3 帧出图"
|
||||
);
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------- presenter 闭环
|
||||
|
||||
/// **首屏快照在 Boot 就到位**（截图在第 3 帧落盘，等 30 fps 的 tick 会拍进空页面）。
|
||||
#[test]
|
||||
fn boot_drains_the_first_snapshot_before_the_first_frame() {
|
||||
let mut app = headless(screenshot_options(), SchemeFlavor::Light);
|
||||
assert!(app.view.instances.rows.is_empty(), "还没 Boot");
|
||||
|
||||
let _ = app.update(Message::Boot);
|
||||
|
||||
assert_eq!(
|
||||
app.view.instances.rows.len(),
|
||||
4,
|
||||
"mock 的四个实例已进视图模型"
|
||||
);
|
||||
assert_eq!(app.view.screen, pages::Screen::Instances);
|
||||
}
|
||||
|
||||
/// 首屏自动选中第一行（右栏不该开局空白），且**只做一次**：返回列表后再刷新不弹回详情。
|
||||
#[test]
|
||||
fn the_first_snapshot_selects_the_first_instance_once() {
|
||||
let mut app = headless(screenshot_options(), SchemeFlavor::Light);
|
||||
let _ = app.update(Message::Boot);
|
||||
assert_eq!(
|
||||
app.state.route(),
|
||||
&Route::Detail("survival".to_string()),
|
||||
"首屏快照到位后自动选中第一行"
|
||||
);
|
||||
|
||||
let _ = app.update(Message::Page(pages::Message::Navigate(Route::Instances)));
|
||||
assert_eq!(app.state.route(), &Route::Instances);
|
||||
|
||||
// 再推进一拍（会 drain_events + auto_select）：不该把他弹回详情页
|
||||
app.advance(super::state::TICK);
|
||||
assert_eq!(app.state.route(), &Route::Instances, "自动选中只做一次");
|
||||
}
|
||||
|
||||
/// **点 Play → 命令真的派发出去 → 事件回流 → 页面真的变**（不做乐观回显）。
|
||||
#[test]
|
||||
fn launching_goes_through_the_backend_and_comes_back_as_events() {
|
||||
let mut app = headless(screenshot_options(), SchemeFlavor::Light);
|
||||
let _ = app.update(Message::Boot);
|
||||
let _ = app.update(Message::Page(pages::Message::Navigate(Route::Detail(
|
||||
"survival".to_string(),
|
||||
))));
|
||||
|
||||
let detail = app.view.instances.detail.as_ref().expect("有选中项");
|
||||
assert!(
|
||||
detail.can_launch && !detail.can_stop,
|
||||
"空闲：可启动不可停止"
|
||||
);
|
||||
|
||||
let _ = app.update(Message::Page(pages::Message::Launch(
|
||||
"survival".to_string(),
|
||||
)));
|
||||
|
||||
let detail = app.view.instances.detail.as_ref().expect("有选中项");
|
||||
assert!(
|
||||
!detail.can_launch && detail.can_stop,
|
||||
"派发 LaunchInstance 后后端发回了 Busy 事件：按钮组合必须已经翻转"
|
||||
);
|
||||
assert_eq!(
|
||||
detail.status.as_deref(),
|
||||
Some("Downloading · 0%"),
|
||||
"状态行来自事件里的进度，不是本地假造"
|
||||
);
|
||||
}
|
||||
|
||||
/// 时间推进真的把状态往前推（后端的脚本按 tick 的累计时长走）。
|
||||
#[test]
|
||||
fn ticks_advance_the_backend_script() {
|
||||
let mut app = headless(screenshot_options(), SchemeFlavor::Light);
|
||||
let _ = app.update(Message::Boot);
|
||||
let _ = app.update(Message::Page(pages::Message::Navigate(Route::Detail(
|
||||
"survival".to_string(),
|
||||
))));
|
||||
let _ = app.update(Message::Page(pages::Message::Launch(
|
||||
"survival".to_string(),
|
||||
)));
|
||||
|
||||
// 33 ms × 50 ≈ 1.65 s：mock 的脚本在 1.5 s 从 Download 切到 Verify
|
||||
for _ in 0..50 {
|
||||
app.advance(super::state::TICK);
|
||||
}
|
||||
|
||||
let detail = app.view.instances.detail.as_ref().expect("有选中项");
|
||||
let status = detail.status.as_deref().unwrap_or_default();
|
||||
assert!(
|
||||
status.starts_with("Verifying") || status.starts_with("Starting"),
|
||||
"50 拍之后应已过下载阶段，实际 {status:?}"
|
||||
);
|
||||
}
|
||||
|
||||
/// 停止也是真命令：`StopInstance` 让 mock 直接回一条 Idle 事件。
|
||||
#[test]
|
||||
fn stopping_returns_to_idle_through_an_event() {
|
||||
let mut app = headless(screenshot_options(), SchemeFlavor::Light);
|
||||
let _ = app.update(Message::Boot);
|
||||
let _ = app.update(Message::Page(pages::Message::Navigate(Route::Detail(
|
||||
"survival".to_string(),
|
||||
))));
|
||||
let _ = app.update(Message::Page(pages::Message::Launch(
|
||||
"survival".to_string(),
|
||||
)));
|
||||
let _ = app.update(Message::Page(pages::Message::Stop("survival".to_string())));
|
||||
|
||||
let detail = app.view.instances.detail.as_ref().expect("有选中项");
|
||||
assert!(detail.can_launch && !detail.can_stop, "停下来回到空闲");
|
||||
assert!(detail.status.is_none(), "空闲没有状态行");
|
||||
}
|
||||
|
||||
/// 导航：一级页替换、详情压栈、返回出栈——页面换的是 `Route`，不是页面自己的选中项。
|
||||
#[test]
|
||||
fn navigation_follows_the_presenter_router() {
|
||||
let mut app = headless(screenshot_options(), SchemeFlavor::Light);
|
||||
let _ = app.update(Message::Boot);
|
||||
|
||||
let _ = app.update(Message::Page(pages::Message::Navigate(Route::Detail(
|
||||
"survival".to_string(),
|
||||
))));
|
||||
assert_eq!(app.view.screen, pages::Screen::Instances, "详情仍是实例页");
|
||||
assert!(app.state.router.can_go_back());
|
||||
|
||||
let _ = app.update(Message::Page(pages::Message::Navigate(Route::Settings)));
|
||||
assert_eq!(app.view.screen, pages::Screen::Settings);
|
||||
assert_eq!(
|
||||
app.view.active,
|
||||
Some(pages::Screen::Settings.nav()),
|
||||
"导航轨高亮跟着路由走"
|
||||
);
|
||||
assert!(
|
||||
!app.state.router.can_go_back(),
|
||||
"一级页互相替换，不进栈（presenter::router 的语义）"
|
||||
);
|
||||
|
||||
let _ = app.update(Message::Page(pages::Message::Navigate(Route::Instances)));
|
||||
assert_eq!(app.view.screen, pages::Screen::Instances);
|
||||
}
|
||||
|
||||
/// 视图模型跟着窗口宽度走（交互模式下 600 / 840 两条断点靠 resize 事件生效）。
|
||||
#[test]
|
||||
fn resizing_the_window_rebuilds_the_view_model() {
|
||||
let mut app = headless(Options::default(), SchemeFlavor::Light);
|
||||
let _ = app.update(Message::Boot);
|
||||
|
||||
let _ = app.update(Message::Window(iced::window::Event::Resized(
|
||||
iced::Size::new(1180.0, 760.0),
|
||||
)));
|
||||
assert!((app.view.window_width - 1180.0).abs() < f32::EPSILON);
|
||||
|
||||
let _ = app.update(Message::Window(iced::window::Event::Resized(
|
||||
iced::Size::new(700.0, 600.0),
|
||||
)));
|
||||
assert!((app.view.window_width - 700.0).abs() < f32::EPSILON);
|
||||
// 页面照旧能构图（窄窗退化到单列，不 panic）
|
||||
let _ = app.view();
|
||||
}
|
||||
|
||||
/// 截图模式不读设置文件里的主题（D30 可复现：两台机器出同一张图）。
|
||||
#[test]
|
||||
fn screenshot_mode_ignores_the_settings_file_theme() {
|
||||
let mut app = headless(screenshot_options(), SchemeFlavor::Light);
|
||||
app.apply_config_theme();
|
||||
assert_eq!(app.ui().name(), "ull-m3-light", "截图模式的主题只认命令行");
|
||||
}
|
||||
@@ -0,0 +1,245 @@
|
||||
//! `update`：消息分支的**唯一**落点（含「用户动作 → 后端指令」的派发与事件回流）。
|
||||
//!
|
||||
//! ## 数据流的三个入口（presenter crate 文档 §2）
|
||||
//!
|
||||
//! ```text
|
||||
//! 用户动作 ──dispatch(AppCommand)──► backend ──► drain_events() ──► AppState::apply ──► 视图模型
|
||||
//! ▲ ▲
|
||||
//! └── pages::Message（导航/启动/停止）──────────────────┘ Frame + 33 ms 时间闸门
|
||||
//! ```
|
||||
//!
|
||||
//! 三条纪律：
|
||||
//!
|
||||
//! 1. **不做乐观回显**：点了「Play」不改本地状态，等 `InstanceRuntimeChanged` 事件回来才变
|
||||
//! （否则事件与本地状态打架时，磁贴与进度条会各说一套）；
|
||||
//! 2. **状态只有一个写入口**：`AppState::apply`（事件）与 `AppState::navigate`（路由）；
|
||||
//! 3. **每拍重建视图模型**：`refresh_view()` 是快照 → 页面的唯一转换点。
|
||||
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use iced::{window, Task};
|
||||
|
||||
use unlucky_design::color::SchemeFlavor;
|
||||
use unlucky_presenter::dto::AppCommand;
|
||||
use unlucky_presenter::router::Route;
|
||||
use unlucky_presenter::theme::config_poll_due;
|
||||
|
||||
use crate::pages;
|
||||
|
||||
use super::message::{route_of, Message};
|
||||
use super::state::{App, TICK};
|
||||
use super::CAPTURE_AT_FRAME;
|
||||
|
||||
impl App {
|
||||
/// 一条消息进来，改状态并返回后续任务。
|
||||
pub(super) fn update(&mut self, message: Message) -> Task<Message> {
|
||||
match message {
|
||||
Message::Boot => self.on_boot(),
|
||||
Message::WindowReady(id) => {
|
||||
self.window = id;
|
||||
Task::none()
|
||||
}
|
||||
Message::SystemTheme(mode) => {
|
||||
let flavor = match mode {
|
||||
iced::theme::Mode::Dark => SchemeFlavor::Dark,
|
||||
iced::theme::Mode::None | iced::theme::Mode::Light => SchemeFlavor::Light,
|
||||
};
|
||||
eprintln!("[theme] 系统主题 = {mode:?}");
|
||||
self.set_flavor(flavor);
|
||||
Task::none()
|
||||
}
|
||||
Message::Frame => self.on_frame(),
|
||||
Message::Window(event) => {
|
||||
if let window::Event::Resized(size) = event {
|
||||
self.width = size.width;
|
||||
self.refresh_view();
|
||||
}
|
||||
Task::none()
|
||||
}
|
||||
Message::Page(message) => {
|
||||
self.on_page(message);
|
||||
Task::none()
|
||||
}
|
||||
// 外壳导航轨（`src/shell/nav.rs`）发来的点选：翻成同一次路由跳转
|
||||
Message::Select(nav) => {
|
||||
self.state.navigate(route_of(nav));
|
||||
self.refresh_view();
|
||||
Task::none()
|
||||
}
|
||||
Message::DragWindow => match self.window {
|
||||
Some(id) => window::drag(id),
|
||||
None => Task::none(),
|
||||
},
|
||||
Message::ResizeStart(direction) => match self.window {
|
||||
Some(id) => window::drag_resize(id, direction),
|
||||
None => Task::none(),
|
||||
},
|
||||
Message::Minimize => match self.window {
|
||||
Some(id) => window::minimize(id, true),
|
||||
None => Task::none(),
|
||||
},
|
||||
Message::ToggleMaximize => match self.window {
|
||||
Some(id) => window::toggle_maximize(id),
|
||||
None => Task::none(),
|
||||
},
|
||||
Message::Close => iced::exit(),
|
||||
Message::Captured(screenshot) => self.on_captured(&screenshot),
|
||||
Message::Demo(message) => {
|
||||
// gallery 只是 harness：按下只打日志，不接业务（组件库要能脱离业务验收）
|
||||
eprintln!("[gallery] {} pressed", message.id());
|
||||
Task::none()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 启动：问窗口句柄 → 让后端发布首屏快照 → 决定主题。
|
||||
///
|
||||
/// **首屏快照在 `Boot` 就抽干**（不是等第一拍）：截图通道在第 3 帧落盘，33 ms 的节拍
|
||||
/// 未必来得及到达，等节拍会把空页面拍进图里。
|
||||
fn on_boot(&mut self) -> Task<Message> {
|
||||
let mut tasks = vec![window::latest().map(Message::WindowReady)];
|
||||
|
||||
// 主题优先级：显式 `--theme` / `--screenshot-theme` > 设置文件 > 系统。
|
||||
// 截图通道**不读设置文件**（D30 可复现：同一份代码在两台机器上要出同一张图）。
|
||||
self.apply_config_theme();
|
||||
|
||||
// 交互模式且没显式指定主题 → 探系统；截图模式永不等（见 cli 模块文档）
|
||||
if self.options.wants_system_theme() {
|
||||
tasks.push(iced::system::theme().map(Message::SystemTheme));
|
||||
}
|
||||
|
||||
// 「重新扫描实例目录 + 全部页面快照」：真 host 在这里发首批事件，mock 在构造时已预置
|
||||
self.dispatch(AppCommand::RefreshAll);
|
||||
self.auto_select();
|
||||
self.refresh_view();
|
||||
|
||||
Task::batch(tasks)
|
||||
}
|
||||
|
||||
/// 一帧画完：①够 33 ms 就推进一拍 presenter ②截图模式在第 [`CAPTURE_AT_FRAME`] 帧出图。
|
||||
///
|
||||
/// 时间闸门按**真实流逝时间**判（不是数帧）：掉帧不会把游戏启动进度拖慢，
|
||||
/// 也不会在慢机器上把 1.5 s 的下载阶段拉成 4 s。
|
||||
fn on_frame(&mut self) -> Task<Message> {
|
||||
self.frames += 1;
|
||||
|
||||
let now = Instant::now();
|
||||
let elapsed = now.saturating_duration_since(self.last_tick);
|
||||
if elapsed >= TICK {
|
||||
self.last_tick = now;
|
||||
self.advance(elapsed);
|
||||
}
|
||||
|
||||
// 主题在启动时就已确定（截图模式必有主题，见 cli 模块文档），这里只剩帧数闸门
|
||||
if !self.wants_frames() || self.frames < CAPTURE_AT_FRAME {
|
||||
return Task::none();
|
||||
}
|
||||
match self.window {
|
||||
Some(id) => window::screenshot(id).map(Message::Captured),
|
||||
None => Task::none(),
|
||||
}
|
||||
}
|
||||
|
||||
/// 推进一拍：后端消化时间 → 抽干事件 → 过期 toast → 偶发重读配置文件。
|
||||
///
|
||||
/// `elapsed` 是真实流逝时间（毫秒级抖动是正常的：`MockBackend` 的脚本按累计时长走）。
|
||||
pub(super) fn advance(&mut self, elapsed: Duration) {
|
||||
self.backend.tick(elapsed);
|
||||
self.pump();
|
||||
|
||||
self.state
|
||||
.toasts
|
||||
.expire(u64::try_from(elapsed.as_millis()).unwrap_or(u64::MAX));
|
||||
self.ticks += 1;
|
||||
|
||||
// 外部（AI / CLI）改了配置文件：主题跟着换，其余外观项等玻璃/背景 mission。
|
||||
// 截图通道不轮询（D30 可复现），所以整条判断短路在 `has_screenshot` 上。
|
||||
let reloaded = !self.has_screenshot()
|
||||
&& config_poll_due(self.ticks)
|
||||
&& self.bridge.reload_if_changed().is_some();
|
||||
if reloaded {
|
||||
eprintln!("[settings] 配置文件变了，重读主题");
|
||||
self.apply_config_theme();
|
||||
}
|
||||
|
||||
self.refresh_view();
|
||||
}
|
||||
|
||||
/// 页面消息：导航走路由栈，动作翻成 `AppCommand`。
|
||||
fn on_page(&mut self, message: pages::Message) {
|
||||
match message {
|
||||
pages::Message::Navigate(route) => {
|
||||
self.state.navigate(route);
|
||||
self.refresh_view();
|
||||
}
|
||||
pages::Message::Launch(id) => self.dispatch(AppCommand::LaunchInstance(id)),
|
||||
pages::Message::Stop(id) => self.dispatch(AppCommand::StopInstance(id)),
|
||||
// 还没接后端的占位动作：只打日志（哪几个、为什么，见 pages 模块文档的偏离登记）
|
||||
pages::Message::Action(action) => {
|
||||
eprintln!("[page] 占位动作 {action:?} pressed（没有对应 AppCommand）");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 派发一条指令并**立刻**抽干它带出来的事件（不本地回显，等价于 Slint 版的 `dispatch`）。
|
||||
fn dispatch(&mut self, command: AppCommand) {
|
||||
self.backend.dispatch(command);
|
||||
self.pump();
|
||||
}
|
||||
|
||||
/// 抽干事件队列并逐条 `apply`（**唯一**的状态写入口）。
|
||||
pub(super) fn pump(&mut self) {
|
||||
let events = self.backend.drain_events();
|
||||
if events.is_empty() {
|
||||
return;
|
||||
}
|
||||
for event in events {
|
||||
self.state.apply(event);
|
||||
}
|
||||
self.auto_select();
|
||||
self.refresh_view();
|
||||
}
|
||||
|
||||
/// 首屏快照到位后**自动选中第一行**（桌面 list-detail 的惯例：右栏不该开局就是空的）。
|
||||
///
|
||||
/// 只做一次：用户点「返回」回到列表后，再刷新实例列表也不会把他弹回详情页。
|
||||
/// 选中这件事走的是 `AppState::navigate`（路由栈），不是本地选中字段——于是「当前选中」
|
||||
/// 永远等于「路由栈顶」，用户点返回时栈语义自然成立。
|
||||
fn auto_select(&mut self) {
|
||||
if self.auto_selected || self.state.route() != &Route::Instances {
|
||||
return;
|
||||
}
|
||||
let Some(first) = self
|
||||
.state
|
||||
.tiles()
|
||||
.first()
|
||||
.map(|cell| cell.instance.id.clone())
|
||||
else {
|
||||
return;
|
||||
};
|
||||
self.auto_selected = true;
|
||||
self.state.navigate(Route::Detail(first));
|
||||
}
|
||||
|
||||
/// 截图回来了：落盘 + 打一行取证日志，然后退出。
|
||||
fn on_captured(&mut self, screenshot: &window::Screenshot) -> Task<Message> {
|
||||
let Some(path) = self.options.screenshot.clone() else {
|
||||
return Task::none();
|
||||
};
|
||||
match crate::shot::save(screenshot, &path) {
|
||||
Ok(summary) => {
|
||||
eprintln!("{}", summary.describe());
|
||||
eprintln!(
|
||||
"[shot] screen={} theme={} renderer={} route={:?}",
|
||||
self.options.screen.name(),
|
||||
crate::shot::flavor_slug(&self.ui),
|
||||
self.options.backend.note(),
|
||||
self.state.route()
|
||||
);
|
||||
}
|
||||
Err(error) => eprintln!("[shot] 失败：{error}"),
|
||||
}
|
||||
|
||||
iced::exit()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,295 @@
|
||||
//! `view`：presenter 快照 → 页面视图模型 → 控件树。
|
||||
//!
|
||||
//! 展示转换（快照字段 → 显示文本/网格）**全部在这里**，页面层只认 [`pages::Model`]。
|
||||
|
||||
use iced::{Element, Theme};
|
||||
|
||||
use unlucky_presenter::dto::{InstanceRuntime, InstanceSummary, LaunchStage, LoaderKind};
|
||||
use unlucky_presenter::router::Route;
|
||||
use unlucky_presenter::state::AppState;
|
||||
|
||||
use crate::cli::Screen;
|
||||
use crate::pages::{self, Detail, Meta, Row};
|
||||
use crate::shell::{self, NavItem};
|
||||
|
||||
use super::message::Message;
|
||||
use super::state::{log_first_frame, App};
|
||||
use super::APP_TITLE;
|
||||
|
||||
impl App {
|
||||
/// 主题名（iced 只在 `Theme::name()` 变化时重算受主题影响的缓存）。
|
||||
pub(super) fn theme(&self) -> Theme {
|
||||
self.ui().theme()
|
||||
}
|
||||
|
||||
/// 窗口标题（自绘标题栏另画一份，这里是给系统/截图工具看的）。
|
||||
pub(super) fn title(&self) -> String {
|
||||
APP_TITLE.to_owned()
|
||||
}
|
||||
|
||||
/// 整棵树。
|
||||
pub(super) fn view(&self) -> Element<'_, Message> {
|
||||
log_first_frame();
|
||||
|
||||
// `--screen=gallery`：组件库 harness（D39 §5）。它用自己的 DemoMessage，
|
||||
// 这里只做一次 map，组件库与业务 Message 依然解耦。
|
||||
if self.options.screen == Screen::Gallery {
|
||||
return super::components::gallery::view(&self.ui).map(Message::Demo);
|
||||
}
|
||||
|
||||
match pages::Screen::of(self.state.route()) {
|
||||
Some(_) => pages::app(&self.ui, &self.view).map(Message::Page),
|
||||
// `Route::Agent`：AI 独立页还没有页面实现（P1），暂时回退到 M68 的外壳卡。
|
||||
// 这条回退也是 `src/shell/` 目前唯一的调用点——见报告里的「谁该补」。
|
||||
None => shell::view(
|
||||
&self.ui,
|
||||
NavItem::Ai,
|
||||
APP_TITLE,
|
||||
NavItem::Ai.label(),
|
||||
"The assistant page is not built yet (P1). Chat lives in the docked panel once \
|
||||
the AI mission lands; this screen is the M68 skeleton fallback.",
|
||||
self.options.force_state,
|
||||
),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------- 快照 → 视图模型
|
||||
|
||||
/// 把 presenter 的快照转成页面视图模型（**唯一**的展示转换点）。
|
||||
pub(super) fn model(state: &AppState, width: f32) -> pages::Model {
|
||||
let route = state.route().clone();
|
||||
let screen = pages::Screen::of(&route).unwrap_or(pages::Screen::Instances);
|
||||
|
||||
let rows: Vec<Row> = state
|
||||
.tiles()
|
||||
.into_iter()
|
||||
.map(|cell| Row {
|
||||
id: cell.instance.id.clone(),
|
||||
name: cell.instance.name.clone(),
|
||||
supporting: supporting_line(cell.instance),
|
||||
status: runtime_status(&cell.instance.runtime),
|
||||
})
|
||||
.collect();
|
||||
|
||||
let detail = match &route {
|
||||
Route::Detail(id) => state
|
||||
.instances
|
||||
.iter()
|
||||
.find(|instance| &instance.id == id)
|
||||
.map(detail_of),
|
||||
_ => None,
|
||||
};
|
||||
|
||||
pages::Model {
|
||||
screen,
|
||||
window_width: width,
|
||||
active: route.nav(),
|
||||
instances: pages::Instances { rows, detail },
|
||||
}
|
||||
}
|
||||
|
||||
/// 列表行的副文案：`1.20.4 · Fabric 0.16.5`（原版只写「原版」，见 `LoaderInfo::badge`）。
|
||||
fn supporting_line(instance: &InstanceSummary) -> String {
|
||||
format!("{} · {}", instance.mc_version, instance.loader.badge())
|
||||
}
|
||||
|
||||
/// 运行状态（列表行的 overline 与详情页的状态行共用一份文案）。
|
||||
fn runtime_status(runtime: &InstanceRuntime) -> Option<String> {
|
||||
match runtime {
|
||||
InstanceRuntime::Idle => None,
|
||||
InstanceRuntime::Busy { stage, progress } => Some(format!(
|
||||
"{} · {:.0}%",
|
||||
stage_label(*stage),
|
||||
progress.ratio() * 100.0
|
||||
)),
|
||||
InstanceRuntime::Running { pid } => Some(format!("Running · pid {pid}")),
|
||||
InstanceRuntime::Failed { reason } => Some(format!("Launch failed · {reason}")),
|
||||
}
|
||||
}
|
||||
|
||||
/// 阶段文案（英文基线；i18n mission 接手后统一走词表）。
|
||||
///
|
||||
/// 不复用 `LaunchStage::label()`：那是中文，而本 crate 的界面文案在 i18n 之前是英文基线
|
||||
/// （见 `pages/instances/data.rs` 的同一条理由：干净 CI 上没有中文字体）。
|
||||
fn stage_label(stage: LaunchStage) -> &'static str {
|
||||
match stage {
|
||||
LaunchStage::Download => "Downloading",
|
||||
LaunchStage::Verify => "Verifying",
|
||||
LaunchStage::Launch => "Starting",
|
||||
LaunchStage::Window => "Waiting for window",
|
||||
}
|
||||
}
|
||||
|
||||
/// 详情列的内容（字段全部来自 [`InstanceSummary`]）。
|
||||
fn detail_of(instance: &InstanceSummary) -> Detail {
|
||||
let loader = if instance.loader.kind == LoaderKind::Vanilla {
|
||||
"Vanilla".to_string()
|
||||
} else {
|
||||
instance.loader.badge()
|
||||
};
|
||||
|
||||
Detail {
|
||||
id: instance.id.clone(),
|
||||
name: instance.name.clone(),
|
||||
subtitle: supporting_line(instance),
|
||||
meta: vec![
|
||||
meta("VERSION", &instance.mc_version),
|
||||
meta("LOADER", &loader),
|
||||
meta("ISOLATION", &instance.isolation),
|
||||
meta("VERSION ID", &instance.version_id),
|
||||
meta(
|
||||
"FILES",
|
||||
if instance.version_present {
|
||||
"Present on disk"
|
||||
} else {
|
||||
"Missing"
|
||||
},
|
||||
),
|
||||
meta("LAST PLAYED", &last_played(instance.last_played.as_deref())),
|
||||
],
|
||||
// 真快照没有「正文描述」这种字段（偏离 #9）：演示数据才有正文段
|
||||
note: None,
|
||||
status: runtime_status(&instance.runtime),
|
||||
can_launch: matches!(
|
||||
instance.runtime,
|
||||
InstanceRuntime::Idle | InstanceRuntime::Failed { .. }
|
||||
),
|
||||
can_stop: matches!(
|
||||
instance.runtime,
|
||||
InstanceRuntime::Busy { .. } | InstanceRuntime::Running { .. }
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
fn meta(label: &str, value: &str) -> Meta {
|
||||
Meta {
|
||||
label: label.to_string(),
|
||||
value: value.to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// ISO-8601（`2026-10-29T19:22:00Z`）→ `2026-10-29 19:22 UTC`；`None` = 从未启动。
|
||||
///
|
||||
/// 只做切片不做时区换算：core 给的是 UTC，`Z` 就是它的时区；本地时区换算等 i18n/时间格式 mission。
|
||||
/// 非 ASCII 或长度不足时原样返回（不 panic、不猜）。
|
||||
pub(super) fn last_played(raw: Option<&str>) -> String {
|
||||
let Some(text) = raw else {
|
||||
return "Never".to_string();
|
||||
};
|
||||
match (text.get(0..10), text.get(11..16)) {
|
||||
(Some(date), Some(time)) if date.starts_with(|c: char| c.is_ascii_digit()) => {
|
||||
format!("{date} {time} UTC")
|
||||
}
|
||||
_ => text.to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use unlucky_presenter::dto::{InstanceSummary, LoaderInfo, LoaderKind, Progress};
|
||||
use unlucky_presenter::mock_data::mock_instances;
|
||||
|
||||
fn instance(runtime: InstanceRuntime) -> InstanceSummary {
|
||||
InstanceSummary {
|
||||
id: "survival".to_string(),
|
||||
name: "Survival".to_string(),
|
||||
mc_version: "1.20.4".to_string(),
|
||||
loader: LoaderInfo {
|
||||
kind: LoaderKind::Fabric,
|
||||
version: "0.16.5".to_string(),
|
||||
},
|
||||
last_played: Some("2026-10-29T19:22:00Z".to_string()),
|
||||
runtime,
|
||||
icon: None,
|
||||
isolation: "isolated".to_string(),
|
||||
version_id: "1.20.4".to_string(),
|
||||
version_present: true,
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_snapshot_becomes_the_page_model() {
|
||||
let mut state = AppState::new();
|
||||
state.apply(unlucky_presenter::dto::AppEvent::Core(
|
||||
unlucky_presenter::dto::CoreEvent::InstancesChanged(mock_instances()),
|
||||
));
|
||||
state.navigate(Route::Detail("survival".to_string()));
|
||||
|
||||
let model = model(&state, 1180.0);
|
||||
assert_eq!(model.screen, pages::Screen::Instances);
|
||||
assert_eq!(model.active, Some(pages::Screen::Instances.nav()));
|
||||
assert_eq!(model.window_width, 1180.0);
|
||||
assert_eq!(model.instances.rows.len(), 4, "mock 的四个实例");
|
||||
assert_eq!(model.instances.rows[0].id, "survival");
|
||||
|
||||
let detail = model.instances.detail.expect("路由是 Detail，要有详情");
|
||||
assert_eq!(detail.id, "survival");
|
||||
assert_eq!(detail.meta.len(), 6);
|
||||
assert!(detail.can_launch, "空闲实例可启动");
|
||||
assert!(!detail.can_stop);
|
||||
assert!(detail.note.is_none(), "真快照没有正文段");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_busy_instance_offers_stop_instead_of_play() {
|
||||
let mut state = AppState::new();
|
||||
state.apply(unlucky_presenter::dto::AppEvent::Core(
|
||||
unlucky_presenter::dto::CoreEvent::InstancesChanged(vec![instance(
|
||||
InstanceRuntime::Busy {
|
||||
stage: LaunchStage::Download,
|
||||
progress: Progress {
|
||||
done: 750,
|
||||
total: 1_500,
|
||||
},
|
||||
},
|
||||
)]),
|
||||
));
|
||||
state.navigate(Route::Detail("survival".to_string()));
|
||||
|
||||
let model = model(&state, 1180.0);
|
||||
assert_eq!(
|
||||
model.instances.rows[0].status.as_deref(),
|
||||
Some("Downloading · 50%")
|
||||
);
|
||||
let detail = model.instances.detail.expect("有详情");
|
||||
assert!(!detail.can_launch, "启动中不许再点 Play（不做乐观回显）");
|
||||
assert!(detail.can_stop, "启动中要能 Stop");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn failed_instances_can_be_retried() {
|
||||
let failed = instance(InstanceRuntime::Failed {
|
||||
reason: "exit 1".to_string(),
|
||||
});
|
||||
assert_eq!(
|
||||
runtime_status(&failed.runtime).as_deref(),
|
||||
Some("Launch failed · exit 1")
|
||||
);
|
||||
assert!(detail_of(&failed).can_launch, "失败后要能重试");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn timestamps_are_sliced_not_guessed() {
|
||||
assert_eq!(
|
||||
last_played(Some("2026-10-29T19:22:00Z")),
|
||||
"2026-10-29 19:22 UTC"
|
||||
);
|
||||
assert_eq!(last_played(None), "Never");
|
||||
// 短串 / 非 ASCII 原样返回（不 panic）
|
||||
assert_eq!(last_played(Some("2026-10")), "2026-10");
|
||||
assert_eq!(last_played(Some("昨天")), "昨天");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_agent_route_has_no_page() {
|
||||
let mut state = AppState::new();
|
||||
state.navigate(Route::Agent);
|
||||
let model = model(&state, 1180.0);
|
||||
// Agent 没有页面：模型退回实例页的空壳，view 会走外壳回退（`None` 分支）
|
||||
assert_eq!(pages::Screen::of(state.route()), None);
|
||||
assert!(model.instances.detail.is_none());
|
||||
assert_eq!(model.active, None, "AI 页不高亮任何导航项");
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user