From 50cc7df3e7c5b31eddcef9c4fd3de6861d322bf6 Mon Sep 17 00:00:00 2001 From: Zacharias Xenakis Date: Sun, 8 Nov 2026 17:30:03 +0200 Subject: [PATCH 1/4] refactor: group library modules into audio, display, tv, scene, fps and cli folders --- src/{ => audio}/audio_cli.rs | 6 +- src/{ => audio}/audio_control.rs | 2 +- src/{ => audio}/audio_devices.rs | 0 src/{audio.rs => audio/mod.rs} | 7 ++ src/{ => audio}/windows_audio.rs | 2 +- src/audio_relink_ui.rs | 5 +- src/backup.rs | 12 +- src/{ => cli}/cli_list.rs | 12 +- src/{ => cli}/cli_name.rs | 0 src/{cli.rs => cli/mod.rs} | 23 ++-- src/command_ui.rs | 2 +- src/current_ui.rs | 53 ++++----- src/diagnostics.rs | 2 +- src/{ => display}/display_apply.rs | 9 +- src/{ => display}/display_capabilities.rs | 24 ++-- src/{ => display}/display_cli.rs | 14 +-- src/{ => display}/display_detection.rs | 10 +- src/{ => display}/display_editor.rs | 33 +++--- src/{ => display}/display_mirroring.rs | 20 ++-- src/{ => display}/displays.rs | 2 +- src/display/mod.rs | 19 ++++ src/{ => display}/windows_display_apply.rs | 28 +++-- .../windows_display_detection.rs | 21 ++-- src/{ => display}/windows_display_modes.rs | 16 +-- src/{ => display}/windows_displays.rs | 4 +- src/{ => display}/windows_hdr.rs | 0 src/display_editor_ui.rs | 12 +- src/display_setup_ui.rs | 50 ++++----- src/display_ui.rs | 43 +++++--- src/{fps.rs => fps/mod.rs} | 2 + src/{ => fps}/windows_fps.rs | 4 +- src/fps_ui.rs | 13 ++- src/lib.rs | 76 +------------ src/library_flow.rs | 8 +- src/nav_guard.rs | 10 +- src/options_ui.rs | 2 +- src/preferences.rs | 8 +- src/preset_cards_preview.rs | 49 +++++---- src/preset_cards_ui.rs | 6 +- src/samsung_ui.rs | 16 +-- src/scene/mod.rs | 6 + src/{ => scene}/scene_session.rs | 0 src/{ => scene}/scenes.rs | 34 +++--- src/{ => scene}/starter.rs | 10 +- src/{ => scene}/windows_scenes.rs | 104 +++++++++--------- src/scene_editor_ui.rs | 4 +- src/scene_ui.rs | 61 +++++----- src/starter_ui.rs | 12 +- src/{ => tv}/android_tv.rs | 0 src/{ => tv}/lg_protocol.rs | 12 +- src/tv/mod.rs | 20 ++++ src/{ => tv}/samsung.rs | 42 +++---- src/{ => tv}/tv_cli.rs | 14 +-- src/{ => tv}/tv_control.rs | 6 +- src/{ => tv}/tv_input_guard.rs | 4 +- src/{ => tv}/tv_network.rs | 0 src/{ => tv}/tv_report.rs | 9 +- src/{ => tv}/tv_setup.rs | 8 +- src/{ => tv}/tvs.rs | 20 ++-- src/{ => tv}/windows_android_tv.rs | 33 +++--- src/{ => tv}/windows_lg.rs | 43 ++++---- src/{ => tv}/windows_samsung.rs | 18 +-- src/{ => tv}/windows_tv.rs | 84 +++++++------- src/tv_controls_ui.rs | 42 +++---- src/tv_power_state.rs | 2 +- src/tv_tip_ui.rs | 6 +- src/tv_ui.rs | 35 +++--- 67 files changed, 651 insertions(+), 603 deletions(-) rename src/{ => audio}/audio_cli.rs (97%) rename src/{ => audio}/audio_control.rs (99%) rename src/{ => audio}/audio_devices.rs (100%) rename src/{audio.rs => audio/mod.rs} (99%) rename src/{ => audio}/windows_audio.rs (99%) rename src/{ => cli}/cli_list.rs (98%) rename src/{ => cli}/cli_name.rs (100%) rename src/{cli.rs => cli/mod.rs} (90%) rename src/{ => display}/display_apply.rs (98%) rename src/{ => display}/display_capabilities.rs (94%) rename src/{ => display}/display_cli.rs (93%) rename src/{ => display}/display_detection.rs (98%) rename src/{ => display}/display_editor.rs (95%) rename src/{ => display}/display_mirroring.rs (95%) rename src/{ => display}/displays.rs (99%) create mode 100644 src/display/mod.rs rename src/{ => display}/windows_display_apply.rs (96%) rename src/{ => display}/windows_display_detection.rs (88%) rename src/{ => display}/windows_display_modes.rs (94%) rename src/{ => display}/windows_displays.rs (98%) rename src/{ => display}/windows_hdr.rs (100%) rename src/{fps.rs => fps/mod.rs} (99%) rename src/{ => fps}/windows_fps.rs (99%) create mode 100644 src/scene/mod.rs rename src/{ => scene}/scene_session.rs (100%) rename src/{ => scene}/scenes.rs (97%) rename src/{ => scene}/starter.rs (97%) rename src/{ => scene}/windows_scenes.rs (88%) rename src/{ => tv}/android_tv.rs (100%) rename src/{ => tv}/lg_protocol.rs (95%) create mode 100644 src/tv/mod.rs rename src/{ => tv}/samsung.rs (88%) rename src/{ => tv}/tv_cli.rs (85%) rename src/{ => tv}/tv_control.rs (99%) rename src/{ => tv}/tv_input_guard.rs (98%) rename src/{ => tv}/tv_network.rs (100%) rename src/{ => tv}/tv_report.rs (97%) rename src/{ => tv}/tv_setup.rs (96%) rename src/{ => tv}/tvs.rs (95%) rename src/{ => tv}/windows_android_tv.rs (95%) rename src/{ => tv}/windows_lg.rs (97%) rename src/{ => tv}/windows_samsung.rs (90%) rename src/{ => tv}/windows_tv.rs (55%) diff --git a/src/audio_cli.rs b/src/audio/audio_cli.rs similarity index 97% rename from src/audio_cli.rs rename to src/audio/audio_cli.rs index 98eaa06..28eb00e 100644 --- a/src/audio_cli.rs +++ b/src/audio/audio_cli.rs @@ -1,9 +1,9 @@ //! `director audio …`: live control of Windows audio devices. Saved sound belongs to scenes //! (their Sound step); these commands change one thing right away. use crate::{ + audio::audio_control::{self, Level, MuteChange}, + audio::windows_audio::{OperationLock, WindowsAudio}, audio::{AudioBackend, Output, Role}, - audio_control::{self, Level, MuteChange}, - windows_audio::{OperationLock, WindowsAudio}, }; const USAGE: &str = "Use: director audio list | outputs | inputs | status | check @@ -114,7 +114,7 @@ fn describe(device: &Output) -> String { format!( "{} ({}) · {}{}", device.name, - crate::cli_name::cli_name(&device.name), + crate::cli::cli_name::cli_name(&device.name), device .volume_percent .map_or("volume unknown".into(), |v| format!("{v}%")), diff --git a/src/audio_control.rs b/src/audio/audio_control.rs similarity index 99% rename from src/audio_control.rs rename to src/audio/audio_control.rs index b97d55b..e45f7b2 100644 --- a/src/audio_control.rs +++ b/src/audio/audio_control.rs @@ -3,7 +3,7 @@ //! confirm it. Scenes use `audio::apply`, which changes several things as one transaction. use crate::{ audio::{AudioBackend, DEFAULT_ROLES, Output, Result, Role}, - cli_name::cli_name, + cli::cli_name::cli_name, }; /// A volume change: an absolute percentage, or a step up or down from the current level. diff --git a/src/audio_devices.rs b/src/audio/audio_devices.rs similarity index 100% rename from src/audio_devices.rs rename to src/audio/audio_devices.rs diff --git a/src/audio.rs b/src/audio/mod.rs similarity index 99% rename from src/audio.rs rename to src/audio/mod.rs index b51454b..1815d81 100644 --- a/src/audio.rs +++ b/src/audio/mod.rs @@ -1,4 +1,11 @@ //! Device-independent audio transaction logic. GUI and COM types do not belong here. +#[cfg(windows)] +pub mod audio_cli; +pub mod audio_control; +#[cfg(windows)] +pub(crate) mod audio_devices; +#[cfg(windows)] +pub mod windows_audio; use serde::Serialize; pub type Result = std::result::Result; diff --git a/src/windows_audio.rs b/src/audio/windows_audio.rs similarity index 99% rename from src/windows_audio.rs rename to src/audio/windows_audio.rs index f3b2621..b8bd07e 100644 --- a/src/windows_audio.rs +++ b/src/audio/windows_audio.rs @@ -1,6 +1,6 @@ //! Direct Windows Core Audio access. All COM objects stay on their creating worker. +use crate::audio::audio_devices::{Identity, Inventory}; use crate::audio::{AudioBackend, Output, Result, Role}; -use crate::audio_devices::{Identity, Inventory}; use std::{ffi::c_void, marker::PhantomData, rc::Rc}; use windows::{ Win32::{ diff --git a/src/audio_relink_ui.rs b/src/audio_relink_ui.rs index 05059e0..76adf06 100644 --- a/src/audio_relink_ui.rs +++ b/src/audio_relink_ui.rs @@ -1,8 +1,9 @@ use crate::{DirectorApp, Message, work}; use director::{ audio::Output, - scenes, tvs, - windows_audio::{OperationLock, WindowsAudio}, + audio::windows_audio::{OperationLock, WindowsAudio}, + scene::scenes, + tv::tvs, }; use windows_reactor::*; diff --git a/src/backup.rs b/src/backup.rs index f9c75cf..b09d3d6 100644 --- a/src/backup.rs +++ b/src/backup.rs @@ -2,10 +2,10 @@ //! pairing keys stay on the PC. use crate::{ audio::AudioBackend as _, - displays, - scenes::{self, SoundOutput}, - windows_audio::{OperationLock, WindowsAudio}, - windows_scenes, + audio::windows_audio::{OperationLock, WindowsAudio}, + display::displays, + scene::scenes::{self, SoundOutput}, + scene::windows_scenes, }; use serde::{Deserialize, Serialize}; use std::{ @@ -145,7 +145,7 @@ pub fn preview(path: &Path) -> Result { issues.push(format!("{}{} · {error}", scene.name, context)); } } - if let Ok(live) = crate::windows_displays::capture() { + if let Ok(live) = crate::display::windows_displays::capture() { for preset in &backup.displays { for monitor in preset .layout @@ -261,7 +261,7 @@ mod tests { name: "Desk".into(), captured_at_unix_seconds: 0, confirm_changes: false, - layout: crate::display_apply::tests::layout(0), + layout: crate::display::display_apply::tests::layout(0), }; displays::save(&display_path, &[], std::slice::from_ref(&original)).unwrap(); diff --git a/src/cli_list.rs b/src/cli/cli_list.rs similarity index 98% rename from src/cli_list.rs rename to src/cli/cli_list.rs index 11aa0e8..23812e4 100644 --- a/src/cli_list.rs +++ b/src/cli/cli_list.rs @@ -1,11 +1,13 @@ //! `list` commands: every saved item and device with the CLI name that commands accept. //! Read-only; nothing here changes a setting. use crate::{ + audio::windows_audio::WindowsAudio, audio::{AudioBackend, Output}, - cli_name::cli_name, - displays, scenes, tvs, - windows_audio::WindowsAudio, - windows_displays, + cli::cli_name::cli_name, + display::displays, + display::windows_displays, + scene::scenes, + tv::tvs, }; use serde::Serialize; use serde_json::{Value, json}; @@ -198,7 +200,7 @@ fn row(name: &str, summary: String) -> Row { fn collect(category: Category) -> Result<(Vec, Value), String> { match category { Category::Scenes => { - let active = crate::scene_session::active(); + let active = crate::scene::scene_session::active(); let all = scenes::load(&scenes::path()?)?; let rows = all .iter() diff --git a/src/cli_name.rs b/src/cli/cli_name.rs similarity index 100% rename from src/cli_name.rs rename to src/cli/cli_name.rs diff --git a/src/cli.rs b/src/cli/mod.rs similarity index 90% rename from src/cli.rs rename to src/cli/mod.rs index 91450fc..f078c03 100644 --- a/src/cli.rs +++ b/src/cli/mod.rs @@ -1,4 +1,7 @@ //! Shared headless commands; does not initialize a GUI framework. +#[cfg(windows)] +pub mod cli_list; +pub mod cli_name; const HELP: &str = "Director — scenes, display presets, TVs, sound and FPS limits Commands take a CLI name: the item's name in lowercase with dashes, so \"Desk View\" is @@ -50,8 +53,10 @@ runs them without applying another scene."; /// `director list`, or ` list` and the other read-only lists, with an optional /// `--json`. -fn list_command(args: &[String]) -> Option<(&'static [crate::cli_list::Category], bool, bool)> { - use crate::cli_list::Category; +fn list_command( + args: &[String], +) -> Option<(&'static [crate::cli::cli_list::Category], bool, bool)> { + use crate::cli::cli_list::Category; let mut words: Vec<&str> = args.iter().map(String::as_str).collect(); let mut flag = |name: &str| { let before = words.len(); @@ -89,22 +94,22 @@ pub fn run(args: &[String]) -> i32 { return Ok(0); } if let Some((categories, json, all)) = list_command(args) { - return crate::cli_list::run(categories, json, all); + return crate::cli::cli_list::run(categories, json, all); } if args.first().is_some_and(|area| area == "display") { - return crate::display_cli::run(&args[1..]); + return crate::display::display_cli::run(&args[1..]); } if args.first().is_some_and(|area| area == "tv") { - return crate::tv_cli::run(&args[1..]); + return crate::tv::tv_cli::run(&args[1..]); } if args.first().is_some_and(|area| area == "scene") { - return crate::windows_scenes::cli(&args[1..]); + return crate::scene::windows_scenes::cli(&args[1..]); } if args.first().is_some_and(|area| area == "fps") { - return crate::windows_fps::cli(&args[1..]); + return crate::fps::windows_fps::cli(&args[1..]); } if args.first().is_some_and(|area| area == "audio") { - return crate::audio_cli::run(&args[1..]); + return crate::audio::audio_cli::run(&args[1..]); } Err("Unknown command. Use director --help.".into()) })(); @@ -121,7 +126,7 @@ pub fn run(args: &[String]) -> i32 { #[cfg(test)] mod tests { use super::list_command; - use crate::cli_list::Category; + use crate::cli::cli_list::Category; fn args(s: &str) -> Vec { s.split_whitespace().map(String::from).collect() } diff --git a/src/command_ui.rs b/src/command_ui.rs index 8cccb90..5ec4d99 100644 --- a/src/command_ui.rs +++ b/src/command_ui.rs @@ -42,7 +42,7 @@ pub(crate) enum CommandMessage { fn commands(t: &Target) -> Vec<(&'static str, String, String)> { // The CLI name ("Desk View" is desk-view) never needs quotes. A name made only of // symbols has none, so only the ID command is offered. - let cli = director::cli_name::cli_name(&t.name); + let cli = director::cli::cli_name::cli_name(&t.name); let mut rows = Vec::new(); if !cli.is_empty() { rows.push(( diff --git a/src/current_ui.rs b/src/current_ui.rs index dae8b20..4f95483 100644 --- a/src/current_ui.rs +++ b/src/current_ui.rs @@ -8,14 +8,15 @@ use crate::{ work, }; use director::{ + audio::audio_control::{self, Level, MuteChange}, + audio::windows_audio::{OperationLock, WindowsAudio}, audio::{AudioBackend, Output, Role}, - audio_control::{self, Level, MuteChange}, - display_apply, - display_editor::{Editor, Options}, - displays::{Layout, Preset}, - windows_audio::{OperationLock, WindowsAudio}, - windows_display_apply::WindowsDisplays, - windows_display_modes, windows_displays, + display::display_apply, + display::display_editor::{Editor, Options}, + display::displays::{Layout, Preset}, + display::windows_display_apply::WindowsDisplays, + display::windows_display_modes, + display::windows_displays, }; use windows_reactor::*; type Displays = Result<(Layout, Vec), String>; @@ -157,13 +158,13 @@ impl CurrentState { } /// A scene Sound step holding what Now shows: the output and microphone with their volume /// (the slider, which leads the device while a change settles) and mute state. - fn sound_now(&self, output: &Output) -> director::scenes::Sound { + fn sound_now(&self, output: &Output) -> director::scene::scenes::Sound { let percent = |v: Option| { v.filter(|v| v.is_finite()) .map(|v| v.round().clamp(0.0, 100.0) as u8) }; - director::scenes::Sound { - output: Some(director::scenes::SoundOutput::Device { + director::scene::scenes::Sound { + output: Some(director::scene::scenes::SoundOutput::Device { id: output.id.clone(), name: output.name.clone(), }), @@ -176,14 +177,16 @@ impl CurrentState { id: c.id.clone(), name: c.name.clone(), }), - mic: self.default_device(true).map(|mic| director::scenes::Mic { - device: director::audio::DeviceSelection { - id: mic.id.clone(), - name: mic.name.clone(), - }, - volume: percent(self.mic_volume), - mute: mic.muted, - }), + mic: self + .default_device(true) + .map(|mic| director::scene::scenes::Mic { + device: director::audio::DeviceSelection { + id: mic.id.clone(), + name: mic.name.clone(), + }, + volume: percent(self.mic_volume), + mute: mic.muted, + }), } } /// Take fresh device lists; the sliders follow the devices again. @@ -583,8 +586,8 @@ Could not read audio outputs: {e}" work(cx, move || { msg(CurrentMessage::DisplaysSaved((|| { let _lock = OperationLock::acquire()?; - let path = director::displays::path()?; - let existing = director::displays::load(&path)?; + let path = director::display::displays::path()?; + let existing = director::display::displays::load(&path)?; let now = std::time::SystemTime::now() .duration_since(std::time::UNIX_EPOCH) .unwrap_or_default(); @@ -598,7 +601,7 @@ Could not read audio outputs: {e}" }); next.sort_by_key(|p| p.name.to_lowercase()); // Refuses a name whose command name another preset already uses. - director::displays::save(&path, &existing, &next)?; + director::display::displays::save(&path, &existing, &next)?; Ok(name) })())) }); @@ -627,7 +630,7 @@ Could not read audio outputs: {e}" let Some(output) = self.current.default_device(false) else { return; }; - let mut scene = director::scenes::Scene::new(crate::scene_ui::new_id(), ""); + let mut scene = director::scene::scenes::Scene::new(crate::scene_ui::new_id(), ""); scene.sound = Some(self.current.sound_now(output)); self.update_library( crate::library_flow::LibraryMessage::NewScene(Box::new(scene)), @@ -916,7 +919,7 @@ impl DirectorApp { mod tests { use super::*; fn layout() -> Layout { - use director::displays::{DesktopMode, Monitor, RefreshRate}; + use director::display::displays::{DesktopMode, Monitor, RefreshRate}; Layout { monitors: vec![Monitor { adapter_luid: 1, @@ -979,7 +982,7 @@ mod tests { .change( &mut draft.layout, 0, - director::display_editor::Change::Hdr(true), + director::display::display_editor::Change::Hdr(true), ) .unwrap(); assert!(state.dirty()); @@ -1002,7 +1005,7 @@ mod tests { let sound = state.sound_now(state.default_device(false).unwrap()); assert_eq!( sound.output, - Some(director::scenes::SoundOutput::Device { + Some(director::scene::scenes::SoundOutput::Device { id: "speakers".into(), name: "speakers".into(), }) diff --git a/src/diagnostics.rs b/src/diagnostics.rs index 248b772..11220f9 100644 --- a/src/diagnostics.rs +++ b/src/diagnostics.rs @@ -300,7 +300,7 @@ pub struct LastRun { } impl LastRun { - pub fn new(name: &str, stage: &str, report: &crate::scenes::Report) -> Self { + pub fn new(name: &str, stage: &str, report: &crate::scene::scenes::Report) -> Self { Self { name: bounded(name), completed_at: timestamp_utc(), diff --git a/src/display_apply.rs b/src/display/display_apply.rs similarity index 98% rename from src/display_apply.rs rename to src/display/display_apply.rs index 0a2c6d2..2a97a18 100644 --- a/src/display_apply.rs +++ b/src/display/display_apply.rs @@ -1,5 +1,5 @@ //! Framework-independent display transaction and confirmation deadline. -use crate::displays::{Layout, Monitor}; +use crate::display::displays::{Layout, Monitor}; use std::{ collections::BTreeMap, sync::mpsc::{Receiver, RecvTimeoutError}, @@ -57,7 +57,10 @@ pub fn identity(m: &Monitor) -> Result { ) }) } -pub fn same_rate(a: &crate::displays::RefreshRate, b: &crate::displays::RefreshRate) -> bool { +pub fn same_rate( + a: &crate::display::displays::RefreshRate, + b: &crate::display::displays::RefreshRate, +) -> bool { a.denominator != 0 && b.denominator != 0 && u64::from(a.numerator) * u64::from(b.denominator) @@ -287,7 +290,7 @@ pub fn wait_for_confirmation( #[cfg(test)] pub(crate) mod tests { use super::*; - use crate::displays::{DesktopMode, RefreshRate}; + use crate::display::displays::{DesktopMode, RefreshRate}; pub fn layout(x: i32) -> Layout { Layout { monitors: vec![ diff --git a/src/display_capabilities.rs b/src/display/display_capabilities.rs similarity index 94% rename from src/display_capabilities.rs rename to src/display/display_capabilities.rs index 5bd2dbf..6bb21a5 100644 --- a/src/display_capabilities.rs +++ b/src/display/display_capabilities.rs @@ -1,8 +1,8 @@ //! Previously detected capabilities; never replace a complete inventory with inactive fallbacks. use crate::{ - display_detection::Learned, - display_editor::{Editor, Mode, Options}, - displays::{DesktopMode, Layout}, + display::display_detection::Learned, + display::display_editor::{Editor, Mode, Options}, + display::displays::{DesktopMode, Layout}, }; use serde::{Deserialize, Serialize}; use std::path::{Path, PathBuf}; @@ -145,7 +145,11 @@ pub fn apply_to_editor( editor.remembered[i] = Some(learned.desktop.clone()); layout.monitors[i].connected = true; if !layout.monitors[i].enabled { - editor.change(layout, i, crate::display_editor::Change::Enabled(true))?; + editor.change( + layout, + i, + crate::display::display_editor::Change::Enabled(true), + )?; } else if let Some(d) = &mut layout.monitors[i].desktop { let (x, y, rotation) = (d.x, d.y, d.rotation_degrees); *d = learned.desktop.clone(); @@ -168,7 +172,7 @@ pub fn apply_to_editor( mod tests { use super::*; fn learned() -> Learned { - let refresh = crate::displays::RefreshRate { + let refresh = crate::display::displays::RefreshRate { numerator: 120000, denominator: 1001, }; @@ -205,7 +209,7 @@ mod tests { let fallback = Mode { width: 640, height: 480, - refresh: crate::displays::RefreshRate { + refresh: crate::display::displays::RefreshRate { numerator: 60, denominator: 1, }, @@ -215,7 +219,7 @@ mod tests { Mode { width: 3840, height: 2160, - refresh: crate::displays::RefreshRate { + refresh: crate::display::displays::RefreshRate { numerator: 120, denominator: 1, }, @@ -223,7 +227,7 @@ mod tests { Mode { width: 7680, height: 4320, - refresh: crate::displays::RefreshRate { + refresh: crate::display::displays::RefreshRate { numerator: 60, denominator: 1, }, @@ -245,7 +249,7 @@ mod tests { old.y = -100; old.refresh_rate = fallback.refresh; let mut layout = Layout { - monitors: vec![crate::displays::Monitor { + monitors: vec![crate::display::displays::Monitor { adapter_luid: 1, target_id: 1, device_path: Some("test-tv".into()), @@ -285,7 +289,7 @@ mod tests { assert!(remember(&path, &detected).is_err()); assert_eq!(std::fs::read(&path).unwrap(), original); let layout = Layout { - monitors: vec![crate::displays::Monitor { + monitors: vec![crate::display::displays::Monitor { adapter_luid: 1, target_id: 1, device_path: Some("TEST-TV".into()), diff --git a/src/display_cli.rs b/src/display/display_cli.rs similarity index 93% rename from src/display_cli.rs rename to src/display/display_cli.rs index 20e9cb8..0e044ac 100644 --- a/src/display_cli.rs +++ b/src/display/display_cli.rs @@ -1,16 +1,16 @@ //! Headless display capture, validation, and confirmed application. use crate::{ - displays::{self, Preset}, - windows_audio::OperationLock, - windows_displays, + audio::windows_audio::OperationLock, + display::displays::{self, Preset}, + display::windows_displays, }; pub fn run(args: &[String]) -> Result { if let [command, name, rest @ ..] = args && (command == "apply" || command == "check") { use crate::{ - display_apply::{self, Backend, Decision}, - windows_display_apply::WindowsDisplays, + display::display_apply::{self, Backend, Decision}, + display::windows_display_apply::WindowsDisplays, }; if (command == "check" && !rest.is_empty()) || (command == "apply" @@ -23,7 +23,7 @@ pub fn run(args: &[String]) -> Result { ); } let presets = displays::load(&displays::path()?)?; - let preset = crate::cli_name::find( + let preset = crate::cli::cli_name::find( &presets, name, |p| (&p.id, &p.name), @@ -101,7 +101,7 @@ pub fn run(args: &[String]) -> Result { displays::save(&path, &old, &next)?; println!( "Captured display preset “{name}” ({}). Your screens are unchanged.", - crate::cli_name::cli_name(name) + crate::cli::cli_name::cli_name(name) ); } _ => return Err("Unknown display command. Use director --help.".into()), diff --git a/src/display_detection.rs b/src/display/display_detection.rs similarity index 98% rename from src/display_detection.rs rename to src/display/display_detection.rs index 64dddfe..2f63a83 100644 --- a/src/display_detection.rs +++ b/src/display/display_detection.rs @@ -1,8 +1,8 @@ //! Temporary display discovery with mandatory restoration after any attempted change. use crate::{ - display_apply, - display_editor::Options, - displays::{DesktopMode, Layout}, + display::display_apply, + display::display_editor::Options, + display::displays::{DesktopMode, Layout}, }; use std::{ sync::atomic::{AtomicBool, Ordering}, @@ -263,8 +263,8 @@ pub fn detect( mod tests { use super::*; use crate::{ - display_editor::Mode, - displays::{Monitor, RefreshRate}, + display::display_editor::Mode, + display::displays::{Monitor, RefreshRate}, }; fn desktop(x: i32) -> DesktopMode { DesktopMode { diff --git a/src/display_editor.rs b/src/display/display_editor.rs similarity index 95% rename from src/display_editor.rs rename to src/display/display_editor.rs index 38e1774..8ccff24 100644 --- a/src/display_editor.rs +++ b/src/display/display_editor.rs @@ -1,5 +1,5 @@ //! Pure draft operations. Nothing in this module changes Windows settings. -use crate::displays::{DesktopMode, Layout, RefreshRate}; +use crate::display::displays::{DesktopMode, Layout, RefreshRate}; #[derive(Clone, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)] pub struct Mode { @@ -76,9 +76,9 @@ impl Editor { } let mut next = layout.clone(); let mut editor = self.clone(); - let group = crate::display_mirroring::members(layout, index); + let group = crate::display::display_mirroring::members(layout, index); let effective = if let Change::Resolution(choice) = change { - let common = crate::display_mirroring::common_options(&editor, layout, index); + let common = crate::display::display_mirroring::common_options(&editor, layout, index); let dimensions = common .resolutions() .get(choice) @@ -94,12 +94,14 @@ impl Editor { change.clone() }; if let Change::Mirror(target) = change { - crate::display_mirroring::set(&editor, &mut next, index, target)?; + crate::display::display_mirroring::set(&editor, &mut next, index, target)?; } else { editor.edit(&mut next, index, effective)?; - crate::display_mirroring::propagate(&editor, &mut next, index, &change, &group)?; + crate::display::display_mirroring::propagate( + &editor, &mut next, index, &change, &group, + )?; } - if crate::display_mirroring::primary_groups(&next) != 1 { + if crate::display::display_mirroring::primary_groups(&next) != 1 { return Err( "Choose exactly one primary desktop. Use Make primary to change it.".into(), ); @@ -110,11 +112,13 @@ impl Editor { } fn edit(&mut self, layout: &mut Layout, index: usize, change: Change) -> Result<(), String> { let enable_source = if matches!(change, Change::Enabled(true)) { - Some(crate::display_mirroring::unique_source(layout, index)?) + Some(crate::display::display_mirroring::unique_source( + layout, index, + )?) } else { None }; - let has_primary_peer = crate::display_mirroring::members(layout, index).len() > 1; + let has_primary_peer = crate::display::display_mirroring::members(layout, index).len() > 1; let m = layout .monitors .get_mut(index) @@ -272,7 +276,7 @@ impl Editor { .iter() .filter_map(|m| m.desktop.as_ref()) .collect::>(); - if crate::display_mirroring::primary_groups(layout) != 1 { + if crate::display::display_mirroring::primary_groups(layout) != 1 { return Err("Choose exactly one primary monitor.".into()); } for (i, a) in active.iter().enumerate() { @@ -311,7 +315,7 @@ fn dimensions(d: &mut DesktopMode) { mod tests { use super::*; fn setup() -> (Layout, Editor) { - let mut layout = crate::displays::tests::layout(); + let mut layout = crate::display::displays::tests::layout(); let mut second = layout.monitors[0].clone(); second.target_id = 8; second.device_path = Some("second".into()); @@ -480,7 +484,7 @@ impl Drag { d.x = ((px - self.map.left) / self.map.scale).round() as i32; d.y = ((py - self.map.top) / self.map.scale).round() as i32; let (dx, dy) = (d.x, d.y); - for i in crate::display_mirroring::members(&self.before, self.index) { + for i in crate::display::display_mirroring::members(&self.before, self.index) { let d = layout.monitors[i].desktop.as_mut().unwrap(); d.x = dx; d.y = dy; @@ -501,7 +505,8 @@ impl Drag { .filter(|(i, _)| *i != self.index) .filter_map(|(_, m)| m.desktop.as_ref()) .filter(|other| { - crate::display_mirroring::key(other) != crate::display_mirroring::key(&d) + crate::display::display_mirroring::key(other) + != crate::display::display_mirroring::key(&d) }) .collect::>(); let mut x = d.x; @@ -605,7 +610,7 @@ impl Drag { let moved = next.monitors[self.index].desktop.as_mut().unwrap(); moved.x = x; moved.y = y; - for i in crate::display_mirroring::members(&self.before, self.index) { + for i in crate::display::display_mirroring::members(&self.before, self.index) { let d = next.monitors[i].desktop.as_mut().unwrap(); d.x = x; d.y = y; @@ -635,7 +640,7 @@ impl Drag { mod drag_tests { use super::*; fn layout() -> Layout { - let mut l = crate::displays::tests::layout(); + let mut l = crate::display::displays::tests::layout(); let mut b = l.monitors[0].clone(); b.target_id = 8; b.device_path = Some("second".into()); diff --git a/src/display_mirroring.rs b/src/display/display_mirroring.rs similarity index 95% rename from src/display_mirroring.rs rename to src/display/display_mirroring.rs index 54e9886..ae98a7c 100644 --- a/src/display_mirroring.rs +++ b/src/display/display_mirroring.rs @@ -1,7 +1,7 @@ //! Draft-only CCD source grouping. No device setters or guessed modes. use crate::{ - display_editor::{Editor, Options}, - displays::{DesktopMode, Layout}, + display::display_editor::{Editor, Options}, + display::displays::{DesktopMode, Layout}, }; pub fn key(d: &DesktopMode) -> (u64, u32) { (d.source_adapter_luid, d.source_id) @@ -124,7 +124,7 @@ pub fn set( let rates = editor.options[i].rates(w, h); d.refresh_rate = rates .iter() - .find(|r| crate::display_apply::same_rate(r, &d.refresh_rate)) + .find(|r| crate::display::display_apply::same_rate(r, &d.refresh_rate)) .or(rates.first()) .cloned() .ok_or("No reported refresh rate is available for this mirror layout.")?; @@ -157,10 +157,10 @@ pub fn propagate( editor: &Editor, layout: &mut Layout, index: usize, - change: &crate::display_editor::Change, + change: &crate::display::display_editor::Change, group: &[usize], ) -> Result<(), String> { - use crate::display_editor::Change; + use crate::display::display_editor::Change; if !matches!( change, Change::Resolution(_) | Change::Rotation(_) | Change::X(_) | Change::Y(_) @@ -178,7 +178,7 @@ pub fn propagate( let rates = editor.options[i].rates(selected.source_width, selected.source_height); d.refresh_rate = rates .iter() - .find(|r| crate::display_apply::same_rate(r, &d.refresh_rate)) + .find(|r| crate::display::display_apply::same_rate(r, &d.refresh_rate)) .or(rates.first()) .cloned() .ok_or("This resolution is not reported by every mirrored display.")?; @@ -199,8 +199,8 @@ pub fn propagate( mod tests { use super::*; use crate::{ - display_editor::{Change, Drag, Mode}, - displays::{Monitor, RefreshRate}, + display::display_editor::{Change, Drag, Mode}, + display::displays::{Monitor, RefreshRate}, }; pub(super) fn setup_for_sources() -> (Layout, Editor) { let mut layout = Layout { monitors: vec![] }; @@ -325,7 +325,7 @@ mod tests { 1, 100.0, 100.0, - crate::display_editor::MapTransform::new(&l, 400.0, 180.0), + crate::display::display_editor::MapTransform::new(&l, 400.0, 180.0), ) .unwrap(); let moved = drag.moved(110.0, 100.0).unwrap(); @@ -346,7 +346,7 @@ mod tests { #[cfg(test)] #[test] fn enabling_an_output_cannot_reuse_a_detached_groups_logical_source() { - use crate::display_editor::Change; + use crate::display::display_editor::Change; let (mut layout, mut editor) = tests::setup_for_sources(); editor .change(&mut layout, 1, Change::Mirror(Some(0))) diff --git a/src/displays.rs b/src/display/displays.rs similarity index 99% rename from src/displays.rs rename to src/display/displays.rs index 40446dd..1fda8dc 100644 --- a/src/displays.rs +++ b/src/display/displays.rs @@ -196,7 +196,7 @@ pub fn load(path: &Path) -> Result, String> { /// Caller holds Director's cross-process operation lock. pub fn save(path: &Path, expected: &[Preset], next: &[Preset]) -> Result<(), String> { validate(next)?; - crate::cli_name::check_new_names(expected, next, |p| (&p.id, &p.name), "display preset")?; + crate::cli::cli_name::check_new_names(expected, next, |p| (&p.id, &p.name), "display preset")?; if load(path)? != expected { return Err( "Display presets changed in another window. Refresh before saving again.".into(), diff --git a/src/display/mod.rs b/src/display/mod.rs new file mode 100644 index 0000000..6d7239e --- /dev/null +++ b/src/display/mod.rs @@ -0,0 +1,19 @@ +//! Display presets: capture, editing, apply with verification and restore, and detection. +pub mod display_apply; +pub mod display_capabilities; +#[cfg(windows)] +pub mod display_cli; +pub mod display_detection; +pub mod display_editor; +pub mod display_mirroring; +pub mod displays; +#[cfg(windows)] +pub mod windows_display_apply; +#[cfg(windows)] +pub mod windows_display_detection; +#[cfg(windows)] +pub mod windows_display_modes; +#[cfg(windows)] +pub mod windows_displays; +#[cfg(windows)] +pub mod windows_hdr; diff --git a/src/windows_display_apply.rs b/src/display/windows_display_apply.rs similarity index 96% rename from src/windows_display_apply.rs rename to src/display/windows_display_apply.rs index 6024564..a34258e 100644 --- a/src/windows_display_apply.rs +++ b/src/display/windows_display_apply.rs @@ -1,8 +1,8 @@ //! Resolve device paths against fresh CCD routes; never reuse stored adapter IDs. use crate::{ - display_apply::{self, Backend}, - displays::{DesktopMode, Layout}, - windows_displays::{capture, luid, query_flags, target_name}, + display::display_apply::{self, Backend}, + display::displays::{DesktopMode, Layout}, + display::windows_displays::{capture, luid, query_flags, target_name}, }; use std::collections::{BTreeMap, BTreeSet}; use windows::Win32::{ @@ -193,7 +193,7 @@ fn build( )); } } - let mut groups: BTreeMap> = BTreeMap::new(); + let mut groups: BTreeMap> = BTreeMap::new(); let mut identities = vec![]; for m in wanted.monitors.iter().filter(|m| m.enabled) { let identity = display_apply::identity(m)?; @@ -412,7 +412,7 @@ fn normalize_sdr(layout: &mut Layout, wanted: &Layout) { && display_apply::identity(m).ok() == display_apply::identity(actual).ok() }) && matches!( - crate::windows_hdr::state(actual.adapter_luid, actual.target_id), + crate::display::windows_hdr::state(actual.adapter_luid, actual.target_id), Ok(None) ) { @@ -466,7 +466,9 @@ fn set_hdrs(wanted: &Layout) -> Result<(), String> { match now { Some(n) if n.hdr == Some(desired) => {} Some(n) if n.hdr.is_some() => { - if let Err(e) = crate::windows_hdr::set(n.adapter_luid, n.target_id, desired) { + if let Err(e) = + crate::display::windows_hdr::set(n.adapter_luid, n.target_id, desired) + { failures.push(format!("{}: {e}", m.name)); } } @@ -673,10 +675,14 @@ impl WindowsDisplays { .is_some_and(|p| p.eq_ignore_ascii_case(path)) }) .ok_or("The display disappeared.")?; - let options = crate::windows_display_modes::discover_live(&wanted)?; - let mut editor = crate::display_editor::Editor::new(&wanted, options); - editor.change(&mut wanted, i, crate::display_editor::Change::Enabled(true))?; - if let Some((w, h)) = crate::windows_display_modes::preferred_resolution(path) + let options = crate::display::windows_display_modes::discover_live(&wanted)?; + let mut editor = crate::display::display_editor::Editor::new(&wanted, options); + editor.change( + &mut wanted, + i, + crate::display::display_editor::Change::Enabled(true), + )?; + if let Some((w, h)) = crate::display::windows_display_modes::preferred_resolution(path) && let Some(d) = &mut wanted.monitors[i].desktop { d.source_width = w; @@ -769,7 +775,7 @@ mod tests { } #[test] fn cold_enable_uses_progressive_scan_with_exact_rate_and_raw_source_size() { - let mut wanted = crate::display_apply::tests::layout(0); + let mut wanted = crate::display::display_apply::tests::layout(0); wanted.monitors[1].hdr = Some(true); let d = wanted.monitors[1].desktop.as_mut().unwrap(); d.width = 1080; diff --git a/src/windows_display_detection.rs b/src/display/windows_display_detection.rs similarity index 88% rename from src/windows_display_detection.rs rename to src/display/windows_display_detection.rs index 4921990..2945b92 100644 --- a/src/windows_display_detection.rs +++ b/src/display/windows_display_detection.rs @@ -1,12 +1,13 @@ //! Native discovery adapter. Never commits a temporary topology to Windows' database. use crate::{ - display_apply::Backend as ApplyBackend, - display_detection::{Backend, Learned}, - displays::Layout, - tv_control::{self, Backend as TvBackend, PowerState}, - tvs::Tv, - windows_display_apply::{Snapshot, WindowsDisplays}, - windows_display_modes, windows_displays, + display::display_apply::Backend as ApplyBackend, + display::display_detection::{Backend, Learned}, + display::displays::Layout, + display::windows_display_apply::{Snapshot, WindowsDisplays}, + display::windows_display_modes, + display::windows_displays, + tv::tv_control::{self, Backend as TvBackend, PowerState}, + tv::tvs::Tv, }; use std::{ sync::atomic::{AtomicBool, Ordering}, @@ -30,7 +31,7 @@ impl Backend for WindowsDetection { if cancel.load(Ordering::Acquire) { return Err("Detection canceled.".into()); } - let mut backend = crate::windows_tv::WindowsTvControls::new(tv); + let mut backend = crate::tv::windows_tv::WindowsTvControls::new(tv); tv_control::power(&mut backend, tv_control::PowerAction::Wake)?; loop { if cancel.load(Ordering::Acquire) { @@ -42,7 +43,7 @@ impl Backend for WindowsDetection { if cancel.load(Ordering::Acquire) { return Err("Detection canceled.".into()); } - let mut backend = crate::windows_tv::WindowsTvControls::new(tv); + let mut backend = crate::tv::windows_tv::WindowsTvControls::new(tv); if backend.power().is_ok_and(PowerState::awake) { if cancel.load(Ordering::Acquire) || Instant::now() >= deadline { return Err("TV preparation stopped before input selection.".into()); @@ -83,7 +84,7 @@ impl Backend for WindowsDetection { .desktop .clone() .ok_or("The display did not report a desktop mode.")?; - if let Some(mode) = crate::display_capabilities::recommended_mode( + if let Some(mode) = crate::display::display_capabilities::recommended_mode( &options, windows_display_modes::preferred_resolution(path), ) { diff --git a/src/windows_display_modes.rs b/src/display/windows_display_modes.rs similarity index 94% rename from src/windows_display_modes.rs rename to src/display/windows_display_modes.rs index 6260e78..9b65386 100644 --- a/src/windows_display_modes.rs +++ b/src/display/windows_display_modes.rs @@ -1,8 +1,8 @@ //! Read-only Windows capability discovery; no driver setters or helper programs. use crate::{ - display_editor::{Mode, Options}, - displays::{Layout, RefreshRate}, - windows_displays::{query_flags, target_name}, + display::display_editor::{Mode, Options}, + display::displays::{Layout, RefreshRate}, + display::windows_displays::{query_flags, target_name}, }; use windows::Win32::UI::WindowsAndMessaging::EDD_GET_DEVICE_INTERFACE_NAME; use windows::{ @@ -135,8 +135,8 @@ pub fn discover_live(layout: &Layout) -> Result, String> { .as_ref() .is_some_and(|id| target_name(p).1.is_some_and(|v| v.eq_ignore_ascii_case(id))) }) { - result[i].hdr = crate::windows_hdr::read( - crate::windows_displays::luid(p.targetInfo.adapterId), + result[i].hdr = crate::display::windows_hdr::read( + crate::display::windows_displays::luid(p.targetInfo.adapterId), p.targetInfo.id, ); } @@ -212,8 +212,10 @@ pub fn preferred_resolution(path: &str) -> Option<(u32, u32)> { pub fn discover(layout: &Layout) -> Result, String> { let mut options = discover_live(layout)?; - match crate::display_capabilities::path().and_then(|p| crate::display_capabilities::load(&p)) { - Ok(entries) => crate::display_capabilities::merge(layout, &mut options, &entries), + match crate::display::display_capabilities::path() + .and_then(|p| crate::display::display_capabilities::load(&p)) + { + Ok(entries) => crate::display::display_capabilities::merge(layout, &mut options, &entries), Err(e) => crate::diagnostics::event("display.capabilities.cache", "error", &e), } Ok(options) diff --git a/src/windows_displays.rs b/src/display/windows_displays.rs similarity index 98% rename from src/windows_displays.rs rename to src/display/windows_displays.rs index c6243ac..0a16549 100644 --- a/src/windows_displays.rs +++ b/src/display/windows_displays.rs @@ -1,5 +1,5 @@ //! Windows display capture and direct validated application adapter. -use crate::displays::{DesktopMode, Layout, Monitor, RefreshRate}; +use crate::display::displays::{DesktopMode, Layout, Monitor, RefreshRate}; use std::collections::BTreeMap; use windows::Win32::{ Devices::Display::*, @@ -225,7 +225,7 @@ pub fn capture() -> Result { device_path, name, connected: path.targetInfo.targetAvailable.as_bool(), - hdr: crate::windows_hdr::read(key.0, key.1), + hdr: crate::display::windows_hdr::read(key.0, key.1), enabled, desktop, }, diff --git a/src/windows_hdr.rs b/src/display/windows_hdr.rs similarity index 100% rename from src/windows_hdr.rs rename to src/display/windows_hdr.rs diff --git a/src/display_editor_ui.rs b/src/display_editor_ui.rs index deefa61..7c0d03a 100644 --- a/src/display_editor_ui.rs +++ b/src/display_editor_ui.rs @@ -1,8 +1,8 @@ //! Native per-monitor draft controls. All changes remain in memory until Save. use crate::{DirectorApp, Message, display_ui::DisplayMessage}; use director::{ - display_editor::{Change, Editor}, - displays::{DesktopMode, Layout}, + display::display_editor::{Change, Editor}, + display::displays::{DesktopMode, Layout}, }; use windows_reactor::*; #[derive(Clone, Copy)] @@ -74,7 +74,7 @@ fn preview( }; let (width, height) = app.map_size(); let map = drag.map_or_else( - || director::display_editor::MapTransform::new(layout, width, height), + || director::display::display_editor::MapTransform::new(layout, width, height), |d| d.map, ); let selected = match target { @@ -87,7 +87,7 @@ fn preview( .enumerate() .filter_map(|(i, m)| { let d = m.desktop.as_ref()?; - let group = director::display_mirroring::members(layout, i); + let group = director::display::display_mirroring::members(layout, i); if group.first() != Some(&i) { return None; } @@ -370,8 +370,8 @@ impl DirectorApp { EditorTarget::Current => self.current.display.orientation_revision, }; let m = &layout.monitors[i]; - let options = director::display_mirroring::common_options(editor, layout, i); - let group = director::display_mirroring::members(layout, i); + let options = director::display::display_mirroring::common_options(editor, layout, i); + let group = director::display::display_mirroring::members(layout, i); let d = m.desktop.as_ref(); let primary = d.is_some_and(DesktopMode::primary); let detecting = matches!(target, EditorTarget::Preset) diff --git a/src/display_setup_ui.rs b/src/display_setup_ui.rs index d2d6ccd..83168c4 100644 --- a/src/display_setup_ui.rs +++ b/src/display_setup_ui.rs @@ -1,9 +1,9 @@ //! Inline discovery progress. Native work and recovery stay on workers. use crate::{DirectorApp, Message, display_ui::DisplayMessage}; use director::{ - display_detection::{self, Report, Stage}, - windows_audio::OperationLock, - windows_display_apply::Snapshot, + audio::windows_audio::OperationLock, + display::display_detection::{self, Report, Stage}, + display::windows_display_apply::Snapshot, }; use std::sync::{ Arc, @@ -21,7 +21,7 @@ pub(crate) struct SetupState { pub cancel: Option>, pub note: String, pub details: String, - pub recovery: Option<(director::displays::Layout, Snapshot)>, + pub recovery: Option<(director::display::displays::Layout, Snapshot)>, } #[derive(Clone)] pub(crate) enum SetupMessage { @@ -133,15 +133,15 @@ impl DirectorApp { if DETECTION_PREVIEW.load(Ordering::Acquire){return Ok(preview_run(&sender,&cancel,wake));} let _lock=OperationLock::acquire()?; if let Some(tv)=&tv { - let saved=director::tvs::load(&director::tvs::path()?)?; + let saved=director::tv::tvs::load(&director::tv::tvs::path()?)?; if saved.iter().find(|t|t.id==tv.id)!=Some(tv) {return Err("The linked TV changed. Reopen this preset before detecting.".into());} } - let mut backend=director::windows_display_detection::WindowsDetection::new(tv); + let mut backend=director::display::windows_display_detection::WindowsDetection::new(tv); let mut report=display_detection::detect(&mut backend,&path,&cancel,|stage|{ director::diagnostics::event("display.detect.stage","progress",stage.label()); if sender.send(stage).is_err(){cancel.store(true,Ordering::Release);} }); - if let Some(learned)=&report.learned && let Err(e)=director::display_capabilities::path().and_then(|p|director::display_capabilities::remember(&p,learned)){ + if let Some(learned)=&report.learned && let Err(e)=director::display::display_capabilities::path().and_then(|p|director::display::display_capabilities::remember(&p,learned)){ report.details.push(format!("Options are available in this window but could not be remembered: {e}")); } Ok::<_,String>(report) @@ -189,7 +189,7 @@ impl DirectorApp { && let (Some(draft), Some(editor)) = (&mut self.display.draft, &mut self.display.editor) { - match director::display_capabilities::apply_to_editor(&mut draft.layout,editor,&learned) { + match director::display::display_capabilities::apply_to_editor(&mut draft.layout,editor,&learned) { Ok(())=>self.display.setup.note="Options detected · original layout restored. Choose your preset settings below.".into(), Err(e)=>self.display.setup.details.push_str(&format!("\n{e}")), } @@ -214,7 +214,7 @@ impl DirectorApp { move |_| { let report = match OperationLock::acquire() { Ok(_lock) => display_detection::restore( - &mut director::windows_display_detection::WindowsDetection::default( + &mut director::display::windows_display_detection::WindowsDetection::default( ), before, snapshot, @@ -386,12 +386,12 @@ impl DirectorApp { pub(crate) static DETECTION_PREVIEW: AtomicBool = AtomicBool::new(false); #[cfg(test)] pub(crate) fn preview_editor() -> ( - director::displays::Layout, - Vec, + director::display::displays::Layout, + Vec, ) { use director::{ - display_editor::{Mode, Options}, - displays::{DesktopMode, Layout, Monitor, RefreshRate}, + display::display_editor::{Mode, Options}, + display::displays::{DesktopMode, Layout, Monitor, RefreshRate}, }; let rate = RefreshRate { numerator: 60, @@ -458,8 +458,8 @@ pub(crate) fn preview_editor() -> ( ) } #[cfg(test)] -pub(crate) fn preview_tv() -> director::tvs::Tv { - director::tvs::Tv { +pub(crate) fn preview_tv() -> director::tv::tvs::Tv { + director::tv::tvs::Tv { id: "fixture-tv".into(), name: "Linked TV (test fixture)".into(), address: "192.0.2.80".into(), @@ -467,18 +467,18 @@ pub(crate) fn preview_tv() -> director::tvs::Tv { samsung: Default::default(), android: Default::default(), connection: Default::default(), - display: Some(director::tvs::DisplayLink { + display: Some(director::tv::tvs::DisplayLink { device_path: "fixture-tv".into(), name: "LG C1 (test fixture)".into(), }), audio: None, credential: Some(vec![0]), inputs: vec![], - pc_input: Some(director::lg_protocol::Input { + pc_input: Some(director::tv::lg_protocol::Input { id: "HDMI_1".into(), label: "PC".into(), }), - network: director::tv_network::NetworkAddresses { + network: director::tv::tv_network::NetworkAddresses { wired: Some("00:11:22:33:44:55".parse().unwrap()), ..Default::default() }, @@ -513,24 +513,24 @@ fn preview_run( let _ = sender.send(stage); std::thread::sleep(Duration::from_millis(700)); } - let rate = director::displays::RefreshRate { + let rate = director::display::displays::RefreshRate { numerator: 120, denominator: 1, }; - let learned = director::display_detection::Learned { + let learned = director::display::display_detection::Learned { device_path: "fixture-tv".into(), name: "LG C1 (test fixture)".into(), - options: director::display_editor::Options { + options: director::display::display_editor::Options { modes: vec![ - director::display_editor::Mode { + director::display::display_editor::Mode { width: 3840, height: 2160, refresh: rate.clone(), }, - director::display_editor::Mode { + director::display::display_editor::Mode { width: 3840, height: 2160, - refresh: director::displays::RefreshRate { + refresh: director::display::displays::RefreshRate { numerator: 60, denominator: 1, }, @@ -539,7 +539,7 @@ fn preview_run( warning: None, hdr: Some(false), }, - desktop: director::displays::DesktopMode { + desktop: director::display::displays::DesktopMode { source_adapter_luid: 1, source_id: 1, source_name: "fixture".into(), diff --git a/src/display_ui.rs b/src/display_ui.rs index cd6766a..08505f9 100644 --- a/src/display_ui.rs +++ b/src/display_ui.rs @@ -1,13 +1,13 @@ //! Native display capture/list/editor; audio state and device changes stay separate. use crate::{DirectorApp, Message, work}; use director::{ - display_apply::{self, Decision, Outcome, Report}, - windows_display_apply::WindowsDisplays, + audio::windows_audio::OperationLock, + display::displays::{self, Layout, Preset}, + display::windows_displays, }; use director::{ - displays::{self, Layout, Preset}, - windows_audio::OperationLock, - windows_displays, + display::display_apply::{self, Decision, Outcome, Report}, + display::windows_display_apply::WindowsDisplays, }; use std::{ sync::{Arc, Mutex, mpsc}, @@ -33,9 +33,9 @@ pub(crate) enum DisplayMessage { CancelLostDrag(u64), EditorLoaded( bool, - Result<(Layout, Vec), String>, + Result<(Layout, Vec), String>, ), - Change(usize, director::display_editor::Change), + Change(usize, director::display::display_editor::Change), Capture, Captured(Result), Edit(String), @@ -52,12 +52,12 @@ pub(crate) struct DisplayState { pub setup: crate::display_setup_ui::SetupState, pub drag_token: u64, pub orientation_revision: u64, - pub drag: Option, + pub drag: Option, /// The display selected in the arrangement map. pub selected: usize, /// A success message to show once the preset list has loaded (loading clears notices). pub notice_after_load: Option, - pub editor: Option, + pub editor: Option, pub progress: Option>>>, pub confirmation: Option<(u64, mpsc::Sender)>, pub remaining: u64, @@ -124,7 +124,7 @@ impl DirectorApp { let _lock = OperationLock::acquire()?; for old in &expected { if !next.iter().any(|p| p.id == old.id) { - director::scenes::check_delete("display", &old.id)?; + director::scene::scenes::check_delete("display", &old.id)?; } } displays::save(&displays::path()?, &expected, &next)?; @@ -286,7 +286,8 @@ impl DirectorApp { true, (|| { let layout = windows_displays::capture()?; - let options = director::windows_display_modes::discover(&layout)?; + let options = + director::display::windows_display_modes::discover(&layout)?; Ok((layout, options)) })(), )) @@ -301,12 +302,14 @@ impl DirectorApp { if let Some(d) = &self.display.draft && point.capture_succeeded { - match director::display_editor::Drag::begin( + match director::display::display_editor::Drag::begin( &d.layout, index, point.window_x, point.window_y, - director::display_editor::MapTransform::new(&d.layout, width, height), + director::display::display_editor::MapTransform::new( + &d.layout, width, height, + ), ) { Ok(drag) => { self.display.drag_token = self.display.drag_token.wrapping_add(1); @@ -385,8 +388,9 @@ impl DirectorApp { monitor.hdr = option.hdr; } } - self.display.editor = - Some(director::display_editor::Editor::new(&layout, options)); + self.display.editor = Some(director::display::display_editor::Editor::new( + &layout, options, + )); if create { let now = std::time::SystemTime::now() .duration_since(std::time::UNIX_EPOCH) @@ -412,8 +416,10 @@ impl DirectorApp { if let (Some(editor), Some(draft)) = (&mut self.display.editor, &mut self.display.draft) { - let orientation = - matches!(&change, director::display_editor::Change::Rotation(_)); + let orientation = matches!( + &change, + director::display::display_editor::Change::Rotation(_) + ); match editor.change(&mut draft.layout, index, change) { Ok(()) => { if orientation { @@ -467,7 +473,8 @@ impl DirectorApp { msg(DisplayMessage::EditorLoaded( false, (|| { - let options = director::windows_display_modes::discover(&layout)?; + let options = + director::display::windows_display_modes::discover(&layout)?; Ok((layout, options)) })(), )) diff --git a/src/fps.rs b/src/fps/mod.rs similarity index 99% rename from src/fps.rs rename to src/fps/mod.rs index a35f9da..a6b1741 100644 --- a/src/fps.rs +++ b/src/fps/mod.rs @@ -1,4 +1,6 @@ //! Provider-independent global FPS configuration and verified recovery. +#[cfg(windows)] +pub mod windows_fps; use serde::{Deserialize, Serialize}; #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "kebab-case")] diff --git a/src/windows_fps.rs b/src/fps/windows_fps.rs similarity index 99% rename from src/windows_fps.rs rename to src/fps/windows_fps.rs index ecf642f..f2ca462 100644 --- a/src/windows_fps.rs +++ b/src/fps/windows_fps.rs @@ -131,7 +131,7 @@ pub fn apply(request: &Request, keep: bool) -> Result { }) } pub fn cli(args: &[String]) -> Result { - let _lock = crate::windows_audio::OperationLock::acquire()?; + let _lock = crate::audio::windows_audio::OperationLock::acquire()?; match args { [command] if command == "status" => { println!( @@ -157,7 +157,7 @@ pub fn cli(args: &[String]) -> Result { vrr_safe, }; let refresh = if vrr_safe { - crate::windows_displays::capture()?.primary_refresh_hz() + crate::display::windows_displays::capture()?.primary_refresh_hz() } else { None }; diff --git a/src/fps_ui.rs b/src/fps_ui.rs index 742a56d..6073a5b 100644 --- a/src/fps_ui.rs +++ b/src/fps_ui.rs @@ -123,7 +123,7 @@ impl DirectorApp { work(cx, move || { msg(FpsMessage::Discovered( revision, - director::windows_fps::survey(), + director::fps::windows_fps::survey(), )) }); } @@ -232,15 +232,18 @@ impl DirectorApp { self.begin("Applying FPS limit…"); work(cx, move || { let result = (|| { - let _lock = director::windows_audio::OperationLock::acquire()?; + let _lock = director::audio::windows_audio::OperationLock::acquire()?; let refresh = if request.vrr_safe { - director::windows_displays::capture()?.primary_refresh_hz() + director::display::windows_displays::capture()?.primary_refresh_hz() } else { None }; - director::windows_fps::apply(&request.resolved(refresh)?, false) + director::fps::windows_fps::apply(&request.resolved(refresh)?, false) })(); - msg(FpsMessage::Applied(result, director::windows_fps::survey())) + msg(FpsMessage::Applied( + result, + director::fps::windows_fps::survey(), + )) }); } } diff --git a/src/lib.rs b/src/lib.rs index cf4e70a..4080a70 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,83 +1,17 @@ pub mod audio; -pub mod audio_control; -pub mod cli_name; #[cfg(windows)] -pub mod windows_audio; - -#[cfg(windows)] -pub mod audio_cli; +pub mod backup; #[cfg(windows)] pub mod cli; -#[cfg(windows)] -pub mod cli_list; - -pub mod displays; -#[cfg(windows)] -pub mod windows_displays; - -#[cfg(windows)] -pub mod display_cli; - -pub mod display_apply; - -pub mod display_editor; -#[cfg(windows)] -pub mod windows_display_apply; -#[cfg(windows)] -pub mod windows_display_modes; -#[cfg(windows)] -pub mod windows_hdr; - -pub mod lg_protocol; -pub mod tvs; -#[cfg(windows)] -pub mod windows_lg; - -#[cfg(windows)] -pub mod tv_cli; - -#[cfg(windows)] -pub mod backup; pub mod crash; pub mod diagnostics; -pub mod display_capabilities; -pub mod display_detection; +pub mod display; +pub mod fps; #[cfg(windows)] pub mod notifications; pub mod preferences; -pub mod tv_control; -pub mod tv_input_guard; -pub mod tv_network; -pub mod tv_setup; -#[cfg(windows)] -pub mod windows_display_detection; - -pub mod display_mirroring; - -pub mod scene_session; -pub mod scenes; -pub mod starter; +pub mod scene; pub mod storage; +pub mod tv; #[cfg(windows)] pub mod windows_close; -#[cfg(windows)] -pub mod windows_scenes; - -pub mod samsung; -#[cfg(windows)] -pub mod windows_samsung; -#[cfg(windows)] -pub mod windows_tv; - -pub mod android_tv; -#[cfg(windows)] -pub mod windows_android_tv; - -pub mod tv_report; - -pub mod fps; -#[cfg(windows)] -pub mod windows_fps; - -#[cfg(windows)] -mod audio_devices; diff --git a/src/library_flow.rs b/src/library_flow.rs index b3d23d9..5aa6ce5 100644 --- a/src/library_flow.rs +++ b/src/library_flow.rs @@ -4,7 +4,7 @@ //! display preset or TV in place and get back to the scene with it selected. Every flow ends in //! the normal Library editor, so saving still only saves. use crate::{DirectorApp, Message, Page, display_ui::DisplayMessage, scene_ui::SceneMessage, work}; -use director::displays::Layout; +use director::display::displays::Layout; use windows_reactor::*; #[derive(Clone, Copy, Debug, PartialEq, Eq)] @@ -19,7 +19,7 @@ pub(crate) enum LibraryMessage { NewDisplay(Option), NewTv, /// Open a new scene draft, for example one whose Sound step holds what's set in Now. - NewScene(Box), + NewScene(Box), /// Create the item for this scene section, then return to the scene with it selected. FromScene(Slot), } @@ -29,7 +29,7 @@ pub(crate) struct LibraryFlow { /// A new display preset to open once the Displays page has loaded. display_seed: Option>, /// A new scene draft to open once Scenes has loaded. - scene_seed: Option, + scene_seed: Option, /// The scene section waiting for the item being created. scene_return: Option, /// The item to select in the scene draft once the scene catalog has reloaded. @@ -118,7 +118,7 @@ impl DirectorApp { work(cx, move || { Message::Display(DisplayMessage::EditorLoaded( true, - director::windows_display_modes::discover(&layout) + director::display::windows_display_modes::discover(&layout) .map(|options| (layout, options)), )) }); diff --git a/src/nav_guard.rs b/src/nav_guard.rs index 842db10..fd3f8b9 100644 --- a/src/nav_guard.rs +++ b/src/nav_guard.rs @@ -5,7 +5,7 @@ //! Save, Discard or Keep editing. Links inside an editor that are meant to come back to //! the draft (Manage presets, View TV, New … preset) navigate without asking. use crate::{DirectorApp, Message, Page, display_ui::DisplayMessage}; -use director::{displays, scenes::Scene, tvs::Tv}; +use director::{display::displays, scene::scenes::Scene, tv::tvs::Tv}; use windows_reactor::*; #[derive(Clone)] @@ -115,8 +115,12 @@ impl DirectorApp { self.scene_ready() && self.scene.draft.as_ref().is_some_and(|d| { !d.name.trim().is_empty() - && director::scenes::resolve(d, &self.scene.displays, &self.scene.tvs) - .is_ok() + && director::scene::scenes::resolve( + d, + &self.scene.displays, + &self.scene.tvs, + ) + .is_ok() }) } // Now applies changes rather than saving them. diff --git a/src/options_ui.rs b/src/options_ui.rs index e70bfd6..228c025 100644 --- a/src/options_ui.rs +++ b/src/options_ui.rs @@ -331,7 +331,7 @@ impl DirectorApp { seconds( prefs.map(|p| p.tv_input_guard_seconds), 0.0, - f64::from(director::tv_input_guard::MAX_SECONDS), + f64::from(director::tv::tv_input_guard::MAX_SECONDS), "TV input protection seconds", |v| Message::Tip(crate::tv_tip_ui::TipMessage::InputGuard(v)), ), diff --git a/src/preferences.rs b/src/preferences.rs index e1e9bec..8501502 100644 --- a/src/preferences.rs +++ b/src/preferences.rs @@ -27,7 +27,7 @@ fn default_wait() -> u16 { 30 } fn default_input_guard() -> u16 { - crate::tv_input_guard::DEFAULT_SECONDS + crate::tv::tv_input_guard::DEFAULT_SECONDS } impl Default for Preferences { fn default() -> Self { @@ -42,13 +42,13 @@ impl Default for Preferences { } } impl Preferences { - pub fn scene_policy(&self) -> crate::scenes::ScenePolicy { - crate::scenes::ScenePolicy { + pub fn scene_policy(&self) -> crate::scene::scenes::ScenePolicy { + crate::scene::scenes::ScenePolicy { keep_completed: self.keep_completed_changes, wait_seconds: self.device_wait_seconds.clamp(1, 120), input_guard_seconds: self .tv_input_guard_seconds - .min(crate::tv_input_guard::MAX_SECONDS), + .min(crate::tv::tv_input_guard::MAX_SECONDS), } } pub fn audio_policy(&self) -> crate::audio::FailurePolicy { diff --git a/src/preset_cards_preview.rs b/src/preset_cards_preview.rs index c0a0e25..66cd40e 100644 --- a/src/preset_cards_preview.rs +++ b/src/preset_cards_preview.rs @@ -2,8 +2,8 @@ use crate::{DirectorApp, Message, Page, display_ui::DisplayMessage}; use director::{ audio::Output, - display_editor::{Change, Editor, Mode, Options}, - displays::{self, DesktopMode, Layout, Monitor, RefreshRate}, + display::display_editor::{Change, Editor, Mode, Options}, + display::displays::{self, DesktopMode, Layout, Monitor, RefreshRate}, }; use std::sync::atomic::{AtomicBool, Ordering}; pub(crate) static ENABLED: AtomicBool = AtomicBool::new(false); @@ -160,7 +160,7 @@ impl DirectorApp { self.display.presets = displays(); self.display.current = Some(layout()); self.scene.displays = self.display.presets.clone(); - self.scene.tvs = vec![director::tvs::Tv { + self.scene.tvs = vec![director::tv::tvs::Tv { id: "fixture-tv".into(), name: "Living room TV".into(), address: "192.0.2.50".into(), @@ -168,7 +168,7 @@ impl DirectorApp { samsung: Default::default(), android: Default::default(), connection: Default::default(), - display: Some(director::tvs::DisplayLink { + display: Some(director::tv::tvs::DisplayLink { device_path: "preview-2".into(), name: "Living room TV".into(), }), @@ -177,46 +177,47 @@ impl DirectorApp { name: "TV HDMI audio".into(), }), credential: Some(vec![1]), - inputs: vec![director::lg_protocol::Input { + inputs: vec![director::tv::lg_protocol::Input { id: "HDMI_1".into(), label: "PC HDMI 1".into(), }], - pc_input: Some(director::lg_protocol::Input { + pc_input: Some(director::tv::lg_protocol::Input { id: "HDMI_1".into(), label: "PC HDMI 1".into(), }), network: Default::default(), }]; - let mut scene = director::scenes::Scene::new("fixture-scene", "TV gaming scene"); + let mut scene = + director::scene::scenes::Scene::new("fixture-scene", "TV gaming scene"); scene.display = Some("fixture-display-1".into()); - scene.sound = Some(director::scenes::Sound { - output: Some(director::scenes::SoundOutput::Tv { + scene.sound = Some(director::scene::scenes::Sound { + output: Some(director::scene::scenes::SoundOutput::Tv { id: "fixture-tv".into(), }), volume: Some(35), ..Default::default() }); - scene.tv = Some(director::scenes::TvPreparation { + scene.tv = Some(director::scene::scenes::TvPreparation { off_when_leaving: false, id: "fixture-tv".into(), wake: true, input: Some("HDMI_1".into()), }); - scene.actions = vec![director::scenes::Action::Uri { + scene.actions = vec![director::scene::scenes::Action::Uri { target: "steam://open/bigpicture".into(), }]; - scene.leave = vec![director::scenes::Action::Uri { + scene.leave = vec![director::scene::scenes::Action::Uri { target: "steam://close/bigpicture".into(), }]; let mut headphones = - director::scenes::Scene::new("fixture-headphones", "Headphones"); - headphones.sound = Some(director::scenes::Sound { - output: Some(director::scenes::SoundOutput::Device { + director::scene::scenes::Scene::new("fixture-headphones", "Headphones"); + headphones.sound = Some(director::scene::scenes::Sound { + output: Some(director::scene::scenes::SoundOutput::Device { id: "fixture-chat".into(), name: "Chat headset".into(), }), volume: Some(30), - mic: Some(director::scenes::Mic { + mic: Some(director::scene::scenes::Mic { device: director::audio::DeviceSelection { id: "fixture-mic".into(), name: "Desk microphone".into(), @@ -244,7 +245,7 @@ impl DirectorApp { tv.display = None; tv.samsung = Default::default(); self.tv.draft = Some(tv); - self.tv.setup = Some(director::tv_setup::Setup::default()); + self.tv.setup = Some(director::tv::tv_setup::Setup::default()); self.tv.test_port = 2; } self.status = "Ready.".into(); @@ -305,9 +306,9 @@ impl DirectorApp { { let result: Result<(), String> = Err("fixture timeout (0x80072EE2), secret=do-not-export 192.0.2.98".into()); - director::tv_report::record( + director::tv::tv_report::record( &tv.id, - director::tv_report::Action::Pair, + director::tv::tv_report::Action::Pair, std::time::Instant::now(), &result, None, @@ -319,12 +320,12 @@ impl DirectorApp { .tv .draft .as_ref() - .is_some_and(|t| t.brand == director::tvs::Brand::TclAndroid); + .is_some_and(|t| t.brand == director::tv::tvs::Brand::TclAndroid); if android && !self.tv.android_fixture_waiting { self.tv.android_fixture_waiting = true; return true; } - if android && director::android_tv::code(&self.tv.android_code).is_err() { + if android && director::tv::android_tv::code(&self.tv.android_code).is_err() { return true; } self.tv.android_fixture_waiting = false; @@ -343,7 +344,7 @@ impl DirectorApp { if let Some(setup) = &mut self.tv.setup { setup.inputs_loaded = true; setup.input_chosen = true; - setup.step = director::tv_setup::Step::Input; + setup.step = director::tv::tv_setup::Step::Input; } self.status = "Fixture paired. No real network connection.".into(); true @@ -367,9 +368,9 @@ impl DirectorApp { if crate::samsung_ui::PREVIEW.load(Ordering::Acquire) => { if let Some(tv) = &self.tv.draft { - let data = director::samsung::report(tv).unwrap(); + let data = director::tv::samsung::report(tv).unwrap(); std::fs::write( - output(if tv.brand == director::tvs::Brand::TclAndroid { + output(if tv.brand == director::tv::tvs::Brand::TclAndroid { "android-fixture-report.json" } else { "samsung-fixture-report.json" diff --git a/src/preset_cards_ui.rs b/src/preset_cards_ui.rs index 3187b55..8e04f02 100644 --- a/src/preset_cards_ui.rs +++ b/src/preset_cards_ui.rs @@ -1,8 +1,8 @@ //! Saved-state previews. Rendering never queries or changes a device. use crate::{DirectorApp, Message, display_ui::DisplayMessage}; use director::{ - display_mirroring, - displays::{Layout, Monitor}, + display::display_mirroring, + display::displays::{Layout, Monitor}, }; use windows_reactor::*; /// Sized to the content so short cards don't end in empty space. @@ -409,7 +409,7 @@ impl DirectorApp { #[cfg(test)] mod tests { use super::{off_summary, screen_lines}; - use director::displays::{DesktopMode, Layout, Monitor, RefreshRate}; + use director::display::displays::{DesktopMode, Layout, Monitor, RefreshRate}; fn monitor(name: &str, mode: Option<(i32, u32, u32, u32)>, hdr: Option) -> Monitor { Monitor { adapter_luid: 1, diff --git a/src/samsung_ui.rs b/src/samsung_ui.rs index 1ecbd51..344bb48 100644 --- a/src/samsung_ui.rs +++ b/src/samsung_ui.rs @@ -1,6 +1,6 @@ //! Explicit, optional direct-command compatibility testing for Samsung and Android TV. use crate::{DirectorApp, Message, tv_ui::TvMessage}; -use director::tvs::Tv; +use director::tv::tvs::Tv; use windows_reactor::*; fn msg(m: TvMessage) -> Message { Message::Tv(m) @@ -22,7 +22,7 @@ impl DirectorApp { ComboBox::new().automation_name("Report wake worked").items_source(["Not tested","Yes","No"]).selected_index(Some(f.wake_worked.index())).horizontal_alignment(HorizontalAlignment::Stretch).is_enabled(!self.busy).on_selection_changed(cx.callback(|v|msg(TvMessage::ReportAnswer(2,v)))).slot(ComboBoxSlot::Header,"Did Wake actually turn the TV on?"), ))}else{View::empty()}, note("Export one file to send back. It includes test results and sanitized diagnostics, with no pairing secrets, IP/MAC addresses or raw logs. Nothing is uploaded."), - Button::new().automation_name(if tv.brand==director::tvs::Brand::TclAndroid{"Export Android TV compatibility report"}else{"Export Samsung compatibility report"}).is_enabled(!self.busy).on_click(cx.message(msg(TvMessage::ExportReport))).content("Export report…"), + Button::new().automation_name(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Export Android TV compatibility report"}else{"Export Samsung compatibility report"}).is_enabled(!self.busy).on_click(cx.message(msg(TvMessage::ExportReport))).content("Export report…"), )) } pub(crate) fn samsung_compatibility(&self, cx: &ViewContext, tv: &Tv) -> View { @@ -40,18 +40,18 @@ impl DirectorApp { .test_confirmation .and_then(|i| tv.compatibility().tests.get(i)); StackPanel::new().spacing(16.0).children(( - TextBlock::new().text(if tv.brand==director::tvs::Brand::TclAndroid{"Android TV compatibility"}else{"Samsung compatibility"}).font_size(crate::ui::SUBTITLE).font_weight(FontWeight::SEMI_BOLD), - note(format!("Model: {} · {}: {}",tv.compatibility().model.as_deref().unwrap_or("Not reported"),if tv.brand==director::tvs::Brand::TclAndroid{"Remote Service"}else{"Firmware"},tv.compatibility().firmware.as_deref().unwrap_or("Not reported"))), + TextBlock::new().text(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Android TV compatibility"}else{"Samsung compatibility"}).font_size(crate::ui::SUBTITLE).font_weight(FontWeight::SEMI_BOLD), + note(format!("Model: {} · {}: {}",tv.compatibility().model.as_deref().unwrap_or("Not reported"),if tv.brand==director::tv::tvs::Brand::TclAndroid{"Remote Service"}else{"Firmware"},tv.compatibility().firmware.as_deref().unwrap_or("Not reported"))), note("Pairing enables local power control. Input switching is optional. These TVs do not reliably acknowledge remote keys or report the selected input. Only commands you confirm will appear in controls and scenes."), if paired{StackPanel::new().spacing(12.0).children(( TextBlock::new().text("Test a direct HDMI command").font_weight(FontWeight::SEMI_BOLD), - ComboBox::new().automation_name(if tv.brand==director::tvs::Brand::TclAndroid{"Android TV HDMI test port"}else{"Samsung HDMI test port"}).items_source(["HDMI 1","HDMI 2","HDMI 3","HDMI 4"]).selected_index(Some(usize::from(port-1))).horizontal_alignment(HorizontalAlignment::Stretch).is_enabled(!self.busy&&pending.is_none()).on_selection_changed(cx.callback(|i|msg(TvMessage::TestPort(i)))), + ComboBox::new().automation_name(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Android TV HDMI test port"}else{"Samsung HDMI test port"}).items_source(["HDMI 1","HDMI 2","HDMI 3","HDMI 4"]).selected_index(Some(usize::from(port-1))).horizontal_alignment(HorizontalAlignment::Stretch).is_enabled(!self.busy&&pending.is_none()).on_selection_changed(cx.callback(|i|msg(TvMessage::TestPort(i)))), note("Connect something visible to the chosen port. Using the physical remote, switch the TV to a different input before testing. Director sends one direct command; it does not navigate menus."), CheckBox::new().automation_name("TV is on a different input").is_checked(Some(self.tv.test_ready)).is_enabled(!self.busy&&pending.is_none()).on_is_checked_changed(cx.callback(|v|msg(TvMessage::TestReady(v)))).content("The TV is on a different input"), - Button::new().automation_name(if tv.brand==director::tvs::Brand::TclAndroid{"Test direct Android TV HDMI command"}else{"Test direct Samsung HDMI command"}).is_enabled(!self.busy&&self.tv.test_ready&&pending.is_none()).on_click(cx.message(msg(TvMessage::TestHdmi))).content(format!("Test HDMI {port}")), - if let Some(test)=pending{Border::new().padding(16.0).corner_radius(crate::ui::RADIUS_L).border_brush(crate::ui::card_stroke()).border_thickness(1.0).content(StackPanel::new().spacing(12.0).children((TextBlock::new().text(format!("Did the TV switch to HDMI {}?",test.port)).font_weight(FontWeight::SEMI_BOLD).text_wrapping(TextWrapping::Wrap),note("Confirm only if the TV actually changed from the other input to the selected HDMI port."),StackPanel::new().orientation(Orientation::Horizontal).spacing(8.0).children((Button::new().automation_name(if tv.brand==director::tvs::Brand::TclAndroid{"Android TV HDMI test succeeded"}else{"Samsung HDMI test succeeded"}).style(ButtonStyle::Accent).is_enabled(!self.busy).on_click(cx.message(msg(TvMessage::ConfirmTest(true)))).content("Yes, it switched"),Button::new().automation_name(if tv.brand==director::tvs::Brand::TclAndroid{"Android TV HDMI test failed"}else{"Samsung HDMI test failed"}).is_enabled(!self.busy).on_click(cx.message(msg(TvMessage::ConfirmTest(false)))).content("No"))))))}else{View::empty()}, + Button::new().automation_name(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Test direct Android TV HDMI command"}else{"Test direct Samsung HDMI command"}).is_enabled(!self.busy&&self.tv.test_ready&&pending.is_none()).on_click(cx.message(msg(TvMessage::TestHdmi))).content(format!("Test HDMI {port}")), + if let Some(test)=pending{Border::new().padding(16.0).corner_radius(crate::ui::RADIUS_L).border_brush(crate::ui::card_stroke()).border_thickness(1.0).content(StackPanel::new().spacing(12.0).children((TextBlock::new().text(format!("Did the TV switch to HDMI {}?",test.port)).font_weight(FontWeight::SEMI_BOLD).text_wrapping(TextWrapping::Wrap),note("Confirm only if the TV actually changed from the other input to the selected HDMI port."),StackPanel::new().orientation(Orientation::Horizontal).spacing(8.0).children((Button::new().automation_name(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Android TV HDMI test succeeded"}else{"Samsung HDMI test succeeded"}).style(ButtonStyle::Accent).is_enabled(!self.busy).on_click(cx.message(msg(TvMessage::ConfirmTest(true)))).content("Yes, it switched"),Button::new().automation_name(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Android TV HDMI test failed"}else{"Samsung HDMI test failed"}).is_enabled(!self.busy).on_click(cx.message(msg(TvMessage::ConfirmTest(false)))).content("No"))))))}else{View::empty()}, note(if confirmed.is_empty(){"No direct inputs confirmed. Input controls stay hidden; you can skip this test and use power control.".into()}else{format!("Confirmed: {}",confirmed.iter().map(|i|i.label.as_str()).collect::>().join(", "))}), - if confirmed.is_empty(){View::empty()}else{ComboBox::new().automation_name(if tv.brand==director::tvs::Brand::TclAndroid{"Android TV PC input"}else{"Samsung PC input"}).items_source(std::iter::once("No automatic PC input".into()).chain(confirmed.iter().map(|i|i.label.clone())).collect::>()).selected_index(Some(tv.pc_input.as_ref().and_then(|pc|confirmed.iter().position(|i|i.id==pc.id)).map_or(0,|i|i+1))).horizontal_alignment(HorizontalAlignment::Stretch).is_enabled(!self.busy).on_selection_changed(cx.callback(|i|msg(TvMessage::PcInput(i)))).slot(ComboBoxSlot::Header,"PC input for scenes")}, + if confirmed.is_empty(){View::empty()}else{ComboBox::new().automation_name(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Android TV PC input"}else{"Samsung PC input"}).items_source(std::iter::once("No automatic PC input".into()).chain(confirmed.iter().map(|i|i.label.clone())).collect::>()).selected_index(Some(tv.pc_input.as_ref().and_then(|pc|confirmed.iter().position(|i|i.id==pc.id)).map_or(0,|i|i+1))).horizontal_alignment(HorizontalAlignment::Stretch).is_enabled(!self.busy).on_selection_changed(cx.callback(|i|msg(TvMessage::PcInput(i)))).slot(ComboBoxSlot::Header,"PC input for scenes")}, ))}else{note("Pair this TV to run compatibility tests.")}, self.tv_test_report(cx,tv,true), )) diff --git a/src/scene/mod.rs b/src/scene/mod.rs new file mode 100644 index 0000000..c538e4f --- /dev/null +++ b/src/scene/mod.rs @@ -0,0 +1,6 @@ +//! Scenes: the model, the active scene, the first-scene starter and the Windows runner. +pub mod scene_session; +pub mod scenes; +pub mod starter; +#[cfg(windows)] +pub mod windows_scenes; diff --git a/src/scene_session.rs b/src/scene/scene_session.rs similarity index 100% rename from src/scene_session.rs rename to src/scene/scene_session.rs diff --git a/src/scenes.rs b/src/scene/scenes.rs similarity index 97% rename from src/scenes.rs rename to src/scene/scenes.rs index e637fa3..1e9fe8b 100644 --- a/src/scenes.rs +++ b/src/scene/scenes.rs @@ -152,7 +152,7 @@ impl Default for ScenePolicy { Self { keep_completed: false, wait_seconds: 30, - input_guard_seconds: crate::tv_input_guard::DEFAULT_SECONDS, + input_guard_seconds: crate::tv::tv_input_guard::DEFAULT_SECONDS, } } } @@ -354,16 +354,16 @@ impl Scene { #[derive(Clone)] pub struct Plan { pub scene: Scene, - pub display: Option, + pub display: Option, /// The resolved Sound step, with a TV's sound turned into its linked device. pub sound: Option, - pub tv: Option, + pub tv: Option, pub policy: ScenePolicy, } pub fn resolve( scene: &Scene, - displays: &[crate::displays::Preset], - tvs: &[crate::tvs::Tv], + displays: &[crate::display::displays::Preset], + tvs: &[crate::tv::tvs::Tv], ) -> Result { scene.validate()?; let display = scene @@ -415,7 +415,7 @@ pub fn resolve( /// The audio request for a Sound step. A TV's sound becomes the device linked to that TV. pub fn sound_request( sound: &Sound, - tvs: &[crate::tvs::Tv], + tvs: &[crate::tv::tvs::Tv], ) -> Result { if !sound.changes_something() { return Err("The scene's Sound step changes nothing. Edit the scene.".into()); @@ -507,7 +507,7 @@ pub fn load(path: &Path) -> Result, String> { } pub fn save(path: &Path, expected: &[Scene], next: &[Scene]) -> Result<(), String> { validate(next)?; - crate::cli_name::check_new_names(expected, next, |s| (&s.id, &s.name), "scene")?; + crate::cli::cli_name::check_new_names(expected, next, |s| (&s.id, &s.name), "scene")?; if load(path)? != expected { return Err("Scenes changed in another window. Reopen Scenes before saving.".into()); } @@ -572,7 +572,7 @@ pub trait Backend { /// Run an app, URI or Close action. A waited app may take up to `wait_seconds`. fn launch(&mut self, action: &Action, wait_seconds: u16) -> Result<(), String>; /// Turn a TV off, for scenes that do so when they're left. - fn tv_off(&mut self, tv: &crate::tvs::Tv) -> Result<(), String>; + fn tv_off(&mut self, tv: &crate::tv::tvs::Tv) -> Result<(), String>; fn restore(&mut self, snapshot: &Self::Snapshot) -> Result<(), String>; } pub fn apply( @@ -633,7 +633,7 @@ pub fn apply( && plan .tv .as_ref() - .is_some_and(|t| t.brand != crate::tvs::Brand::Lg) + .is_some_and(|t| t.brand != crate::tv::tvs::Brand::Lg) && plan.scene.tv.as_ref().is_some_and(|t| t.input.is_some()) { details.push( @@ -705,7 +705,7 @@ fn action_done(action: &Action) -> String { pub fn leave( backend: &mut impl Backend, scene: &Scene, - tvs: &[crate::tvs::Tv], + tvs: &[crate::tv::tvs::Tv], policy: ScenePolicy, mut progress: impl FnMut(&str), ) -> Vec { @@ -816,7 +816,7 @@ mod tests { } Ok(()) } - fn tv_off(&mut self, _: &crate::tvs::Tv) -> Result<(), String> { + fn tv_off(&mut self, _: &crate::tv::tvs::Tv) -> Result<(), String> { self.calls.push("tv-off"); if self.fail_run { Err("TV didn't answer".into()) @@ -952,10 +952,10 @@ mod tests { communications_output_id: None, input: None, }); - p.display = Some(crate::displays::Preset { + p.display = Some(crate::display::displays::Preset { id: "d".into(), name: "d".into(), - layout: crate::display_apply::tests::layout(0), + layout: crate::display::display_apply::tests::layout(0), confirm_changes: false, captured_at_unix_seconds: 0, }); @@ -970,7 +970,7 @@ mod tests { assert!(!apply(&mut b, &p, &AtomicBool::new(false), |_| {}).success); assert_eq!(b.calls, ["snapshot", "display", "audio"]); } - fn linked_tv() -> crate::tvs::Tv { + fn linked_tv() -> crate::tv::tvs::Tv { serde_json::from_value(serde_json::json!({"id":"tv","name":"C1","brand":"lg","connection":"encrypted","address":"192.0.2.50","display":null,"credential":[1],"audio":{"id":"hdmi","name":"LG HDMI"}})).unwrap() } fn tv_sound(volume: Option) -> Sound { @@ -1010,10 +1010,10 @@ mod tests { }); s.sound = Some(tv_sound(None)); let mut p = resolve(&s, &[], &[linked_tv()]).unwrap(); - p.display = Some(crate::displays::Preset { + p.display = Some(crate::display::displays::Preset { id: "d".into(), name: "d".into(), - layout: crate::display_apply::tests::layout(0), + layout: crate::display::display_apply::tests::layout(0), confirm_changes: false, captured_at_unix_seconds: 0, }); @@ -1146,7 +1146,7 @@ mod tests { } #[test] fn leaving_turns_the_tv_off_after_the_leave_actions() { - let tv = serde_json::from_value::(serde_json::json!({"id":"tv","name":"C1","brand":"lg","connection":"encrypted","address":"192.0.2.50","display":null,"credential":[1]})).unwrap(); + let tv = serde_json::from_value::(serde_json::json!({"id":"tv","name":"C1","brand":"lg","connection":"encrypted","address":"192.0.2.50","display":null,"credential":[1]})).unwrap(); let mut s = scene(); s.tv = Some(TvPreparation { id: "tv".into(), diff --git a/src/starter.rs b/src/scene/starter.rs similarity index 97% rename from src/starter.rs rename to src/scene/starter.rs index dfc6acc..a1efc49 100644 --- a/src/starter.rs +++ b/src/scene/starter.rs @@ -3,9 +3,9 @@ //! display preset instead of duplicating it, and never changes a device. use crate::{ audio::Output, - displays::{self, Layout}, + display::displays::{self, Layout}, fps, - scenes::{self, Scene}, + scene::scenes::{self, Scene}, }; /// The output the starter's Sound step uses: the console default, else any active one. @@ -62,7 +62,7 @@ pub fn unique_name<'a>(base: &str, taken: impl IntoIterator + Cl !taken .clone() .into_iter() - .any(|t| crate::cli_name::cli_name(t) == crate::cli_name::cli_name(n)) + .any(|t| crate::cli::cli_name::cli_name(t) == crate::cli::cli_name::cli_name(n)) }; if free(base) { return base.to_string(); @@ -144,7 +144,7 @@ pub fn plan( /// Save the starter scene and the display preset it needs. Changes no device. Returns the scene. #[cfg(windows)] pub fn save(choice: &Choice) -> Result { - let _lock = crate::windows_audio::OperationLock::acquire()?; + let _lock = crate::audio::windows_audio::OperationLock::acquire()?; let display_path = displays::path()?; let scene_path = scenes::path()?; let old_displays = displays::load(&display_path)?; @@ -185,7 +185,7 @@ pub fn save(choice: &Choice) -> Result { #[cfg(test)] mod tests { use super::*; - use crate::displays::{DesktopMode, Monitor, RefreshRate}; + use crate::display::displays::{DesktopMode, Monitor, RefreshRate}; fn output(id: &str, volume: Option) -> Output { Output { diff --git a/src/windows_scenes.rs b/src/scene/windows_scenes.rs similarity index 88% rename from src/windows_scenes.rs rename to src/scene/windows_scenes.rs index f197251..b8bf3e3 100644 --- a/src/windows_scenes.rs +++ b/src/scene/windows_scenes.rs @@ -1,10 +1,10 @@ //! Worker-owned native scene execution. Caller holds OperationLock for the entire run. use crate::{ + audio::windows_audio::WindowsAudio, audio::{self, AudioBackend, Role}, - display_apply::{self, Backend as DisplayBackend}, - scenes::{self, Action, Plan}, - windows_audio::WindowsAudio, - windows_display_apply::{Snapshot as DisplaySnapshot, WindowsDisplays}, + display::display_apply::{self, Backend as DisplayBackend}, + display::windows_display_apply::{Snapshot as DisplaySnapshot, WindowsDisplays}, + scene::scenes::{self, Action, Plan}, }; use std::{ sync::atomic::{AtomicBool, Ordering}, @@ -12,14 +12,14 @@ use std::{ }; pub type Catalog = ( Vec, - Vec, - Vec, + Vec, + Vec, ); pub fn catalog() -> Result { Ok(( scenes::load(&scenes::path()?)?, - crate::displays::load(&crate::displays::path()?)?, - crate::tvs::load(&crate::tvs::path()?)?, + crate::display::displays::load(&crate::display::displays::path()?)?, + crate::tv::tvs::load(&crate::tv::tvs::path()?)?, )) } pub fn load_plan(id: &str) -> Result { @@ -33,8 +33,8 @@ pub fn load_plan(id: &str) -> Result { fn checked_plan( scene: &scenes::Scene, - displays: &[crate::displays::Preset], - tvs: &[crate::tvs::Tv], + displays: &[crate::display::displays::Preset], + tvs: &[crate::tv::tvs::Tv], ) -> Result { let mut plan = scenes::resolve(scene, displays, tvs)?; plan.policy = crate::preferences::current().scene_policy(); @@ -65,8 +65,11 @@ pub fn load_run_plan(id: &str, name: &str, notify: bool) -> Result .iter() .find(|s| s.id == id) .ok_or("The scene was removed. Reopen Scenes.")?; - let target = - scenes::apply_destination(requested, crate::scene_session::active().as_deref(), &all)?; + let target = scenes::apply_destination( + requested, + crate::scene::scene_session::active().as_deref(), + &all, + )?; checked_plan(target, &displays, &tvs) })() .inspect_err(|error| { @@ -80,7 +83,7 @@ pub fn load_run_plan(id: &str, name: &str, notify: bool) -> Result } fn load_return_plan() -> Result, String> { - let Some(active) = crate::scene_session::active() else { + let Some(active) = crate::scene::scene_session::active() else { return Ok(None); }; let all = scenes::load(&scenes::path()?)?; @@ -111,7 +114,7 @@ pub fn run( mut progress: impl FnMut(&str), ) -> scenes::Report { // Leave the previous scene first. Its leave actions can't block this scene. - let leaving = crate::scene_session::active() + let leaving = crate::scene::scene_session::active() .filter(|id| *id != plan.scene.id) .and_then(|id| { scenes::load(&scenes::path().ok()?) @@ -119,8 +122,8 @@ pub fn run( .into_iter() .find(|s| s.id == id) }); - let tvs = crate::tvs::path() - .and_then(|p| crate::tvs::load(&p)) + let tvs = crate::tv::tvs::path() + .and_then(|p| crate::tv::tvs::load(&p)) .unwrap_or_default(); let warnings = leaving.map_or_else(Vec::new, |previous| { scenes::leave(backend, &previous, &tvs, plan.policy, &mut progress) @@ -144,7 +147,7 @@ pub fn run( }); report.details.splice(0..0, warnings); let active = report.success.then_some(plan.scene.id.as_str()); - if let Err(e) = crate::scene_session::set(active) { + if let Err(e) = crate::scene::scene_session::set(active) { report.details.push(e); } save_result(&plan.scene.name, &stage, &report, notify); @@ -169,7 +172,7 @@ pub fn end( } Ok(None) => {} } - let Some(id) = crate::scene_session::active() else { + let Some(id) = crate::scene::scene_session::active() else { return scenes::Report { success: true, message: "No scene is active.".into(), @@ -186,8 +189,8 @@ pub fn end( scenes::leave( backend, scene, - &crate::tvs::path() - .and_then(|p| crate::tvs::load(&p)) + &crate::tv::tvs::path() + .and_then(|p| crate::tv::tvs::load(&p)) .unwrap_or_default(), policy, &mut progress, @@ -196,7 +199,7 @@ pub fn end( None => ("The scene".into(), vec![]), }; let success = details.is_empty(); - if let Err(e) = crate::scene_session::set(None) { + if let Err(e) = crate::scene::scene_session::set(None) { details.push(e); } scenes::Report { @@ -211,11 +214,11 @@ pub fn end( } pub struct Snapshot { - display: Option<(crate::displays::Layout, DisplaySnapshot)>, + display: Option<(crate::display::displays::Layout, DisplaySnapshot)>, routes: Vec<(bool, Role, String)>, fps: Option, } -pub struct WindowsScene bool> { +pub struct WindowsScene bool> { displays: WindowsDisplays, audio: Option, levels: Vec<(String, f32)>, @@ -223,11 +226,11 @@ pub struct WindowsScene bool> { display_attempted: bool, tv_attempted: bool, audio_attempted: bool, - fps: Option, + fps: Option, fps_attempted: bool, confirm: F, } -impl bool> WindowsScene { +impl bool> WindowsScene { pub fn new(confirm: F) -> Self { Self { displays: WindowsDisplays::default(), @@ -276,7 +279,7 @@ fn level_targets( } Ok(targets) } -impl bool> WindowsScene { +impl bool> WindowsScene { /// Remember a device's volume and mute once, before the scene changes them. A device /// that isn't connected yet is skipped; it is remembered when it appears. fn remember( @@ -318,12 +321,12 @@ fn paused(cancel: &AtomicBool, deadline: Instant) -> Result<(), String> { Ok(()) } } -impl bool> scenes::Backend for WindowsScene { +impl bool> scenes::Backend for WindowsScene { type Snapshot = Snapshot; fn snapshot(&mut self, plan: &Plan) -> Result { let fps = if let Some(request) = &plan.scene.fps { request.validate()?; - let mut provider = crate::windows_fps::WindowsFps::open(request.provider)?; + let mut provider = crate::fps::windows_fps::WindowsFps::open(request.provider)?; let snapshot = crate::fps::Backend::snapshot(&mut provider)?; self.fps = Some(provider); Some(snapshot) @@ -365,7 +368,7 @@ impl bool> scenes::Backend for WindowsScen cancel: &AtomicBool, progress: &mut dyn FnMut(&str), ) -> Result<(), String> { - use crate::tv_control::Backend; + use crate::tv::tv_control::Backend; self.tv_attempted = true; let tv = plan.tv.as_ref().ok_or("Missing TV.")?; let prep = plan.scene.tv.as_ref().ok_or("Missing TV preparation.")?; @@ -376,11 +379,11 @@ impl bool> scenes::Backend for WindowsScen if cancel.load(Ordering::Acquire) || Instant::now() >= deadline { return Err("TV readiness timed out or was canceled.".into()); } - let mut controls = crate::windows_tv::WindowsTvControls::new(tv); + let mut controls = crate::tv::windows_tv::WindowsTvControls::new(tv); if controls.power().is_ok_and(|p| p.awake()) { if let Some(id) = &prep.input { progress("Selecting the TV input…"); - crate::tv_control::switch_input(&mut controls, id)?; + crate::tv::tv_control::switch_input(&mut controls, id)?; if !controls.input_readback() { return Ok(()); } @@ -403,14 +406,14 @@ impl bool> scenes::Backend for WindowsScen } // Then keep it there in the background while the scene carries on. let (tv, id) = (tv.clone(), id.clone()); - crate::tv_input_guard::start( + crate::tv::tv_input_guard::start( plan.policy.input_guard_seconds, move |stop, until| { - crate::tv_input_guard::hold( - || crate::windows_tv::WindowsTvControls::new(&tv), + crate::tv::tv_input_guard::hold( + || crate::tv::windows_tv::WindowsTvControls::new(&tv), &id, || stop.is_set(), - || crate::tv_input_guard::sleep_until(stop, until), + || crate::tv::tv_input_guard::sleep_until(stop, until), ); }, ); @@ -419,9 +422,9 @@ impl bool> scenes::Backend for WindowsScen } if prep.wake && wakes < 5 && Instant::now() >= next_wake { progress("Waking TV and waiting for a response…"); - crate::tv_control::Backend::wake(&mut crate::windows_tv::WindowsTvControls::new( - tv, - ))?; + crate::tv::tv_control::Backend::wake( + &mut crate::tv::windows_tv::WindowsTvControls::new(tv), + )?; wakes += 1; next_wake = Instant::now() + Duration::from_secs(5); } @@ -509,7 +512,7 @@ impl bool> scenes::Backend for WindowsScen let wanted = plan.scene.fps.as_ref().ok_or("Missing FPS request.")?; // Displays run first, so this reads the refresh rate the scene switched to. let refresh = if wanted.vrr_safe { - crate::windows_displays::capture()?.primary_refresh_hz() + crate::display::windows_displays::capture()?.primary_refresh_hz() } else { None }; @@ -519,10 +522,10 @@ impl bool> scenes::Backend for WindowsScen provider.set(&request)?; crate::fps::verify(&request, &provider.snapshot()?) } - fn tv_off(&mut self, tv: &crate::tvs::Tv) -> Result<(), String> { - crate::tv_control::power( - &mut crate::windows_tv::WindowsTvControls::new(tv), - crate::tv_control::PowerAction::Off, + fn tv_off(&mut self, tv: &crate::tv::tvs::Tv) -> Result<(), String> { + crate::tv::tv_control::power( + &mut crate::tv::windows_tv::WindowsTvControls::new(tv), + crate::tv::tv_control::PowerAction::Off, ) .map(|_| ()) } @@ -600,7 +603,7 @@ impl bool> scenes::Backend for WindowsScen } fn restore(&mut self, snapshot: &Snapshot) -> Result<(), String> { // The scene stopped: stop holding the TV on its input too. - crate::tv_input_guard::stop(); + crate::tv::tv_input_guard::stop(); let mut errors = vec![]; if self.fps_attempted && let (Some(provider), Some(saved)) = (&mut self.fps, &snapshot.fps) @@ -685,14 +688,14 @@ fn finish_cli_run(report: scenes::Report) -> i32 { for detail in report.details { println!("{detail}"); } - if crate::tv_input_guard::active() { + if crate::tv::tv_input_guard::active() { eprintln!("Keeping the TV on the scene’s input for a few seconds (TV input protection)…"); } - crate::tv_input_guard::wait(); + crate::tv::tv_input_guard::wait(); if report.success { 0 } else { 1 } } -fn cli_confirm(_: &crate::displays::Preset) -> bool { +fn cli_confirm(_: &crate::display::displays::Preset) -> bool { let (tx, rx) = std::sync::mpsc::channel(); std::thread::spawn(move || { let mut line = String::new(); @@ -711,7 +714,7 @@ fn cli_confirm(_: &crate::displays::Preset) -> bool { pub fn cli(args: &[String]) -> Result { match args { [command] if command == "end" => { - let _lock = crate::windows_audio::OperationLock::acquire()?; + let _lock = crate::audio::windows_audio::OperationLock::acquire()?; let mut backend = WindowsScene::new(cli_confirm); let report = end(&mut backend, &AtomicBool::new(false), true, |s| { eprintln!("{s}") @@ -722,9 +725,10 @@ pub fn cli(args: &[String]) -> Result { if (command == "apply" || command == "check") && (rest.is_empty() || rest == ["--yes"] || rest == ["--confirm"]) => { - let _lock = crate::windows_audio::OperationLock::acquire()?; + let _lock = crate::audio::windows_audio::OperationLock::acquire()?; let all = scenes::load(&scenes::path()?)?; - let scene = crate::cli_name::find(&all, name, |s| (&s.id, &s.name), "scene", "scene")?; + let scene = + crate::cli::cli_name::find(&all, name, |s| (&s.id, &s.name), "scene", "scene")?; let mut plan = if command == "check" { load_plan(&scene.id)? } else { diff --git a/src/scene_editor_ui.rs b/src/scene_editor_ui.rs index 451a536..c6ca74c 100644 --- a/src/scene_editor_ui.rs +++ b/src/scene_editor_ui.rs @@ -4,7 +4,7 @@ //! are muted "+ Add" slots. When leaving runs at a different time, so it sits apart from the //! line. use crate::{DirectorApp, Message, scene_ui::SceneMessage}; -use director::scenes::{self, Action, ActionList, Scene}; +use director::scene::scenes::{self, Action, ActionList, Scene}; use windows_reactor::*; #[derive(Clone, Copy, Debug, PartialEq, Eq)] @@ -554,7 +554,7 @@ impl DirectorApp { } else { View::empty() }, - if tv.brand == director::tvs::Brand::Lg + if tv.brand == director::tv::tvs::Brand::Lg || !tv.control_inputs().is_empty() { ComboBox::new() diff --git a/src/scene_ui.rs b/src/scene_ui.rs index d32838d..8869dc3 100644 --- a/src/scene_ui.rs +++ b/src/scene_ui.rs @@ -1,9 +1,9 @@ //! Native scene cards and editor; device work stays on the shared worker runner. use crate::{DirectorApp, Message, work}; use director::{ + audio::windows_audio::OperationLock, audio::{DeviceSelection, Output}, - scenes::{self, Action, ActionList, Scene, Sound, SoundOutput, TvPreparation}, - windows_audio::OperationLock, + scene::scenes::{self, Action, ActionList, Scene, Sound, SoundOutput, TvPreparation}, }; use std::sync::{ Arc, Mutex, @@ -14,8 +14,8 @@ use windows_reactor::*; /// Scenes, display presets, TVs, and the audio outputs and inputs the Sound step can pick. type Catalog = ( Vec, - Vec, - Vec, + Vec, + Vec, Vec, Vec, ); @@ -135,15 +135,15 @@ pub(crate) enum Event { #[derive(Default)] pub(crate) struct SceneState { pub(crate) scenes: Vec, - pub(crate) displays: Vec, - pub(crate) tvs: Vec, + pub(crate) displays: Vec, + pub(crate) tvs: Vec, pub(crate) draft: Option, pub(crate) ready: bool, delete: Option, token: u64, cancel: Option>, events: Option>>>, - confirm: Option>, + confirm: Option>, remaining: Option, /// The step whose editor dialog is open. pub(crate) open: Option, @@ -297,7 +297,7 @@ impl DirectorApp { work(cx, move || { msg(SceneMessage::Saved((|| { let _lock = OperationLock::acquire()?; - let (_, displays, tvs) = director::windows_scenes::catalog()?; + let (_, displays, tvs) = director::scene::windows_scenes::catalog()?; for scene in &next { if !expected.iter().any(|old| old == scene) { scenes::resolve(scene, &displays, &tvs)?; @@ -346,16 +346,18 @@ impl DirectorApp { self.begin("Reading scenes and presets…"); work(cx, || { msg(SceneMessage::Loaded(Box::new( - director::windows_scenes::catalog().map(|(scenes, displays, tvs)| { - // Device lists only feed the Sound step's pickers; a failure - // leaves them empty rather than blocking Scenes. - let devices = |input| { - director::windows_audio::WindowsAudio::new() - .and_then(|mut a| a.picker_devices(input)) - .unwrap_or_default() - }; - (scenes, displays, tvs, devices(false), devices(true)) - }), + director::scene::windows_scenes::catalog().map( + |(scenes, displays, tvs)| { + // Device lists only feed the Sound step's pickers; a failure + // leaves them empty rather than blocking Scenes. + let devices = |input| { + director::audio::windows_audio::WindowsAudio::new() + .and_then(|mut a| a.picker_devices(input)) + .unwrap_or_default() + }; + (scenes, displays, tvs, devices(false), devices(true)) + }, + ), ))) }); } @@ -369,7 +371,7 @@ impl DirectorApp { self.outputs = outputs; self.inputs = inputs; self.scene.ready = true; - self.scene.active = director::scene_session::active(); + self.scene.active = director::scene::scene_session::active(); self.status = "Ready.".into(); self.library_select_in_scene(cx); self.library_resume(cx); @@ -720,9 +722,9 @@ impl DirectorApp { let _lock = OperationLock::acquire()?; let confirmation_tx = tx.clone(); let confirm_cancel = cancel.clone(); - let mut backend = director::windows_scenes::WindowsScene::new( - move |_: &director::displays::Preset| { - director::display_apply::wait_for_confirmation( + let mut backend = director::scene::windows_scenes::WindowsScene::new( + move |_: &director::display::displays::Preset| { + director::display::display_apply::wait_for_confirmation( &cr, std::time::Duration::from_secs(15), |seconds| { @@ -737,9 +739,10 @@ impl DirectorApp { }; match requested { Some(id) => { - let plan = - director::windows_scenes::load_run_plan(&id, &name, false)?; - Ok(director::windows_scenes::run( + let plan = director::scene::windows_scenes::load_run_plan( + &id, &name, false, + )?; + Ok(director::scene::windows_scenes::run( &mut backend, &plan, &cancel, @@ -747,7 +750,7 @@ impl DirectorApp { progress, )) } - None => Ok(director::windows_scenes::end( + None => Ok(director::scene::windows_scenes::end( &mut backend, &cancel, false, @@ -785,9 +788,9 @@ impl DirectorApp { SceneMessage::Confirm(result) => { if let Some(tx) = &self.scene.confirm { let _ = tx.send(if result == ContentDialogResult::Primary { - director::display_apply::Decision::Keep + director::display::display_apply::Decision::Keep } else { - director::display_apply::Decision::Revert + director::display::display_apply::Decision::Revert }); } self.scene.remaining = None; @@ -798,7 +801,7 @@ impl DirectorApp { self.scene.cancel = None; self.scene.confirm = None; self.scene.remaining = None; - self.scene.active = director::scene_session::active(); + self.scene.active = director::scene::scene_session::active(); match result { Ok(r) => { self.error = !r.success; diff --git a/src/starter_ui.rs b/src/starter_ui.rs index 17adb60..0fbd6c0 100644 --- a/src/starter_ui.rs +++ b/src/starter_ui.rs @@ -1,10 +1,10 @@ //! The Scenes page's first run: one card that saves how the PC is set up right now as the -//! everyday scene, and afterwards a tip about making the next one. See `director::starter`. +//! everyday scene, and afterwards a tip about making the next one. See `director::scene::starter`. use crate::{DirectorApp, Message, scene_ui::SceneMessage, work}; use director::{ audio::{AudioBackend, Output}, - displays::Layout, - starter, + display::displays::Layout, + scene::starter, }; use windows_reactor::*; @@ -110,8 +110,8 @@ impl DirectorApp { StarterMessage::Probe if !self.scene.starter.probing => { self.scene.starter.probing = true; work(cx, || { - let layout = director::windows_displays::capture(); - let output = director::windows_audio::WindowsAudio::new() + let layout = director::display::windows_displays::capture(); + let output = director::audio::windows_audio::WindowsAudio::new() .and_then(|mut a| a.outputs()) .map(|list| starter::default_output(&list).cloned()); msg(StarterMessage::Probed(layout, output)) @@ -134,7 +134,7 @@ impl DirectorApp { self.begin("Saving your scene…"); work(cx, move || { msg(StarterMessage::Saved( - director::starter::save(&choice).map(|scene| scene.name), + director::scene::starter::save(&choice).map(|scene| scene.name), )) }); } diff --git a/src/android_tv.rs b/src/tv/android_tv.rs similarity index 100% rename from src/android_tv.rs rename to src/tv/android_tv.rs diff --git a/src/lg_protocol.rs b/src/tv/lg_protocol.rs similarity index 95% rename from src/lg_protocol.rs rename to src/tv/lg_protocol.rs index 7b4729d..003801f 100644 --- a/src/lg_protocol.rs +++ b/src/tv/lg_protocol.rs @@ -78,7 +78,7 @@ pub fn inputs(message: &Value) -> Result, String> { .collect() } /// Read only TV-reported adapter addresses; never infer a gateway/neighbor MAC. -pub fn network(message: &Value) -> Result { +pub fn network(message: &Value) -> Result { if message["type"] == "error" || message["payload"]["returnValue"] == false { return Err("The TV did not allow reading its network addresses. You can enter a MAC address manually.".into()); } @@ -87,7 +87,7 @@ pub fn network(message: &Value) -> Result Result { - use crate::tv_control::PowerState; +pub fn power_state(message: &Value) -> Result { + use crate::tv::tv_control::PowerState; if message["type"] == "error" || message["payload"]["returnValue"] == false { return Err("The TV refused the power-status request.".into()); } @@ -204,11 +204,11 @@ mod control_protocol_tests { fn status_and_acknowledgement_are_not_inferred_from_connectivity() { assert_eq!( power_state(&json!({"payload":{"state":"Active"}})).unwrap(), - crate::tv_control::PowerState::On + crate::tv::tv_control::PowerState::On ); assert_eq!( power_state(&json!({"payload":{"state":"future-state"}})).unwrap(), - crate::tv_control::PowerState::Unknown + crate::tv::tv_control::PowerState::Unknown ); assert!(power_state(&json!({"type":"error"})).is_err()); assert!( diff --git a/src/tv/mod.rs b/src/tv/mod.rs new file mode 100644 index 0000000..a660ac6 --- /dev/null +++ b/src/tv/mod.rs @@ -0,0 +1,20 @@ +//! TVs: saved definitions, setup, control, Wake-on-LAN and the LG, Samsung and Android TV backends. +pub mod android_tv; +pub mod lg_protocol; +pub mod samsung; +#[cfg(windows)] +pub mod tv_cli; +pub mod tv_control; +pub mod tv_input_guard; +pub mod tv_network; +pub mod tv_report; +pub mod tv_setup; +pub mod tvs; +#[cfg(windows)] +pub mod windows_android_tv; +#[cfg(windows)] +pub mod windows_lg; +#[cfg(windows)] +pub mod windows_samsung; +#[cfg(windows)] +pub mod windows_tv; diff --git a/src/samsung.rs b/src/tv/samsung.rs similarity index 88% rename from src/samsung.rs rename to src/tv/samsung.rs index 89675fb..9c30858 100644 --- a/src/samsung.rs +++ b/src/tv/samsung.rs @@ -1,5 +1,5 @@ //! Samsung direct-command capabilities and a deliberately redacted compatibility report. -use crate::{lg_protocol::Input, tv_control::PowerState}; +use crate::{tv::lg_protocol::Input, tv::tv_control::PowerState}; use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] #[serde(deny_unknown_fields)] @@ -11,7 +11,7 @@ pub struct Metadata { #[serde(default)] pub tests: Vec, #[serde(default)] - pub feedback: crate::tv_report::Feedback, + pub feedback: crate::tv::tv_report::Feedback, } #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] #[serde(deny_unknown_fields)] @@ -84,14 +84,14 @@ pub struct Info { pub firmware: Option, pub token_required: Option, pub power: PowerState, - pub network: crate::tv_network::NetworkAddresses, + pub network: crate::tv::tv_network::NetworkAddresses, } pub(crate) fn safe_text(value: &serde_json::Value) -> Option { let s = value.as_str()?; if s.is_empty() || s.len() > 160 || s.split_whitespace() - .any(|part| part.parse::().is_ok()) + .any(|part| part.parse::().is_ok()) || !s .chars() .all(|c| c.is_ascii_alphanumeric() || " ._-/()".contains(c)) @@ -130,7 +130,7 @@ pub fn info(value: &serde_json::Value) -> Result { "off" => PowerState::Off, _ => PowerState::Unknown, }; - let network = crate::tv_network::NetworkAddresses { + let network = crate::tv::tv_network::NetworkAddresses { wifi: d["wifiMac"].as_str().and_then(|s| s.parse().ok()), wired: d["networkMac"] .as_str() @@ -201,14 +201,14 @@ pub struct CompatibilityReport { pub input_readback: bool, pub tests: Vec, pub confirmed_inputs: Vec, - pub feedback: crate::tv_report::Feedback, - pub environment: crate::tv_report::Environment, - pub wake_configuration: crate::tv_report::WakeConfiguration, - pub diagnostics: crate::tv_report::History, + pub feedback: crate::tv::tv_report::Feedback, + pub environment: crate::tv::tv_report::Environment, + pub wake_configuration: crate::tv::tv_report::WakeConfiguration, + pub diagnostics: crate::tv::tv_report::History, pub note: &'static str, } -pub fn report(tv: &crate::tvs::Tv) -> Result { - if tv.brand == crate::tvs::Brand::Lg { +pub fn report(tv: &crate::tv::tvs::Tv) -> Result { + if tv.brand == crate::tv::tvs::Brand::Lg { return Err("Compatibility reports are available for Samsung and TCL Android TVs.".into()); } let clean = |s: &Option| { @@ -226,20 +226,20 @@ pub fn report(tv: &crate::tvs::Tv) -> Result { brand: tv.brand.label(), model: clean(&tv.compatibility().model), firmware: clean(&tv.compatibility().firmware), - version_kind: if tv.brand == crate::tvs::Brand::TclAndroid { + version_kind: if tv.brand == crate::tv::tvs::Brand::TclAndroid { "Android TV Remote Service version" } else { "TV firmware" }, paired: tv.credential.is_some(), - connection: if tv.brand == crate::tvs::Brand::TclAndroid { + connection: if tv.brand == crate::tv::tvs::Brand::TclAndroid { "Mutual TLS / Android TV Remote v2" - } else if tv.connection == crate::tvs::Connection::Encrypted { + } else if tv.connection == crate::tv::tvs::Connection::Encrypted { "TLS WebSocket" } else { "Legacy WebSocket" }, - token_required: if tv.brand == crate::tvs::Brand::TclAndroid { + token_required: if tv.brand == crate::tv::tvs::Brand::TclAndroid { None } else { tv.samsung.token_required @@ -248,13 +248,13 @@ pub fn report(tv: &crate::tvs::Tv) -> Result { tests, confirmed_inputs: tv.compatibility().inputs(), feedback: tv.compatibility().feedback.redacted(), - environment: crate::tv_report::environment(), - wake_configuration: crate::tv_report::wake_configuration(tv), - diagnostics: crate::tv_report::history(&tv.id), + environment: crate::tv::tv_report::environment(), + wake_configuration: crate::tv::tv_report::wake_configuration(tv), + diagnostics: crate::tv::tv_report::history(&tv.id), note: "Remote commands have no per-key acknowledgment. Confirmed means the user reported a successful switch on this TV with this observed model/firmware. It is not a guarantee for other TVs. No address, MAC, alias, token, certificate, device links or raw responses are included.", }) } -pub fn export(tv: &crate::tvs::Tv) -> Result { +pub fn export(tv: &crate::tv::tvs::Tv) -> Result { let data = report(tv)?; let now = std::time::SystemTime::now() .duration_since(std::time::UNIX_EPOCH) @@ -262,7 +262,7 @@ pub fn export(tv: &crate::tvs::Tv) -> Result { .as_nanos(); let path = crate::storage::settings_path("Reports")?.join(format!( "{}-compatibility-{now}.json", - if tv.brand == crate::tvs::Brand::TclAndroid { + if tv.brand == crate::tv::tvs::Brand::TclAndroid { "android-tv" } else { "samsung" @@ -320,7 +320,7 @@ mod tests { } #[test] fn report_is_an_allowlist_and_never_serializes_secrets_or_addresses() { - let tv:crate::tvs::Tv=serde_json::from_value(serde_json::json!({"id":"private-id","name":"private-alias","brand":"samsung","connection":"encrypted","address":"192.0.2.50","display":null,"credential":[1,2,3],"samsung":{"model":"S90C","firmware":"1234","tests":[]}})).unwrap(); + let tv:crate::tv::tvs::Tv=serde_json::from_value(serde_json::json!({"id":"private-id","name":"private-alias","brand":"samsung","connection":"encrypted","address":"192.0.2.50","display":null,"credential":[1,2,3],"samsung":{"model":"S90C","firmware":"1234","tests":[]}})).unwrap(); let data = serde_json::to_string(&report(&tv).unwrap()).unwrap(); assert!(data.contains("S90C")); for value in [ diff --git a/src/tv_cli.rs b/src/tv/tv_cli.rs similarity index 85% rename from src/tv_cli.rs rename to src/tv/tv_cli.rs index 8313f22..7a4e019 100644 --- a/src/tv_cli.rs +++ b/src/tv/tv_cli.rs @@ -1,13 +1,13 @@ //! Explicit headless TV operations; never create a GUI or toggle power blindly. use crate::{ - tv_control::{self, PowerAction}, - tvs, - windows_audio::OperationLock, - windows_tv::{self, WindowsTvControls}, + audio::windows_audio::OperationLock, + tv::tv_control::{self, PowerAction}, + tv::tvs, + tv::windows_tv::{self, WindowsTvControls}, }; /// A saved TV by ID or CLI name. fn find<'a>(tvs: &'a [tvs::Tv], name: &str) -> Result<&'a tvs::Tv, String> { - crate::cli_name::find(tvs, name, |t| (&t.id, &t.name), "TV", "tv") + crate::cli::cli_name::find(tvs, name, |t| (&t.id, &t.name), "TV", "tv") } pub fn run(args: &[String]) -> Result { let _operation = crate::diagnostics::Operation::start("tv.cli", None); @@ -20,7 +20,7 @@ pub fn run(args: &[String]) -> Result { crate::diagnostics::event("tv.cli.intent", "selected", command); } match args{ - [command,name] if command=="report"=>{let _lock=OperationLock::acquire()?;let saved=tvs::load(&tvs::path()?)?;let tv=find(&saved,name)?;let path=crate::samsung::export(tv)?;println!("Redacted report: {}",path.display());Ok(0)} + [command,name] if command=="report"=>{let _lock=OperationLock::acquire()?;let saved=tvs::load(&tvs::path()?)?;let tv=find(&saved,name)?;let path=crate::tv::samsung::export(tv)?;println!("Redacted report: {}",path.display());Ok(0)} [command,name,id] if command=="input"=>{ let _lock=OperationLock::acquire()?;let tvs=tvs::load(&tvs::path()?)?; let tv=find(&tvs,name)?; @@ -31,7 +31,7 @@ pub fn run(args: &[String]) -> Result { let _lock=OperationLock::acquire()?;let path=tvs::path()?;let expected=tvs::load(&path)?; let tv=find(&expected,name)?; match command.as_str(){ - "wake"=>{let report=crate::tv_control::Backend::wake(&mut WindowsTvControls::new(tv))?;println!("Wake request sent: {} request(s) for {} target(s). The TV’s power state has not been verified.",report.packets,report.targets);} + "wake"=>{let report=crate::tv::tv_control::Backend::wake(&mut WindowsTvControls::new(tv))?;println!("Wake request sent: {} request(s) for {} target(s). The TV’s power state has not been verified.",report.packets,report.targets);} "off"=>{let report=tv_control::power(&mut WindowsTvControls::new(tv),PowerAction::Off)?;println!("{}\n{}",report.message,report.details);} "toggle"=>{let report=tv_control::toggle(&mut WindowsTvControls::new(tv))?;println!("{}\n{}",report.message,report.details);} "status"=>{ diff --git a/src/tv_control.rs b/src/tv/tv_control.rs similarity index 99% rename from src/tv_control.rs rename to src/tv/tv_control.rs index 97bd3dc..26b87ac 100644 --- a/src/tv_control.rs +++ b/src/tv/tv_control.rs @@ -1,5 +1,5 @@ //! Explicit TV operations shared by the window and CLI. -use crate::{lg_protocol::Input, tv_network::WakeReport}; +use crate::{tv::lg_protocol::Input, tv::tv_network::WakeReport}; #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] pub enum PowerState { On, @@ -120,7 +120,7 @@ fn complete_snapshot(backend: &mut impl Backend, mut result: Snapshot) -> Snapsh pub fn power(backend: &mut impl Backend, action: PowerAction) -> Result { // Not in unit tests: they run in parallel with the guard's own tests. #[cfg(not(test))] - crate::tv_input_guard::stop(); + crate::tv::tv_input_guard::stop(); match action { PowerAction::Wake => { // Providers use an explicit wake intent: direct wake or bounded Wake-on-LAN. @@ -203,7 +203,7 @@ pub fn toggle(backend: &mut impl Backend) -> Result { pub fn switch_input(backend: &mut impl Backend, id: &str) -> Result { // Not in unit tests: they run in parallel with the guard's own tests. #[cfg(not(test))] - crate::tv_input_guard::stop(); + crate::tv::tv_input_guard::stop(); let inputs = crate::diagnostics::measure("tv.input.preflight", id, || backend.inputs())?; let target = inputs .iter() diff --git a/src/tv_input_guard.rs b/src/tv/tv_input_guard.rs similarity index 98% rename from src/tv_input_guard.rs rename to src/tv/tv_input_guard.rs index 04aba17..ff7b146 100644 --- a/src/tv_input_guard.rs +++ b/src/tv/tv_input_guard.rs @@ -9,7 +9,7 @@ //! any Director process (a Stream Deck `director tv input`, a CLI scene): the running guard //! writes its token to a marker file, a request deletes the file, and a guard whose token //! is gone stops at its next poll. -use crate::tv_control::Backend; +use crate::tv::tv_control::Backend; use std::{ path::PathBuf, sync::{ @@ -227,7 +227,7 @@ pub fn hold( #[cfg(test)] mod tests { use super::*; - use crate::{lg_protocol::Input, tv_control::PowerState, tv_network::WakeReport}; + use crate::{tv::lg_protocol::Input, tv::tv_control::PowerState, tv::tv_network::WakeReport}; use std::{cell::RefCell, rc::Rc}; #[derive(Default)] diff --git a/src/tv_network.rs b/src/tv/tv_network.rs similarity index 100% rename from src/tv_network.rs rename to src/tv/tv_network.rs diff --git a/src/tv_report.rs b/src/tv/tv_report.rs similarity index 97% rename from src/tv_report.rs rename to src/tv/tv_report.rs index ba902f0..4bb2e0c 100644 --- a/src/tv_report.rs +++ b/src/tv/tv_report.rs @@ -71,7 +71,8 @@ impl Feedback { Ok(()) } pub fn redacted(&self) -> Self { - let clean = |v: &str| crate::samsung::safe_text(&serde_json::json!(v)).unwrap_or_default(); + let clean = + |v: &str| crate::tv::samsung::safe_text(&serde_json::json!(v)).unwrap_or_default(); Self { tv_model: clean(&self.tv_model), tv_software: clean(&self.tv_software), @@ -160,7 +161,7 @@ pub fn record( action: Action, start: Instant, result: &Result, - power: Option, + power: Option, ) { let err = result.as_ref().err(); let event = Event { @@ -348,9 +349,9 @@ pub struct WakeConfiguration { pub wifi_address_saved: bool, pub manual_address_saved: bool, } -pub fn wake_configuration(tv: &crate::tvs::Tv) -> WakeConfiguration { +pub fn wake_configuration(tv: &crate::tv::tvs::Tv) -> WakeConfiguration { WakeConfiguration { - direct_remote_supported: tv.brand == crate::tvs::Brand::TclAndroid, + direct_remote_supported: tv.brand == crate::tv::tvs::Brand::TclAndroid, saved_target_count: tv.network.targets().len(), wired_address_saved: tv.network.wired.is_some(), wifi_address_saved: tv.network.wifi.is_some(), diff --git a/src/tv_setup.rs b/src/tv/tv_setup.rs similarity index 96% rename from src/tv_setup.rs rename to src/tv/tv_setup.rs index 7559b12..b014405 100644 --- a/src/tv_setup.rs +++ b/src/tv/tv_setup.rs @@ -1,5 +1,5 @@ //! Setup progress and validation; no device actions live here. -use crate::tvs::Tv; +use crate::tv::tvs::Tv; #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub enum Step { Brand, @@ -85,7 +85,7 @@ impl Setup { } Step::Pair => tv.credential.is_some() && self.inputs_loaded, Step::Input => { - (tv.brand != crate::tvs::Brand::Lg || self.input_chosen) + (tv.brand != crate::tv::tvs::Brand::Lg || self.input_chosen) && (tv.pc_input.is_none() || tv.inputs.iter().any(|i| Some(i) == tv.pc_input.as_ref())) } @@ -94,14 +94,14 @@ impl Setup { || self.manual_mac.trim().is_empty() || self .manual_mac - .parse::() + .parse::() .is_ok() } Step::Display => true, Step::Review => { tv.credential.is_some() && self.inputs_loaded - && (tv.brand != crate::tvs::Brand::Lg || self.input_chosen) + && (tv.brand != crate::tv::tvs::Brand::Lg || self.input_chosen) && tv.validate().is_ok() } } diff --git a/src/tvs.rs b/src/tv/tvs.rs similarity index 95% rename from src/tvs.rs rename to src/tv/tvs.rs index bdae077..e438504 100644 --- a/src/tvs.rs +++ b/src/tv/tvs.rs @@ -44,9 +44,9 @@ pub struct Tv { pub address: String, pub brand: Brand, #[serde(default)] - pub samsung: crate::samsung::Metadata, + pub samsung: crate::tv::samsung::Metadata, #[serde(default)] - pub android: crate::samsung::Metadata, + pub android: crate::tv::samsung::Metadata, pub connection: Connection, pub display: Option, #[serde(default, skip_serializing_if = "Option::is_none")] @@ -54,21 +54,21 @@ pub struct Tv { // DPAPI-encrypted key and peer certificate pin; never log or export this field. pub credential: Option>, #[serde(default)] - pub inputs: Vec, + pub inputs: Vec, #[serde(default)] - pub pc_input: Option, + pub pc_input: Option, #[serde(default)] - pub network: crate::tv_network::NetworkAddresses, + pub network: crate::tv::tv_network::NetworkAddresses, } impl Tv { - pub fn compatibility(&self) -> &crate::samsung::Metadata { + pub fn compatibility(&self) -> &crate::tv::samsung::Metadata { if self.brand == Brand::TclAndroid { &self.android } else { &self.samsung } } - pub fn compatibility_mut(&mut self) -> &mut crate::samsung::Metadata { + pub fn compatibility_mut(&mut self) -> &mut crate::tv::samsung::Metadata { if self.brand == Brand::TclAndroid { &mut self.android } else { @@ -78,7 +78,7 @@ impl Tv { pub fn can_wake(&self) -> bool { self.brand == Brand::TclAndroid || !self.network.targets().is_empty() } - pub fn control_inputs(&self) -> Vec { + pub fn control_inputs(&self) -> Vec { if self.brand != Brand::Lg { self.compatibility().inputs() } else { @@ -204,7 +204,7 @@ fn validate(tvs: &[Tv]) -> Result<(), String> { /// Caller holds the shared operation lock, including across pairing. pub fn save(path: &Path, expected: &[Tv], next: &[Tv]) -> Result<(), String> { validate(next)?; - crate::cli_name::check_new_names(expected, next, |t| (&t.id, &t.name), "TV")?; + crate::cli::cli_name::check_new_names(expected, next, |t| (&t.id, &t.name), "TV")?; if load(path)? != expected { return Err( "Saved TVs changed in another window. Reopen the TVs page before saving.".into(), @@ -363,7 +363,7 @@ mod tv_file_tests { tv.samsung.record(1, true); assert_eq!(tv.control_inputs()[0].id, "HDMI_2"); assert!(tv.can_wake()); - let report = crate::samsung::report(&tv).unwrap(); + let report = crate::tv::samsung::report(&tv).unwrap(); assert_eq!(report.brand, "TCL — Android / Google TV"); assert_eq!(report.version_kind, "Android TV Remote Service version"); let data = serde_json::to_string(&report).unwrap(); diff --git a/src/windows_android_tv.rs b/src/tv/windows_android_tv.rs similarity index 95% rename from src/windows_android_tv.rs rename to src/tv/windows_android_tv.rs index c3699c0..a3143a4 100644 --- a/src/windows_android_tv.rs +++ b/src/tv/windows_android_tv.rs @@ -1,8 +1,8 @@ //! In-process, mutually authenticated TLS for TCL Android/Google TV Remote v2. use crate::{ - android_tv as wire, - tv_control::{Backend, PowerState}, - tvs::{Brand, Tv}, + tv::android_tv as wire, + tv::tv_control::{Backend, PowerState}, + tv::tvs::{Brand, Tv}, }; use rsa::pkcs8::EncodePrivateKey; use rustls::{ @@ -200,7 +200,7 @@ impl Pairing { return Err("Select TCL Android / Google TV.".into()); } let mut pending = - crate::tv_report::measure(&tv.id, crate::tv_report::Action::PairStart, || { + crate::tv::tv_report::measure(&tv.id, crate::tv::tv_report::Action::PairStart, || { Self::start_at(&tv.address, 6467) })?; pending.tv_id = tv.id.clone(); @@ -239,7 +239,7 @@ impl Pairing { } pub fn finish(mut self, code: &str) -> Result, String> { let id = self.tv_id.clone(); - crate::tv_report::measure(&id, crate::tv_report::Action::PairConfirm, || { + crate::tv::tv_report::measure(&id, crate::tv::tv_report::Action::PairConfirm, || { if Instant::now() > self.deadline { return Err("The pairing code expired. Start pairing again.".into()); } @@ -250,7 +250,7 @@ impl Pairing { &wire::pairing(40, &wire::bytes(1, &secret)), )?; wire::pair_reply(&read_frame(&mut self.stream)?, 41)?; - crate::windows_lg::protect_document(&self.id) + crate::tv::windows_lg::protect_document(&self.id) }) } } @@ -276,8 +276,9 @@ fn load(tv: &Tv) -> Result { if tv.brand != Brand::TclAndroid { return Err("This is not a TCL Android TV entry.".into()); } - let id: Identity = - crate::windows_lg::unprotect_document(tv.credential.as_ref().ok_or("Pair the TV first.")?)?; + let id: Identity = crate::tv::windows_lg::unprotect_document( + tv.credential.as_ref().ok_or("Pair the TV first.")?, + )?; if id.cert.is_empty() || id.key.is_empty() || id.peer.is_empty() { return Err("Pair this Android TV again.".into()); } @@ -376,10 +377,10 @@ impl Remote { fn text(data: &[u8], field: u32) -> Result, String> { Ok(wire::nested(data, field)? .and_then(|v| std::str::from_utf8(v).ok()) - .and_then(|v| crate::samsung::safe_text(&serde_json::json!(v)))) + .and_then(|v| crate::tv::samsung::safe_text(&serde_json::json!(v)))) } pub fn test_hdmi(tv: &Tv, port: u8) -> Result<(), String> { - crate::tv_report::measure(&tv.id, crate::tv_report::Action::HdmiTest, || { + crate::tv::tv_report::measure(&tv.id, crate::tv::tv_report::Action::HdmiTest, || { let mut r = Remote::connect(tv)?; r.send(&wire::hdmi(port)?)?; crate::diagnostics::event("android_tv.command", "sent", "direct HDMI test"); @@ -407,17 +408,17 @@ impl Backend for Controls<'_> { fn power(&mut self) -> Result { Ok(self.remote()?.power) } - fn inputs(&mut self) -> Result, String> { + fn inputs(&mut self) -> Result, String> { Ok(self.tv.android.inputs()) } fn current_input(&mut self) -> Result, String> { Ok(None) } - fn wake(&mut self) -> Result { + fn wake(&mut self) -> Result { match self.remote() { Ok(r) => { r.send(&wire::key(224))?; - Ok(crate::tv_network::WakeReport { + Ok(crate::tv::tv_network::WakeReport { targets: 1, packets: 1, }) @@ -428,7 +429,7 @@ impl Backend for Controls<'_> { "{e} Enable Screenless service / network standby on the TV, or configure its wake MAC address." )) } else { - crate::tv_network::wake(&self.tv.network) + crate::tv::tv_network::wake(&self.tv.network) } } } @@ -442,7 +443,7 @@ impl Backend for Controls<'_> { if !self.tv.android.inputs().iter().any(|i| i.id == id) { return Err("Confirm this HDMI command in TV setup first.".into()); } - let frame = wire::hdmi(crate::samsung::input_port(id)?)?; + let frame = wire::hdmi(crate::tv::samsung::input_port(id)?)?; self.remote()?.send(&frame) } fn input_readback(&self) -> bool { @@ -565,7 +566,7 @@ mod tests { let pending = Pairing::start_at("127.0.0.1", port).unwrap(); let code = rx.recv_timeout(Duration::from_secs(10)).unwrap(); let blob = pending.finish(&code).unwrap(); - let id: Identity = crate::windows_lg::unprotect_document(&blob).unwrap(); + let id: Identity = crate::tv::windows_lg::unprotect_document(&blob).unwrap(); assert_eq!(id.cert, handle.join().unwrap()); assert!(!String::from_utf8_lossy(&blob).contains(&code)); let l = listener(); diff --git a/src/windows_lg.rs b/src/tv/windows_lg.rs similarity index 97% rename from src/windows_lg.rs rename to src/tv/windows_lg.rs index 9839839..f328a47 100644 --- a/src/windows_lg.rs +++ b/src/tv/windows_lg.rs @@ -1,7 +1,7 @@ //! Direct local webOS pairing through Windows WinHTTP. No external TV tools. use crate::{ - lg_protocol::{self, Input, Registration}, - tvs::{Connection, Tv}, + tv::lg_protocol::{self, Input, Registration}, + tv::tvs::{Connection, Tv}, }; use serde::{Deserialize, Serialize}; use serde_json::{Value, json}; @@ -515,7 +515,7 @@ pub fn check(tv: &Tv) -> Result, String> { #[derive(Clone)] pub struct TvDetails { pub inputs: Vec, - pub network: crate::tv_network::NetworkAddresses, + pub network: crate::tv::tv_network::NetworkAddresses, pub network_warning: Option, } /// Network information is optional: firmware permissions must not block setup. @@ -619,8 +619,8 @@ mod transport_tests { assert_eq!( *states.lock().unwrap(), vec![ - crate::tv_control::PowerState::On, - crate::tv_control::PowerState::Off + crate::tv::tv_control::PowerState::On, + crate::tv::tv_control::PowerState::Off ] ); drop(socket); @@ -721,7 +721,8 @@ mod transport_tests { devices: Value::Null, }; let report = - crate::tv_control::power(&mut backend, crate::tv_control::PowerAction::Off).unwrap(); + crate::tv::tv_control::power(&mut backend, crate::tv::tv_control::PowerAction::Off) + .unwrap(); assert!(report.message.contains("accepted")); drop(backend); server.join().unwrap(); @@ -769,7 +770,7 @@ mod transport_tests { session: Some(Ok(socket)), devices: Value::Null, }; - let report = crate::tv_control::switch_input(&mut backend, "HDMI_2").unwrap(); + let report = crate::tv::tv_control::switch_input(&mut backend, "HDMI_2").unwrap(); assert!(report.message.starts_with("TV reports")); drop(backend); server.join().unwrap(); @@ -901,18 +902,18 @@ mod transport_tests { "127.0.0.1", false, port, - &crate::samsung::path(Some("test-token")), + &crate::tv::samsung::path(Some("test-token")), None, false, Duration::from_secs(2), ) .unwrap(); assert_eq!( - crate::samsung::handshake(&socket.receive().unwrap()).unwrap(), + crate::tv::samsung::handshake(&socket.receive().unwrap()).unwrap(), Some(Some("test-token".into())) ); socket - .send(&crate::samsung::key_frame("KEY_HDMI2").unwrap()) + .send(&crate::tv::samsung::key_frame("KEY_HDMI2").unwrap()) .unwrap(); drop(socket); server.join().unwrap(); @@ -926,13 +927,13 @@ mod transport_tests { "127.0.0.1", false, port, - &crate::samsung::path(None), + &crate::tv::samsung::path(None), None, true, Duration::from_secs(2), ) .unwrap(); - assert!(crate::samsung::handshake(&socket.receive().unwrap()).is_err()); + assert!(crate::tv::samsung::handshake(&socket.receive().unwrap()).is_err()); drop(socket); server.join().unwrap(); } @@ -1013,8 +1014,8 @@ mod hardware_read_only { #[test] #[ignore = "Requires exactly one paired TV, on and reachable; explicitly authorized read-only hardware check"] fn paired_tv_status_and_network() { - let _lock = crate::windows_audio::OperationLock::acquire().unwrap(); - let tvs = crate::tvs::load(&crate::tvs::path().unwrap()).unwrap(); + let _lock = crate::audio::windows_audio::OperationLock::acquire().unwrap(); + let tvs = crate::tv::tvs::load(&crate::tv::tvs::path().unwrap()).unwrap(); let paired = tvs .iter() .filter(|tv| tv.credential.is_some()) @@ -1044,7 +1045,7 @@ mod hardware_read_only { "director-network-check", "ssap://com.webos.service.connectionmanager/getinfo", ) - .and_then(|m| crate::lg_protocol::network(&m)); + .and_then(|m| crate::tv::lg_protocol::network(&m)); match result { Ok(n) => println!( "Valid TV-reported wake addresses: {}; Ethernet: {}; Wi-Fi: {}", @@ -1096,8 +1097,8 @@ impl<'a> WindowsTvControls<'a> { } } } -impl crate::tv_control::Backend for WindowsTvControls<'_> { - fn power(&mut self) -> Result { +impl crate::tv::tv_control::Backend for WindowsTvControls<'_> { + fn power(&mut self) -> Result { let message = self.session()?.request( "director-control-power", "ssap://com.webos.service.tvpower/power/getPowerState", @@ -1127,8 +1128,8 @@ impl crate::tv_control::Backend for WindowsTvControls<'_> { } Ok(lg_protocol::mapped_input(&self.devices, &message)) } - fn wake(&mut self) -> Result { - crate::tv_network::wake(&self.tv.network) + fn wake(&mut self) -> Result { + crate::tv::tv_network::wake(&self.tv.network) } fn off(&mut self) -> Result<(), String> { let message = self @@ -1153,7 +1154,7 @@ impl crate::tv_control::Backend for WindowsTvControls<'_> { /// Scoped to the controls view. Drop signals cancellation without blocking WinUI. #[derive(Clone, Debug)] pub enum PowerEvent { - Reported(crate::tv_control::PowerState), + Reported(crate::tv::tv_control::PowerState), Unavailable(String), } #[derive(Clone, Debug)] @@ -1234,7 +1235,7 @@ pub fn watch_power(tv: Tv) -> PowerWatch { let mut backoff = 2u64; while !worker_cancel.load(Ordering::Acquire) { let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| { - let saved = crate::tvs::load(&crate::tvs::path()?)?; + let saved = crate::tv::tvs::load(&crate::tv::tvs::path()?)?; if saved.iter().find(|t| t.id == tv.id) != Some(&tv) { return Err( "The saved TV changed. Close these controls and reopen them.".to_string(), diff --git a/src/windows_samsung.rs b/src/tv/windows_samsung.rs similarity index 90% rename from src/windows_samsung.rs rename to src/tv/windows_samsung.rs index 2684733..960dcc6 100644 --- a/src/windows_samsung.rs +++ b/src/tv/windows_samsung.rs @@ -1,9 +1,9 @@ //! Samsung Tizen LAN control via native WinHTTP; no sequences or cloud. use crate::{ - samsung, - tv_control::{Backend, PowerState}, - tvs::{Brand, Connection, Tv}, - windows_lg::{Secret, Socket, protect, unprotect}, + tv::samsung, + tv::tv_control::{Backend, PowerState}, + tv::tvs::{Brand, Connection, Tv}, + tv::windows_lg::{Secret, Socket, protect, unprotect}, }; use std::time::Duration; fn connect(tv: &Tv) -> Result { @@ -63,14 +63,14 @@ pub fn pair(tv: &Tv) -> Result, String> { } pub fn info(tv: &Tv) -> Result { tv.validate()?; - samsung::info(&crate::windows_lg::http_json( + samsung::info(&crate::tv::windows_lg::http_json( &tv.address, 8001, "/api/v2/", )?) } pub fn test_hdmi(tv: &Tv, port: u8) -> Result<(), String> { - crate::tv_report::measure(&tv.id, crate::tv_report::Action::HdmiTest, || { + crate::tv::tv_report::measure(&tv.id, crate::tv::tv_report::Action::HdmiTest, || { let key = samsung::key(port)?; let frame = samsung::key_frame(&key)?; let socket = connect(tv)?; @@ -93,14 +93,14 @@ impl Backend for Controls<'_> { crate::diagnostics::event("samsung.power", "reported", power.label()); Ok(power) } - fn inputs(&mut self) -> Result, String> { + fn inputs(&mut self) -> Result, String> { Ok(self.tv.samsung.inputs()) } fn current_input(&mut self) -> Result, String> { Ok(None) } - fn wake(&mut self) -> Result { - crate::tv_network::wake(&self.tv.network) + fn wake(&mut self) -> Result { + crate::tv::tv_network::wake(&self.tv.network) } fn off(&mut self) -> Result<(), String> { let socket = connect(self.tv)?; diff --git a/src/windows_tv.rs b/src/tv/windows_tv.rs similarity index 55% rename from src/windows_tv.rs rename to src/tv/windows_tv.rs index 0a33185..4e9b22a 100644 --- a/src/windows_tv.rs +++ b/src/tv/windows_tv.rs @@ -1,28 +1,28 @@ //! Provider boundary shared by setup, controls, CLI, display preparation and scenes. use crate::{ - lg_protocol::Input, - tv_control::{Backend, PowerState}, - tv_network::NetworkAddresses, - tvs::{Brand, Tv}, + tv::lg_protocol::Input, + tv::tv_control::{Backend, PowerState}, + tv::tv_network::NetworkAddresses, + tv::tvs::{Brand, Tv}, }; pub struct WindowsTvControls<'a> { inner: Provider<'a>, tv_id: &'a str, } enum Provider<'a> { - Lg(crate::windows_lg::WindowsTvControls<'a>), - Samsung(crate::windows_samsung::Controls<'a>), - Android(Box>), + Lg(crate::tv::windows_lg::WindowsTvControls<'a>), + Samsung(crate::tv::windows_samsung::Controls<'a>), + Android(Box>), } impl<'a> WindowsTvControls<'a> { pub fn new(tv: &'a Tv) -> Self { Self { tv_id: &tv.id, inner: match tv.brand { - Brand::Lg => Provider::Lg(crate::windows_lg::WindowsTvControls::new(tv)), - Brand::Samsung => Provider::Samsung(crate::windows_samsung::Controls::new(tv)), + Brand::Lg => Provider::Lg(crate::tv::windows_lg::WindowsTvControls::new(tv)), + Brand::Samsung => Provider::Samsung(crate::tv::windows_samsung::Controls::new(tv)), Brand::TclAndroid => { - Provider::Android(Box::new(crate::windows_android_tv::Controls::new(tv))) + Provider::Android(Box::new(crate::tv::windows_android_tv::Controls::new(tv))) } }, } @@ -33,9 +33,9 @@ impl Backend for WindowsTvControls<'_> { fn power(&mut self) -> Result { let start = std::time::Instant::now(); let result = delegate!(self, power); - crate::tv_report::record( + crate::tv::tv_report::record( self.tv_id, - crate::tv_report::Action::PowerStatus, + crate::tv::tv_report::Action::PowerStatus, start, &result, result.as_ref().ok().copied(), @@ -48,18 +48,18 @@ impl Backend for WindowsTvControls<'_> { fn current_input(&mut self) -> Result, String> { delegate!(self, current_input) } - fn wake(&mut self) -> Result { - crate::tv_report::measure(self.tv_id, crate::tv_report::Action::Wake, || { + fn wake(&mut self) -> Result { + crate::tv::tv_report::measure(self.tv_id, crate::tv::tv_report::Action::Wake, || { delegate!(self, wake) }) } fn off(&mut self) -> Result<(), String> { - crate::tv_report::measure(self.tv_id, crate::tv_report::Action::TurnOff, || { + crate::tv::tv_report::measure(self.tv_id, crate::tv::tv_report::Action::TurnOff, || { delegate!(self, off) }) } fn switch_input(&mut self, id: &str) -> Result<(), String> { - crate::tv_report::measure(self.tv_id, crate::tv_report::Action::HdmiSwitch, || { + crate::tv::tv_report::measure(self.tv_id, crate::tv::tv_report::Action::HdmiSwitch, || { delegate!(self, switch_input, id) }) } @@ -75,7 +75,7 @@ pub struct TvDetails { pub inputs: Vec, pub network: NetworkAddresses, pub network_warning: Option, - pub samsung: Option, + pub samsung: Option, } impl TvDetails { pub fn remember(&self, tv: &mut Tv) { @@ -113,34 +113,36 @@ impl TvDetails { } } pub fn pair(tv: &Tv) -> Result, String> { - crate::tv_report::measure(&tv.id, crate::tv_report::Action::Pair, || match tv.brand { - Brand::Lg => crate::windows_lg::pair(tv), - Brand::Samsung => crate::windows_samsung::pair(tv), - Brand::TclAndroid => { - let pending = crate::windows_android_tv::Pairing::start(tv)?; - println!("Enter the six-character code displayed on your TV:"); - let mut code = zeroize::Zeroizing::new(String::new()); - std::io::stdin() - .read_line(&mut code) - .map_err(|_| "Could not read the TV pairing code.")?; - pending.finish(code.trim()) + crate::tv::tv_report::measure(&tv.id, crate::tv::tv_report::Action::Pair, || { + match tv.brand { + Brand::Lg => crate::tv::windows_lg::pair(tv), + Brand::Samsung => crate::tv::windows_samsung::pair(tv), + Brand::TclAndroid => { + let pending = crate::tv::windows_android_tv::Pairing::start(tv)?; + println!("Enter the six-character code displayed on your TV:"); + let mut code = zeroize::Zeroizing::new(String::new()); + std::io::stdin() + .read_line(&mut code) + .map_err(|_| "Could not read the TV pairing code.")?; + pending.finish(code.trim()) + } } }) } pub fn inspect(tv: &Tv) -> Result { - crate::tv_report::measure(&tv.id, crate::tv_report::Action::Inspect, || { - match tv.brand{Brand::TclAndroid=>{let r=crate::windows_android_tv::Remote::connect(tv)?;Ok(TvDetails{inputs:tv.android.inputs(),network:Default::default(),network_warning:Some("Enable Screenless service / network standby on the TV to keep remote wake available. The protocol does not report MAC addresses; manual wake MAC is optional.".into()),samsung:Some(crate::samsung::Info{model:r.model,firmware:r.version,token_required:None,power:r.power,network:Default::default()})})},Brand::Lg=>{let d=crate::windows_lg::inspect(tv)?;Ok(TvDetails{inputs:d.inputs,network:d.network,network_warning:d.network_warning,samsung:None})},Brand::Samsung=>match crate::tv_report::measure(&tv.id,crate::tv_report::Action::MetadataRead,||crate::windows_samsung::info(tv)){Ok(info)=>Ok(TvDetails{inputs:tv.samsung.inputs(),network:info.network.clone(),network_warning:None,samsung:Some(info)}),Err(_)=>Ok(TvDetails{inputs:tv.samsung.inputs(),network:Default::default(),network_warning:Some("Pairing is retained. Model/firmware and reported power could not be read; compatibility testing remains optional.".into()),samsung:None})}} + crate::tv::tv_report::measure(&tv.id, crate::tv::tv_report::Action::Inspect, || { + match tv.brand{Brand::TclAndroid=>{let r=crate::tv::windows_android_tv::Remote::connect(tv)?;Ok(TvDetails{inputs:tv.android.inputs(),network:Default::default(),network_warning:Some("Enable Screenless service / network standby on the TV to keep remote wake available. The protocol does not report MAC addresses; manual wake MAC is optional.".into()),samsung:Some(crate::tv::samsung::Info{model:r.model,firmware:r.version,token_required:None,power:r.power,network:Default::default()})})},Brand::Lg=>{let d=crate::tv::windows_lg::inspect(tv)?;Ok(TvDetails{inputs:d.inputs,network:d.network,network_warning:d.network_warning,samsung:None})},Brand::Samsung=>match crate::tv::tv_report::measure(&tv.id,crate::tv::tv_report::Action::MetadataRead,||crate::tv::windows_samsung::info(tv)){Ok(info)=>Ok(TvDetails{inputs:tv.samsung.inputs(),network:info.network.clone(),network_warning:None,samsung:Some(info)}),Err(_)=>Ok(TvDetails{inputs:tv.samsung.inputs(),network:Default::default(),network_warning:Some("Pairing is retained. Model/firmware and reported power could not be read; compatibility testing remains optional.".into()),samsung:None})}} }) } pub fn check(tv: &Tv) -> Result, String> { match tv.brand { Brand::TclAndroid => { - crate::windows_android_tv::Remote::connect(tv)?; + crate::tv::windows_android_tv::Remote::connect(tv)?; Ok(tv.android.inputs()) } - Brand::Lg => crate::windows_lg::check(tv), + Brand::Lg => crate::tv::windows_lg::check(tv), Brand::Samsung => { - crate::windows_samsung::info(tv)?; + crate::tv::windows_samsung::info(tv)?; Ok(tv.samsung.inputs()) } } @@ -157,9 +159,9 @@ pub fn pair_with_details(tv: &Tv) -> Result<(Tv, Option), String> { d.remember(&mut tv); Ok((tv, d.network_warning)) } -pub fn watch_power(tv: Tv) -> crate::windows_lg::PowerWatch { +pub fn watch_power(tv: Tv) -> crate::tv::windows_lg::PowerWatch { if tv.brand == Brand::Lg { - return crate::windows_lg::watch_power(tv); + return crate::tv::windows_lg::watch_power(tv); } use std::sync::{ Arc, Mutex, @@ -173,19 +175,19 @@ pub fn watch_power(tv: Tv) -> crate::windows_lg::PowerWatch { while !c.load(Ordering::Acquire) { let at = std::time::Instant::now(); let result = if tv.brand == Brand::TclAndroid { - crate::windows_android_tv::Remote::connect(&tv).map(|r| r.power) + crate::tv::windows_android_tv::Remote::connect(&tv).map(|r| r.power) } else { - crate::windows_samsung::info(&tv).map(|i| i.power) + crate::tv::windows_samsung::info(&tv).map(|i| i.power) }; if c.load(Ordering::Acquire) { break; } let event = match result { - Ok(power) => crate::windows_lg::PowerEvent::Reported(power), - Err(e) => crate::windows_lg::PowerEvent::Unavailable(e), + Ok(power) => crate::tv::windows_lg::PowerEvent::Reported(power), + Err(e) => crate::tv::windows_lg::PowerEvent::Unavailable(e), }; if tx - .send(crate::windows_lg::PowerUpdate { at, event }) + .send(crate::tv::windows_lg::PowerUpdate { at, event }) .is_err() { break; @@ -198,7 +200,7 @@ pub fn watch_power(tv: Tv) -> crate::windows_lg::PowerWatch { } } }); - crate::windows_lg::PowerWatch { + crate::tv::windows_lg::PowerWatch { cancel, receiver: Arc::new(Mutex::new(rx)), } diff --git a/src/tv_controls_ui.rs b/src/tv_controls_ui.rs index fcaef3e..dc3a3e8 100644 --- a/src/tv_controls_ui.rs +++ b/src/tv_controls_ui.rs @@ -2,10 +2,10 @@ use crate::tv_power_state::{Next, Progress, WakeRetries}; use crate::{DirectorApp, Message, tv_ui::TvMessage}; use director::{ - tv_control::{self, Effect, PowerAction, PowerState, Report, Snapshot}, - tvs::{self, Tv}, - windows_audio::OperationLock, - windows_tv::WindowsTvControls, + audio::windows_audio::OperationLock, + tv::tv_control::{self, Effect, PowerAction, PowerState, Report, Snapshot}, + tv::tvs::{self, Tv}, + tv::windows_tv::WindowsTvControls, }; use windows_reactor::*; #[derive(Clone)] @@ -15,7 +15,7 @@ pub(crate) enum ControlMessage { Refresh, Loaded(u64, u64, Result), Poll(u64, u64), - Watch(u64, Option), + Watch(u64, Option), Details(bool), Input(Option), Power(PowerAction), @@ -35,7 +35,7 @@ pub(crate) struct Controls { show_details: bool, progress: Progress, retries: WakeRetries, - watch: Option, + watch: Option, cancel: std::sync::Arc, wake_cancel: std::sync::Arc, ignore_before: std::time::Instant, @@ -50,8 +50,8 @@ impl Drop for Controls { } } impl Controls { - fn live_update(&mut self, update: director::windows_lg::PowerUpdate) -> bool { - use director::windows_lg::PowerEvent; + fn live_update(&mut self, update: director::tv::windows_lg::PowerUpdate) -> bool { + use director::tv::windows_lg::PowerEvent; if update.at < self.ignore_before { return false; } @@ -196,7 +196,7 @@ impl DirectorApp { let Some(tv) = self.tv.tvs.iter().find(|t| t.id == state.tv_id).cloned() else { return; }; - let watch = director::windows_tv::watch_power(tv); + let watch = director::tv::windows_tv::watch_power(tv); state.cancel = watch.cancel.clone(); state.watch = Some(watch); self.queue_power_watch(cx); @@ -270,7 +270,7 @@ impl DirectorApp { if wake_deadline.is_some_and(|d| std::time::Instant::now() >= d) { return Err("The wake readiness deadline expired.".into()); } - use director::tv_control::Backend; + use director::tv::tv_control::Backend; director::diagnostics::measure( "tv.wake.retry", "bounded retransmission", @@ -393,11 +393,11 @@ impl DirectorApp { state.snapshot = Some(Snapshot { power: PowerState::On, inputs: vec![ - director::lg_protocol::Input { + director::tv::lg_protocol::Input { id: "HDMI_1".into(), label: "PC".into(), }, - director::lg_protocol::Input { + director::tv::lg_protocol::Input { id: "HDMI_2".into(), label: "Console".into(), }, @@ -825,7 +825,7 @@ impl DirectorApp { } else { View::empty() }, - if tv.brand != director::tvs::Brand::Lg && tv.control_inputs().is_empty() { + if tv.brand != director::tv::tvs::Brand::Lg && tv.control_inputs().is_empty() { View::empty() } else { StackPanel::new().spacing(8.0).children(( @@ -849,7 +849,7 @@ impl DirectorApp { .into() } else { StackPanel::new().spacing(8.0).children(( - if tv.brand == director::tvs::Brand::Lg { + if tv.brand == director::tv::tvs::Brand::Lg { TextBlock::new() .automation_name(format!( "Current TV input: {current}" @@ -959,7 +959,7 @@ pub(crate) static CONTROL_PREVIEW: std::sync::atomic::AtomicBool = #[cfg(test)] impl DirectorApp { fn start_live_preview(&mut self, cx: &ComponentContext) { - use director::windows_lg::{PowerEvent, PowerUpdate, PowerWatch}; + use director::tv::windows_lg::{PowerEvent, PowerUpdate, PowerWatch}; use std::sync::{Arc, Mutex, atomic::Ordering, mpsc}; let Some(state) = &mut self.tv.controls else { return; @@ -1015,7 +1015,7 @@ impl DirectorApp { credential: Some(vec![1]), inputs: vec![], pc_input: None, - network: director::tv_network::NetworkAddresses { + network: director::tv::tv_network::NetworkAddresses { wired: Some("00:11:22:33:44:55".parse().unwrap()), ..Default::default() }, @@ -1071,7 +1071,7 @@ mod read_tests { } #[test] fn live_events_update_remote_changes_without_turning_disconnect_into_off() { - use director::windows_lg::{PowerEvent, PowerUpdate}; + use director::tv::windows_lg::{PowerEvent, PowerUpdate}; use std::time::Duration; let mut s = state(); let at = s.ignore_before + Duration::from_secs(1); @@ -1107,7 +1107,7 @@ mod read_tests { } #[test] fn old_events_cannot_replace_actions_and_closing_cancels_wake_and_listener() { - use director::windows_lg::{PowerEvent, PowerUpdate}; + use director::tv::windows_lg::{PowerEvent, PowerUpdate}; let mut s = state(); let old = s.ignore_before; s.ignore_before += std::time::Duration::from_secs(1); @@ -1153,7 +1153,7 @@ fn preview_snapshot(waking: bool) -> Snapshot { if LIVE_PREVIEW.load(std::sync::atomic::Ordering::Acquire) { return Snapshot { power: PowerState::On, - inputs: vec![director::lg_protocol::Input { + inputs: vec![director::tv::lg_protocol::Input { id: "HDMI_1".into(), label: "PC".into(), }], @@ -1171,11 +1171,11 @@ fn preview_snapshot(waking: bool) -> Snapshot { return Snapshot { power: PowerState::On, inputs: vec![ - director::lg_protocol::Input { + director::tv::lg_protocol::Input { id: "HDMI_1".into(), label: "PC".into(), }, - director::lg_protocol::Input { + director::tv::lg_protocol::Input { id: "HDMI_2".into(), label: "Console".into(), }, diff --git a/src/tv_power_state.rs b/src/tv_power_state.rs index c4e6fb6..0e0696e 100644 --- a/src/tv_power_state.rs +++ b/src/tv_power_state.rs @@ -1,5 +1,5 @@ //! Ephemeral GUI power transitions, independent of reported device state. -use director::tv_control::{Effect, PowerAction, PowerState}; +use director::tv::tv_control::{Effect, PowerAction, PowerState}; use std::time::{Duration, Instant}; #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] pub(crate) enum Progress { diff --git a/src/tv_tip_ui.rs b/src/tv_tip_ui.rs index 18241e7..230957b 100644 --- a/src/tv_tip_ui.rs +++ b/src/tv_tip_ui.rs @@ -1,9 +1,9 @@ //! Optional TV guidance, without changing a display or contacting a TV. use crate::{DirectorApp, Message, Page, tv_ui::TvMessage, work}; use director::{ + audio::windows_audio::OperationLock, preferences::{self, Preferences}, - tvs::{self, Tv}, - windows_audio::OperationLock, + tv::tvs::{self, Tv}, }; use windows_reactor::*; #[derive(Default)] @@ -89,7 +89,7 @@ impl DirectorApp { TipMessage::InputGuard(Some(seconds)) => { next.tv_input_guard_seconds = seconds .round() - .clamp(0.0, f64::from(director::tv_input_guard::MAX_SECONDS)) + .clamp(0.0, f64::from(director::tv::tv_input_guard::MAX_SECONDS)) as u16 } _ => {} diff --git a/src/tv_ui.rs b/src/tv_ui.rs index 04e4901..f4e3b3d 100644 --- a/src/tv_ui.rs +++ b/src/tv_ui.rs @@ -1,12 +1,13 @@ //! TV definitions, guided addition, and explicit device actions. use crate::{DirectorApp, Message, work}; use director::{ - lg_protocol::Input, - tv_network, - tv_setup::{Setup, Step}, - tvs::{self, Connection, DisplayLink, Tv}, - windows_audio::OperationLock, - windows_displays, windows_tv, + audio::windows_audio::OperationLock, + display::windows_displays, + tv::lg_protocol::Input, + tv::tv_network, + tv::tv_setup::{Setup, Step}, + tv::tvs::{self, Connection, DisplayLink, Tv}, + tv::windows_tv, }; use windows_reactor::*; #[derive(Clone)] @@ -40,7 +41,7 @@ pub(crate) enum TvMessage { AndroidCode(String), AndroidStarted( Result< - std::sync::Arc>>, + std::sync::Arc>>, String, >, ), @@ -74,7 +75,7 @@ pub(crate) struct TvState { pub(crate) test_confirmation: Option, pending_delete: Option, pub(crate) android_pairing: - Option>>>, + Option>>>, pub(crate) android_code: String, #[cfg(test)] pub(crate) android_fixture_waiting: bool, @@ -244,9 +245,9 @@ impl DirectorApp { (|| { let _lock = OperationLock::acquire()?; if tv.brand == tvs::Brand::TclAndroid { - director::windows_android_tv::test_hdmi(&tv, port) + director::tv::windows_android_tv::test_hdmi(&tv, port) } else { - director::windows_samsung::test_hdmi(&tv, port) + director::tv::windows_samsung::test_hdmi(&tv, port) } })(), )) @@ -322,13 +323,13 @@ impl DirectorApp { TvMessage::ReportNetwork(Some(i)) if !self.busy => { if let Some(tv) = &mut self.tv.draft { tv.compatibility_mut().feedback.network = - director::tv_report::Network::from_index(i); + director::tv::tv_report::Network::from_index(i); } } TvMessage::ReportAnswer(which, Some(i)) if !self.busy => { if let Some(tv) = &mut self.tv.draft { let f = &mut tv.compatibility_mut().feedback; - let a = director::tv_report::Answer::from_index(i); + let a = director::tv::tv_report::Answer::from_index(i); match which { 0 => f.power_status_correct = a, 1 => f.turn_off_worked = a, @@ -343,7 +344,7 @@ impl DirectorApp { self.begin("Saving a redacted TV compatibility report…"); work(cx, move || { msg(TvMessage::ReportExported((|| { - let path = director::samsung::export(&tv)?; + let path = director::tv::samsung::export(&tv)?; let folder = path.parent().ok_or("Report folder was unavailable.")?; let opened = crate::options_ui::open_folder(folder); Ok(format!( @@ -383,7 +384,7 @@ impl DirectorApp { TvMessage::Load if !self.busy => { work(cx, || { msg(TvMessage::AudioLinks( - director::windows_audio::WindowsAudio::new() + director::audio::windows_audio::WindowsAudio::new() .and_then(|mut a| a.picker_devices(false)), )) }); @@ -648,7 +649,7 @@ impl DirectorApp { work(cx, move || { msg(TvMessage::AndroidStarted((|| { let _lock = OperationLock::acquire()?; - let p = director::windows_android_tv::Pairing::start(&tv)?; + let p = director::tv::windows_android_tv::Pairing::start(&tv)?; Ok(std::sync::Arc::new(std::sync::Mutex::new(Some(p)))) })( ))) @@ -855,7 +856,7 @@ impl DirectorApp { let _lock = OperationLock::acquire()?; for old in &expected { if !next.iter().any(|t| t.id == old.id) { - director::scenes::check_delete("tv", &old.id)?; + director::scene::scenes::check_delete("tv", &old.id)?; } } tvs::save(&tvs::path()?, &expected, &next)?; @@ -1316,7 +1317,7 @@ impl DirectorApp { && (tv.brand != tvs::Brand::TclAndroid || !pair || !self.tv.android_waiting() - || director::android_tv::code(&self.tv.android_code).is_ok()); + || director::tv::android_tv::code(&self.tv.android_code).is_ok()); crate::ui::page( crate::ui::header( s.step.title(), From 7b32ca486def38ae263452ae5b16138e286bcf91 Mon Sep 17 00:00:00 2001 From: Zacharias Xenakis Date: Sun, 8 Nov 2026 17:31:23 +0200 Subject: [PATCH 2/4] refactor: move the window's pages and dialogs under src/gui --- src/{ => gui}/audio_relink_ui.rs | 0 src/{ => gui}/clipboard.rs | 0 src/{ => gui}/close_guard.rs | 0 src/{ => gui}/command_ui.rs | 12 +-- src/{ => gui}/crash_ui.rs | 8 +- src/{ => gui}/current_ui.rs | 37 ++++----- src/{ => gui}/display_editor_ui.rs | 54 ++++++------- src/{ => gui}/display_setup_ui.rs | 14 ++-- src/{ => gui}/display_ui.rs | 50 +++++++------ src/{ => gui}/fps_ui.rs | 10 ++- src/{ => gui}/icons.rs | 0 src/{ => gui}/library_flow.rs | 6 +- src/gui/mod.rs | 28 +++++++ src/{ => gui}/nav_guard.rs | 12 +-- src/{ => gui}/options_ui.rs | 14 ++-- src/{ => gui}/preset_cards_preview.rs | 50 +++++++------ src/{ => gui}/preset_cards_ui.rs | 36 ++++----- src/{ => gui}/samsung_ui.rs | 14 ++-- src/{ => gui}/scene_editor_ui.rs | 75 ++++++++++--------- src/{ => gui}/scene_ui.rs | 62 +++++++-------- src/{ => gui}/starter_ui.rs | 30 ++++---- src/{ => gui}/status_ui.rs | 0 src/{ => gui}/tv_controls_ui.rs | 26 ++++--- src/{ => gui}/tv_power_state.rs | 0 src/{ => gui}/tv_tip_ui.rs | 8 +- src/{ => gui}/tv_ui.rs | 104 +++++++++++++------------- src/{ => gui}/ui.rs | 0 src/main.rs | 48 ++++-------- 28 files changed, 365 insertions(+), 333 deletions(-) rename src/{ => gui}/audio_relink_ui.rs (100%) rename src/{ => gui}/clipboard.rs (100%) rename src/{ => gui}/close_guard.rs (100%) rename src/{ => gui}/command_ui.rs (94%) rename src/{ => gui}/crash_ui.rs (93%) rename src/{ => gui}/current_ui.rs (97%) rename src/{ => gui}/display_editor_ui.rs (94%) rename src/{ => gui}/display_setup_ui.rs (98%) rename src/{ => gui}/display_ui.rs (95%) rename src/{ => gui}/fps_ui.rs (98%) rename src/{ => gui}/icons.rs (100%) rename src/{ => gui}/library_flow.rs (97%) create mode 100644 src/gui/mod.rs rename src/{ => gui}/nav_guard.rs (95%) rename src/{ => gui}/options_ui.rs (97%) rename src/{ => gui}/preset_cards_preview.rs (90%) rename src/{ => gui}/preset_cards_ui.rs (94%) rename src/{ => gui}/samsung_ui.rs (84%) rename src/{ => gui}/scene_editor_ui.rs (96%) rename src/{ => gui}/scene_ui.rs (96%) rename src/{ => gui}/starter_ui.rs (94%) rename src/{ => gui}/status_ui.rs (100%) rename src/{ => gui}/tv_controls_ui.rs (98%) rename src/{ => gui}/tv_power_state.rs (100%) rename src/{ => gui}/tv_tip_ui.rs (95%) rename src/{ => gui}/tv_ui.rs (93%) rename src/{ => gui}/ui.rs (100%) diff --git a/src/audio_relink_ui.rs b/src/gui/audio_relink_ui.rs similarity index 100% rename from src/audio_relink_ui.rs rename to src/gui/audio_relink_ui.rs diff --git a/src/clipboard.rs b/src/gui/clipboard.rs similarity index 100% rename from src/clipboard.rs rename to src/gui/clipboard.rs diff --git a/src/close_guard.rs b/src/gui/close_guard.rs similarity index 100% rename from src/close_guard.rs rename to src/gui/close_guard.rs diff --git a/src/command_ui.rs b/src/gui/command_ui.rs similarity index 94% rename from src/command_ui.rs rename to src/gui/command_ui.rs index 5ec4d99..f33a597 100644 --- a/src/command_ui.rs +++ b/src/gui/command_ui.rs @@ -82,7 +82,7 @@ pub(crate) fn command_button(cx: &ViewContext, target: Target) -> V .text(">_") .font_size(13.0) .font_weight(FontWeight::SEMI_BOLD) - .opacity(crate::ui::SECONDARY) + .opacity(crate::gui::ui::SECONDARY) // Eat into the button's fixed side padding, so the card's name keeps as // much room as it can. .margin(Thickness::new(-6.0, 0.0, -6.0, 0.0)), @@ -95,7 +95,7 @@ impl DirectorApp { match m { CommandMessage::Show(target) => self.command = Some(target), CommandMessage::Closed => self.command = None, - CommandMessage::Copy(text) => match crate::clipboard::copy_text(&text) { + CommandMessage::Copy(text) => match crate::gui::clipboard::copy_text(&text) { Ok(()) => { self.error = false; self.status = "Command copied.".into(); @@ -127,8 +127,8 @@ impl DirectorApp { .children(( Border::new() .padding(Thickness::xy(10.0, 7.0)) - .corner_radius(crate::ui::RADIUS_S) - .background(crate::ui::CODE_FILL) + .corner_radius(crate::gui::ui::RADIUS_S) + .background(crate::gui::ui::CODE_FILL) .content( TextBlock::new() .text(command) @@ -146,8 +146,8 @@ impl DirectorApp { )), TextBlock::new() .text(subtitle) - .font_size(crate::ui::CAPTION) - .opacity(crate::ui::SECONDARY) + .font_size(crate::gui::ui::CAPTION) + .opacity(crate::gui::ui::SECONDARY) .text_wrapping(TextWrapping::Wrap), )), ) diff --git a/src/crash_ui.rs b/src/gui/crash_ui.rs similarity index 93% rename from src/crash_ui.rs rename to src/gui/crash_ui.rs index fdce519..ef631c0 100644 --- a/src/crash_ui.rs +++ b/src/gui/crash_ui.rs @@ -68,8 +68,8 @@ impl DirectorApp { .text_wrapping(TextWrapping::Wrap), Border::new() .padding(Thickness::xy(10.0, 7.0)) - .corner_radius(crate::ui::RADIUS_S) - .background(crate::ui::CODE_FILL) + .corner_radius(crate::gui::ui::RADIUS_S) + .background(crate::gui::ui::CODE_FILL) .content( TextBlock::new() .text(report.summary.clone()) @@ -82,8 +82,8 @@ impl DirectorApp { .text_wrapping(TextWrapping::Wrap), TextBlock::new() .text("The full report, with recent log lines, is saved in your Director logs folder. Attach it to the issue if you’re happy to share it.") - .font_size(crate::ui::CAPTION) - .opacity(crate::ui::SECONDARY) + .font_size(crate::gui::ui::CAPTION) + .opacity(crate::gui::ui::SECONDARY) .text_wrapping(TextWrapping::Wrap), )), ) diff --git a/src/current_ui.rs b/src/gui/current_ui.rs similarity index 97% rename from src/current_ui.rs rename to src/gui/current_ui.rs index 4f95483..6909fcd 100644 --- a/src/current_ui.rs +++ b/src/gui/current_ui.rs @@ -3,8 +3,8 @@ //! reads or writes saved scenes or presets. use crate::{ DirectorApp, Message, - display_editor_ui::EditorTarget, - display_ui::{DisplayMessage, DisplayState}, + gui::display_editor_ui::EditorTarget, + gui::display_ui::{DisplayMessage, DisplayState}, work, }; use director::{ @@ -229,7 +229,7 @@ impl DirectorApp { let state = &mut self.current; state.sound_pending = true; state.tokens_at_start = (state.volume_token, state.mic_token); - crate::close_guard::set_busy(true); + crate::gui::close_guard::set_busy(true); work(cx, move || { let result = (|| { let _lock = OperationLock::acquire()?; @@ -261,14 +261,14 @@ impl DirectorApp { return; } #[cfg(test)] - if crate::preset_cards_preview::ENABLED.load(std::sync::atomic::Ordering::Acquire) { - self.fps = crate::fps_ui::FpsState::fixture(); + if crate::gui::preset_cards_preview::ENABLED.load(std::sync::atomic::Ordering::Acquire) { + self.fps = crate::gui::fps_ui::FpsState::fixture(); self.current.fps_dirty = false; return; } self.fps.live = None; self.current.fps_dirty = false; - self.update_fps(crate::fps_ui::FpsMessage::Discover, cx); + self.update_fps(crate::gui::fps_ui::FpsMessage::Discover, cx); self.begin("Reading your current setup…"); work(cx, || { msg(CurrentMessage::Loaded(read_displays(), devices())) @@ -376,7 +376,7 @@ impl DirectorApp { self.current.fps_after_displays = self.current.fps_dirty; self.update_current(CurrentMessage::ApplyDisplays, cx); } else if self.current.fps_dirty { - self.update_fps(crate::fps_ui::FpsMessage::Apply, cx); + self.update_fps(crate::gui::fps_ui::FpsMessage::Apply, cx); } } CurrentMessage::DisplaysApplied(report, actual, audio) => { @@ -408,7 +408,7 @@ Could not read audio outputs: {e}" } // A failed display change leaves the FPS edit staged rather than half-applying. if then_fps && succeeded && !self.error { - self.update_fps(crate::fps_ui::FpsMessage::Apply, cx); + self.update_fps(crate::gui::fps_ui::FpsMessage::Apply, cx); } } CurrentMessage::Device(input, Some(index)) if !self.busy => { @@ -509,7 +509,7 @@ Could not read audio outputs: {e}" } CurrentMessage::SoundDone(result, devices) => { self.current.sound_pending = false; - crate::close_guard::set_busy(false); + crate::gui::close_guard::set_busy(false); match &result { Ok(message) => { self.error = false; @@ -630,10 +630,11 @@ Could not read audio outputs: {e}" let Some(output) = self.current.default_device(false) else { return; }; - let mut scene = director::scene::scenes::Scene::new(crate::scene_ui::new_id(), ""); + let mut scene = + director::scene::scenes::Scene::new(crate::gui::scene_ui::new_id(), ""); scene.sound = Some(self.current.sound_now(output)); self.update_library( - crate::library_flow::LibraryMessage::NewScene(Box::new(scene)), + crate::gui::library_flow::LibraryMessage::NewScene(Box::new(scene)), cx, ); } @@ -651,7 +652,7 @@ Could not read audio outputs: {e}" // off, so turning it on doesn't push anything down the page. Grid::new() .columns([GridLength::Auto, GridLength::Star(1.0)]) - .column_spacing(crate::ui::GAP_L) + .column_spacing(crate::gui::ui::GAP_L) .children(( ToggleSwitch::new() .automation_name("Use a different device for calls") @@ -762,7 +763,7 @@ Could not read audio outputs: {e}" TextBlock::new() .grid_column(2) .text(volume.map_or(String::new(), |v| format!("{}%", v.round()))) - .opacity(crate::ui::SECONDARY) + .opacity(crate::gui::ui::SECONDARY) .vertical_alignment(VerticalAlignment::Center), )), )) @@ -777,7 +778,7 @@ Could not read audio outputs: {e}" } } pub(crate) fn current_view(&self, cx: &ViewContext) -> View { - use crate::ui; + use crate::gui::ui; let dragging = self.current.display.drag.is_some(); let dirty = self.current.dirty(); let can_apply = !self.busy @@ -857,7 +858,7 @@ Could not read audio outputs: {e}" let fps = ui::column( ui::FORM_WIDTH, 0.0, - (self.fps_controls(cx, crate::fps_ui::Target::Current),), + (self.fps_controls(cx, crate::gui::fps_ui::Target::Current),), ); // No page title: the sidebar already says Now, and the sections explain themselves. ui::page( @@ -888,20 +889,20 @@ impl DirectorApp { .is_primary_button_enabled(!self.busy && !name.trim().is_empty()) .on_closed(cx.callback(|result| msg(CurrentMessage::SaveClosed(result)))) .content( - StackPanel::new().spacing(crate::ui::GAP_M).width(360.0).children(( + StackPanel::new().spacing(crate::gui::ui::GAP_M).width(360.0).children(( TextBox::new() .automation_name("Display preset name") .text(name.clone()) .placeholder_text("For example, Desk monitors") .on_text_changed(cx.callback(|v| msg(CurrentMessage::SaveName(v)))) .slot(TextBoxSlot::Header, "Name"), - crate::ui::caption( + crate::gui::ui::caption( "Saves the layout shown here, including changes you haven’t applied. Your screens don’t change.", ), match &self.current.save_error { Some(e) => TextBlock::new() .text(e.clone()) - .foreground(crate::ui::critical()) + .foreground(crate::gui::ui::critical()) .text_wrapping(TextWrapping::Wrap) .into(), None => View::empty(), diff --git a/src/display_editor_ui.rs b/src/gui/display_editor_ui.rs similarity index 94% rename from src/display_editor_ui.rs rename to src/gui/display_editor_ui.rs index 7c0d03a..54d2d9f 100644 --- a/src/display_editor_ui.rs +++ b/src/gui/display_editor_ui.rs @@ -1,5 +1,5 @@ //! Native per-monitor draft controls. All changes remain in memory until Save. -use crate::{DirectorApp, Message, display_ui::DisplayMessage}; +use crate::{DirectorApp, Message, gui::display_ui::DisplayMessage}; use director::{ display::display_editor::{Change, Editor}, display::displays::{DesktopMode, Layout}, @@ -21,7 +21,7 @@ fn route(target: EditorTarget, value: DisplayMessage) -> Message { match target { EditorTarget::Preset => Message::Display(value), EditorTarget::Current => { - Message::Current(crate::current_ui::CurrentMessage::Display(value)) + Message::Current(crate::gui::current_ui::CurrentMessage::Display(value)) } } } @@ -114,15 +114,15 @@ fn preview( .background(if group.contains(&selected) { Brush::from(ThemeBrush::Accent) } else { - Brush::from(crate::ui::SCREEN_FILL) + Brush::from(crate::gui::ui::SCREEN_FILL) }) .border_brush(Brush::Solid(if primary { - crate::ui::SCREEN_PRIMARY + crate::gui::ui::SCREEN_PRIMARY } else { - crate::ui::SCREEN_OTHER + crate::gui::ui::SCREEN_OTHER })) .border_thickness(Thickness::uniform(2.0)) - .corner_radius(crate::ui::RADIUS_S) + .corner_radius(crate::gui::ui::RADIUS_S) .capture_pointer_on_press(!app.busy) .on_pointer_pressed(cx.callback(move |point| { route(target, DisplayMessage::PointerDown(i, point)) @@ -149,7 +149,7 @@ fn preview( .font_size( (d.height.min(d.width) as f64 * map.scale * 0.3).clamp(12.0, 28.0), ) - .foreground(crate::ui::SCREEN_TEXT) + .foreground(crate::gui::ui::SCREEN_TEXT) .horizontal_alignment(HorizontalAlignment::Center) .vertical_alignment(VerticalAlignment::Center), ) @@ -177,7 +177,7 @@ Select to edit it; drag to move it.", "map-actions", StackPanel::new() .orientation(Orientation::Horizontal) - .spacing(crate::ui::GAP_S) + .spacing(crate::gui::ui::GAP_S) .horizontal_alignment(HorizontalAlignment::Right) .vertical_alignment(VerticalAlignment::Bottom) .keyed_children( @@ -189,7 +189,7 @@ Select to edit it; drag to move it.", KeyedView::new( format!("action-{i}"), Border::new() - .corner_radius(crate::ui::RADIUS_S) + .corner_radius(crate::gui::ui::RADIUS_S) .background(ThemeBrush::SolidBackground) .content(v), ) @@ -201,8 +201,8 @@ Select to edit it; drag to move it.", Border::new() .horizontal_alignment(HorizontalAlignment::Center) .border_thickness(Thickness::uniform(1.0)) - .border_brush(crate::ui::OUTLINE) - .corner_radius(crate::ui::RADIUS_L) + .border_brush(crate::gui::ui::OUTLINE) + .corner_radius(crate::gui::ui::RADIUS_L) .padding(Thickness::uniform(10.0)) .content( Grid::new() @@ -222,8 +222,9 @@ impl DirectorApp { /// The arrangement map's box: the editor's width (less the scroll gutter, the map's /// padding and border), capped, and a fixed height. pub(crate) fn map_size(&self) -> (f64, f64) { - let width = - crate::ui::page_width(self.window_width, self.pane_open) - crate::ui::GAP_L - 22.0; + let width = crate::gui::ui::page_width(self.window_width, self.pane_open) + - crate::gui::ui::GAP_L + - 22.0; (width.clamp(320.0, MAP_MAX_WIDTH), MAP_HEIGHT) } pub(crate) fn monitor_editor( @@ -257,12 +258,12 @@ impl DirectorApp { let heading = matches!(target, EditorTarget::Preset); StackPanel::new().spacing(16.0).children(( if heading { - crate::ui::subtitle("Arrange your displays").into() + crate::gui::ui::subtitle("Arrange your displays").into() } else { View::empty() }, if heading { - crate::ui::note( + crate::gui::ui::note( "Select a display to find its settings. Drag displays to rearrange them.", ) } else { @@ -280,7 +281,10 @@ impl DirectorApp { cx: &ViewContext, target: EditorTarget, ) -> View { - let columns = monitor_columns(crate::ui::page_width(self.window_width, self.pane_open)); + let columns = monitor_columns(crate::gui::ui::page_width( + self.window_width, + self.pane_open, + )); let labelled = |title: View, control: View| StackPanel::new().spacing(4.0).children((title, control)); let pair = |left: View, right: View| -> View { @@ -332,13 +336,13 @@ impl DirectorApp { .content( // The selected display's card is outlined like its screen on the map. Border::new() - .padding(crate::ui::GAP_L) - .corner_radius(crate::ui::RADIUS_L) - .background(crate::ui::card_fill()) + .padding(crate::gui::ui::GAP_L) + .corner_radius(crate::gui::ui::RADIUS_L) + .background(crate::gui::ui::card_fill()) .border_brush(if i == selected { Brush::from(ThemeBrush::Accent) } else { - crate::ui::card_stroke() + crate::gui::ui::card_stroke() }) .border_thickness(if i == selected { 2.0 } else { 1.0 }) .content(StackPanel::new().spacing(12.0).children(( @@ -553,8 +557,8 @@ impl DirectorApp { "★ Primary" }) .automation_name(format!("{} is the primary display", m.name)) - .font_size(crate::ui::CAPTION) - .opacity(crate::ui::SECONDARY) + .font_size(crate::gui::ui::CAPTION) + .opacity(crate::gui::ui::SECONDARY) .vertical_alignment(VerticalAlignment::Center) .into() } else if m.enabled && !detecting { @@ -598,7 +602,7 @@ impl DirectorApp { )), )); let preset = matches!(target, EditorTarget::Preset); - let status = crate::ui::caption(if detecting { + let status = crate::gui::ui::caption(if detecting { "Temporary detection · preset unchanged" } else if m.enabled && group.len() > 1 { "Mirrored desktop · shared arrangement and resolution" @@ -629,7 +633,7 @@ impl DirectorApp { .columns([GridLength::Star(1.0), GridLength::Auto]) .column_spacing(8.0) .children(( - crate::ui::caption(format!("Linked TV: {}", tv.name)), + crate::gui::ui::caption(format!("Linked TV: {}", tv.name)), Button::new() .grid_column(1) .style(ButtonStyle::Subtle) @@ -644,7 +648,7 @@ impl DirectorApp { .warning .as_ref() .filter(|_| !detecting && self.display.setup.review != Some(i)) - .map(crate::ui::note) + .map(crate::gui::ui::note) .unwrap_or_else(View::empty); MonitorParts { header, diff --git a/src/display_setup_ui.rs b/src/gui/display_setup_ui.rs similarity index 98% rename from src/display_setup_ui.rs rename to src/gui/display_setup_ui.rs index 83168c4..21d72fe 100644 --- a/src/display_setup_ui.rs +++ b/src/gui/display_setup_ui.rs @@ -1,5 +1,5 @@ //! Inline discovery progress. Native work and recovery stay on workers. -use crate::{DirectorApp, Message, display_ui::DisplayMessage}; +use crate::{DirectorApp, Message, gui::display_ui::DisplayMessage}; use director::{ audio::windows_audio::OperationLock, display::display_detection::{self, Report, Stage}, @@ -123,7 +123,7 @@ impl DirectorApp { "Temporary display setup is running. Your previous layout will be restored." .into(); self.details.clear(); - crate::close_guard::set_busy(true); + crate::gui::close_guard::set_busy(true); let (sender, receiver) = std::sync::mpsc::channel(); self.display.setup.progress = Some(Arc::new(std::sync::Mutex::new(receiver))); // Delivery failure requests cancellation; the engine still restores before returning. @@ -205,7 +205,7 @@ impl DirectorApp { "Temporary display setup is running. Your previous layout will be restored." .into(); self.details.clear(); - crate::close_guard::set_busy(true); + crate::gui::close_guard::set_busy(true); self.display.setup.stage = Some(Stage::Restoring); let token = self.display.setup.token; let (sender, receiver) = std::sync::mpsc::channel(); @@ -322,7 +322,7 @@ impl DirectorApp { .text_wrapping(TextWrapping::Wrap), TextBlock::new() .text(&state.details) - .font_size(crate::ui::CAPTION) + .font_size(crate::gui::ui::CAPTION) .opacity(0.72) .text_wrapping(TextWrapping::Wrap), Button::new() @@ -334,11 +334,11 @@ impl DirectorApp { )); } if review { - return Border::new().padding(Thickness::uniform(12.0)).background(crate::ui::card_fill()).corner_radius(crate::ui::RADIUS_S).content( + return Border::new().padding(Thickness::uniform(12.0)).background(crate::gui::ui::card_fill()).corner_radius(crate::gui::ui::RADIUS_S).content( StackPanel::new().spacing(10.0).children(( TextBlock::new().text("Detect this display’s options").font_weight(FontWeight::SEMI_BOLD), TextBlock::new().text("Director will temporarily enable this display alongside your current screens, read its options, then restore your layout. Screens may briefly flicker. Turn the display on and select its PC input first.").text_wrapping(TextWrapping::Wrap).opacity(0.72), - if wake{TextBlock::new().text("Wake and detect also wakes the linked TV and selects its saved PC input. The TV stays on afterward.").text_wrapping(TextWrapping::Wrap).font_size(crate::ui::CAPTION).opacity(0.72).into()}else{View::empty()}, + if wake{TextBlock::new().text("Wake and detect also wakes the linked TV and selects its saved PC input. The TV stays on afterward.").text_wrapping(TextWrapping::Wrap).font_size(crate::gui::ui::CAPTION).opacity(0.72).into()}else{View::empty()}, StackPanel::new().orientation(Orientation::Horizontal).spacing(8.0).children(( Button::new().element_ref(&focus).automation_name(format!("Detect display options for {}",m.name)).is_enabled(!self.busy).on_click(cx.message(setup(SetupMessage::Start(index,false)))).content("Detect options"), if wake{Button::new().automation_name(format!("Wake and detect {}",m.name)).is_enabled(!self.busy).on_click(cx.message(setup(SetupMessage::Start(index,true)))).content("Wake and detect")}else{View::empty()}, @@ -360,7 +360,7 @@ impl DirectorApp { TextBlock::new() .text(&state.details) .text_wrapping(TextWrapping::Wrap) - .font_size(crate::ui::CAPTION) + .font_size(crate::gui::ui::CAPTION) .opacity(0.72) .into() } else { diff --git a/src/display_ui.rs b/src/gui/display_ui.rs similarity index 95% rename from src/display_ui.rs rename to src/gui/display_ui.rs index 08505f9..f58469d 100644 --- a/src/display_ui.rs +++ b/src/gui/display_ui.rs @@ -16,7 +16,7 @@ use std::{ use windows_reactor::*; #[derive(Clone)] pub(crate) enum DisplayMessage { - Setup(crate::display_setup_ui::SetupMessage), + Setup(crate::gui::display_setup_ui::SetupMessage), Apply(String), Countdown(u64, Option), Confirm(u64, ContentDialogResult), @@ -49,7 +49,7 @@ pub(crate) enum DisplayMessage { } #[derive(Default)] pub(crate) struct DisplayState { - pub setup: crate::display_setup_ui::SetupState, + pub setup: crate::gui::display_setup_ui::SetupState, pub drag_token: u64, pub orientation_revision: u64, pub drag: Option, @@ -88,7 +88,7 @@ fn monitor_details(layout: &Layout) -> View { .text_wrapping(TextWrapping::Wrap), TextBlock::new() .text(m.summary()) - .opacity(crate::ui::SECONDARY) + .opacity(crate::gui::ui::SECONDARY) .text_wrapping(TextWrapping::Wrap), )), ) @@ -372,12 +372,12 @@ impl DirectorApp { self.display.setup = Default::default(); #[cfg(test)] let result = if create - && crate::display_setup_ui::DETECTION_PREVIEW + && crate::gui::display_setup_ui::DETECTION_PREVIEW .load(std::sync::atomic::Ordering::Acquire) { - self.tip.tvs = vec![crate::display_setup_ui::preview_tv()]; + self.tip.tvs = vec![crate::gui::display_setup_ui::preview_tv()]; self.tip.catalog_loaded = true; - Ok(crate::display_setup_ui::preview_editor()) + Ok(crate::gui::display_setup_ui::preview_editor()) } else { result }; @@ -499,7 +499,7 @@ impl DirectorApp { self.error = false; self.status = "Ready.".into(); self.details.clear(); - self.library_cancelled(crate::library_flow::Slot::Display, cx); + self.library_cancelled(crate::gui::library_flow::Slot::Display, cx); } DisplayMessage::Save if self.display_ready() && self.display.drag.is_none() => { if let Some(mut preset) = self.display.draft.clone() { @@ -523,7 +523,7 @@ impl DirectorApp { DisplayMessage::Saved(result) => match result { Ok(p) => { self.end(); - let added = crate::library_flow::added_id( + let added = crate::gui::library_flow::added_id( self.display.presets.iter().map(|p| p.id.as_str()), p.iter().map(|p| p.id.as_str()), ); @@ -535,7 +535,7 @@ impl DirectorApp { self.status = "Display presets saved. Your screens are unchanged.".into(); self.guard_saved(true, cx); self.announce(cx); - self.library_saved(crate::library_flow::Slot::Display, added, cx); + self.library_saved(crate::gui::library_flow::Slot::Display, added, cx); } Err(e) => self.failure(e), }, @@ -564,12 +564,12 @@ impl DirectorApp { if let Some(d) = &self.display.draft { let editing = self.display.presets.iter().any(|p| p.id == d.id); let body = StackPanel::new() - .spacing(crate::ui::GAP_L) + .spacing(crate::gui::ui::GAP_L) .horizontal_alignment(HorizontalAlignment::Stretch) .children(( self.tv_setup_tip(cx, editing), - StackPanel::new().spacing(crate::ui::GAP_S).children(( - crate::ui::label("Preset name"), + StackPanel::new().spacing(crate::gui::ui::GAP_S).children(( + crate::gui::ui::label("Preset name"), TextBox::new() .text(&d.name) .automation_name("Display preset name") @@ -578,12 +578,12 @@ impl DirectorApp { .placeholder_text("For example, Desk monitors") .is_enabled(!self.busy) .on_text_changed(cx.callback(|name| msg(DisplayMessage::Name(name)))), - crate::ui::caption(d.layout.summary()), + crate::gui::ui::caption(d.layout.summary()), )), if let Some(editor) = &self.display.editor { self.monitor_editor(&d.layout, editor, cx) } else if self.busy { - crate::ui::note("Loading display controls…") + crate::gui::ui::note("Loading display controls…") } else { monitor_details(&d.layout) }, @@ -596,7 +596,7 @@ impl DirectorApp { cx.callback(|value| msg(DisplayMessage::ConfirmChanges(value))), ) .slot(ToggleSwitchSlot::Header, "Ask to keep display changes"), - crate::ui::caption( + crate::gui::ui::caption( "When off, verified changes are kept automatically. Failed changes still revert.", ), )), @@ -606,8 +606,8 @@ impl DirectorApp { && !d.name.trim().is_empty() && d.name.trim().len() <= 160 && self.draft_changed(crate::Page::Displays); - return crate::ui::page( - crate::ui::header( + return crate::gui::ui::page( + crate::gui::ui::header( if editing { "Edit display preset" } else { @@ -617,8 +617,8 @@ impl DirectorApp { vec![], ), body, - Some(crate::ui::footer( - crate::ui::note(if self.draft_changed(crate::Page::Displays) { + Some(crate::gui::ui::footer( + crate::gui::ui::note(if self.draft_changed(crate::Page::Displays) { "Saving won’t change your screens." } else { "No changes to save." @@ -642,7 +642,7 @@ impl DirectorApp { let list = if rows.is_empty() { Border::new() .grid_row(1) - .content(crate::ui::empty_state( + .content(crate::gui::ui::empty_state( if self.busy { "Reading your layouts…" } else { @@ -657,16 +657,20 @@ impl DirectorApp { ), )) } else { - crate::preset_cards_ui::card_grid(1, crate::preset_cards_ui::DISPLAY_CARD_HEIGHT, rows) + crate::gui::preset_cards_ui::card_grid( + 1, + crate::gui::preset_cards_ui::DISPLAY_CARD_HEIGHT, + rows, + ) }; Grid::new() .rows([GridLength::Auto, GridLength::Star(1.0)]) .children(( - crate::ui::header( + crate::gui::ui::header( "Displays", "Saved monitor layouts you can use in scenes.", vec![ - crate::ui::current( + crate::gui::ui::current( "Current layout", self.display .current diff --git a/src/fps_ui.rs b/src/gui/fps_ui.rs similarity index 98% rename from src/fps_ui.rs rename to src/gui/fps_ui.rs index 6073a5b..ca1fd12 100644 --- a/src/fps_ui.rs +++ b/src/gui/fps_ui.rs @@ -67,7 +67,7 @@ impl FpsState { fn msg(m: FpsMessage) -> Message { Message::Fps(m) } -use crate::ui::{self, note}; +use crate::gui::ui::{self, note}; impl DirectorApp { fn fps_request(&self, target: Target) -> Option<&Request> { match target { @@ -90,7 +90,9 @@ impl DirectorApp { match m { FpsMessage::Discover if !self.fps.checking => { #[cfg(test)] - if crate::preset_cards_preview::ENABLED.load(std::sync::atomic::Ordering::Acquire) { + if crate::gui::preset_cards_preview::ENABLED + .load(std::sync::atomic::Ordering::Acquire) + { self.fps.caps = [Provider::Nvidia, Provider::Rtss] .into_iter() .map(|provider| Capability { @@ -205,7 +207,7 @@ impl DirectorApp { return; } #[cfg(test)] - if crate::preset_cards_preview::ENABLED + if crate::gui::preset_cards_preview::ENABLED .load(std::sync::atomic::Ordering::Acquire) { for cap in &mut self.fps.caps { @@ -571,7 +573,7 @@ pub(crate) static PREVIEW: std::sync::atomic::AtomicBool = #[ignore = "Owned native FPS UI fixture; no device writes"] fn fps_fixture() { PREVIEW.store(true, std::sync::atomic::Ordering::Release); - crate::preset_cards_preview::ENABLED.store(true, std::sync::atomic::Ordering::Release); + crate::gui::preset_cards_preview::ENABLED.store(true, std::sync::atomic::Ordering::Release); director::diagnostics::init(); windows_reactor::App::run_component::(()).unwrap(); director::diagnostics::flush(); diff --git a/src/icons.rs b/src/gui/icons.rs similarity index 100% rename from src/icons.rs rename to src/gui/icons.rs diff --git a/src/library_flow.rs b/src/gui/library_flow.rs similarity index 97% rename from src/library_flow.rs rename to src/gui/library_flow.rs index 5aa6ce5..d7a3c3e 100644 --- a/src/library_flow.rs +++ b/src/gui/library_flow.rs @@ -3,7 +3,9 @@ //! Now can seed a new display preset from what it has staged, and the scene editor can create a //! display preset or TV in place and get back to the scene with it selected. Every flow ends in //! the normal Library editor, so saving still only saves. -use crate::{DirectorApp, Message, Page, display_ui::DisplayMessage, scene_ui::SceneMessage, work}; +use crate::{ + DirectorApp, Message, Page, gui::display_ui::DisplayMessage, gui::scene_ui::SceneMessage, work, +}; use director::display::displays::Layout; use windows_reactor::*; @@ -135,7 +137,7 @@ impl DirectorApp { let sound = scene.sound.is_some(); self.scene.snapshot = sound.then(|| scene.clone()); self.scene.draft = Some(scene); - self.scene.open = sound.then_some(crate::scene_editor_ui::Step::Sound); + self.scene.open = sound.then_some(crate::gui::scene_editor_ui::Step::Sound); self.status = "Name this scene to save the sound set in Now.".into(); } } diff --git a/src/gui/mod.rs b/src/gui/mod.rs new file mode 100644 index 0000000..17e91cb --- /dev/null +++ b/src/gui/mod.rs @@ -0,0 +1,28 @@ +//! The WinUI window: pages, dialogs and shared UI helpers for `DirectorApp` in `main.rs`. +pub(crate) mod audio_relink_ui; +pub(crate) mod clipboard; +pub(crate) mod close_guard; +pub(crate) mod command_ui; +pub(crate) mod crash_ui; +pub(crate) mod current_ui; +pub(crate) mod display_editor_ui; +pub(crate) mod display_setup_ui; +pub(crate) mod display_ui; +pub(crate) mod fps_ui; +pub(crate) mod icons; +pub(crate) mod library_flow; +pub(crate) mod nav_guard; +pub(crate) mod options_ui; +#[cfg(test)] +pub(crate) mod preset_cards_preview; +pub(crate) mod preset_cards_ui; +pub(crate) mod samsung_ui; +pub(crate) mod scene_editor_ui; +pub(crate) mod scene_ui; +pub(crate) mod starter_ui; +pub(crate) mod status_ui; +pub(crate) mod tv_controls_ui; +pub(crate) mod tv_power_state; +pub(crate) mod tv_tip_ui; +pub(crate) mod tv_ui; +pub(crate) mod ui; diff --git a/src/nav_guard.rs b/src/gui/nav_guard.rs similarity index 95% rename from src/nav_guard.rs rename to src/gui/nav_guard.rs index fd3f8b9..dc41e93 100644 --- a/src/nav_guard.rs +++ b/src/gui/nav_guard.rs @@ -4,7 +4,7 @@ //! category from the navigation pane (or Options) with a changed draft opens a dialog: //! Save, Discard or Keep editing. Links inside an editor that are meant to come back to //! the draft (Manage presets, View TV, New … preset) navigate without asking. -use crate::{DirectorApp, Message, Page, display_ui::DisplayMessage}; +use crate::{DirectorApp, Message, Page, gui::display_ui::DisplayMessage}; use director::{display::displays, scene::scenes::Scene, tv::tvs::Tv}; use windows_reactor::*; @@ -165,8 +165,8 @@ impl DirectorApp { self.nav.saving = true; let save = match self.page { Page::Displays => Message::Display(DisplayMessage::Save), - Page::Tvs => Message::Tv(crate::tv_ui::TvMessage::Save), - _ => Message::Scene(crate::scene_ui::SceneMessage::Save), + Page::Tvs => Message::Tv(crate::gui::tv_ui::TvMessage::Save), + _ => Message::Scene(crate::gui::scene_ui::SceneMessage::Save), }; ::update(self, save, cx); // A save that never started (validation failed) leaves the user here. @@ -180,9 +180,9 @@ impl DirectorApp { self.nav.pending = None; let discard = match self.page { Page::Displays => Message::Display(DisplayMessage::Cancel), - Page::Tvs => Message::Tv(crate::tv_ui::TvMessage::Cancel), - Page::Scenes => Message::Scene(crate::scene_ui::SceneMessage::Cancel), - _ => Message::Current(crate::current_ui::CurrentMessage::Load), + Page::Tvs => Message::Tv(crate::gui::tv_ui::TvMessage::Cancel), + Page::Scenes => Message::Scene(crate::gui::scene_ui::SceneMessage::Cancel), + _ => Message::Current(crate::gui::current_ui::CurrentMessage::Load), }; ::update(self, discard, cx); // Discarding Now rereads Windows in the background; navigate right away. diff --git a/src/options_ui.rs b/src/gui/options_ui.rs similarity index 97% rename from src/options_ui.rs rename to src/gui/options_ui.rs index 228c025..536a30d 100644 --- a/src/options_ui.rs +++ b/src/gui/options_ui.rs @@ -282,7 +282,7 @@ impl DirectorApp { }); } pub(crate) fn options_view(&self, cx: &ViewContext) -> View { - use crate::ui; + use crate::gui::ui; let prefs = self.tip.pending.as_ref().or(self.tip.preferences.as_ref()); let editable = !self.busy && self.tip.preferences.is_some() && self.tip.pending.is_none(); let seconds = @@ -311,7 +311,7 @@ impl DirectorApp { .is_on(prefs.is_some_and(|p| p.keep_completed_changes)) .is_enabled(editable) .on_toggled(cx.callback(|keep| { - Message::Tip(crate::tv_tip_ui::TipMessage::KeepCompleted(keep)) + Message::Tip(crate::gui::tv_tip_ui::TipMessage::KeepCompleted(keep)) })), ), ui::setting( @@ -322,7 +322,7 @@ impl DirectorApp { 1.0, 120.0, "Device wait seconds", - |v| Message::Tip(crate::tv_tip_ui::TipMessage::DeviceWait(v)), + |v| Message::Tip(crate::gui::tv_tip_ui::TipMessage::DeviceWait(v)), ), ), ui::setting( @@ -333,7 +333,7 @@ impl DirectorApp { 0.0, f64::from(director::tv::tv_input_guard::MAX_SECONDS), "TV input protection seconds", - |v| Message::Tip(crate::tv_tip_ui::TipMessage::InputGuard(v)), + |v| Message::Tip(crate::gui::tv_tip_ui::TipMessage::InputGuard(v)), ), ), ui::setting( @@ -344,7 +344,7 @@ impl DirectorApp { .is_on(prefs.is_some_and(|p| p.notify_scene_failures)) .is_enabled(editable) .on_toggled(cx.callback(|enabled| { - Message::Tip(crate::tv_tip_ui::TipMessage::NotifySceneFailures( + Message::Tip(crate::gui::tv_tip_ui::TipMessage::NotifySceneFailures( enabled, )) })), @@ -361,7 +361,7 @@ impl DirectorApp { && self.tip.pending.is_none(), ) .on_toggled(cx.callback(|show| { - Message::Tip(crate::tv_tip_ui::TipMessage::Show(show)) + Message::Tip(crate::gui::tv_tip_ui::TipMessage::Show(show)) })), ), match &self.tip.error { @@ -415,7 +415,7 @@ impl DirectorApp { Button::new() .automation_name("Report a problem") .on_click(cx.message(Message::Crash( - crate::crash_ui::CrashMessage::ReportProblem, + crate::gui::crash_ui::CrashMessage::ReportProblem, ))) .content("Report a problem"), )), diff --git a/src/preset_cards_preview.rs b/src/gui/preset_cards_preview.rs similarity index 90% rename from src/preset_cards_preview.rs rename to src/gui/preset_cards_preview.rs index 66cd40e..835bbac 100644 --- a/src/preset_cards_preview.rs +++ b/src/gui/preset_cards_preview.rs @@ -1,5 +1,5 @@ //! Native QA fixture with no device setters or persistence. -use crate::{DirectorApp, Message, Page, display_ui::DisplayMessage}; +use crate::{DirectorApp, Message, Page, gui::display_ui::DisplayMessage}; use director::{ audio::Output, display::display_editor::{Change, Editor, Mode, Options}, @@ -120,7 +120,8 @@ impl DirectorApp { match message { // The first scene load seeds every page's preview data. Message::Scene( - crate::scene_ui::SceneMessage::Load | crate::scene_ui::SceneMessage::Loaded(..), + crate::gui::scene_ui::SceneMessage::Load + | crate::gui::scene_ui::SceneMessage::Loaded(..), ) if !self.scene.ready => { self.end(); self.display.store_ready = true; @@ -229,10 +230,10 @@ impl DirectorApp { }); self.scene.scenes = vec![headphones, scene]; self.scene.ready = true; - self.fps = crate::fps_ui::FpsState::fixture(); + self.fps = crate::gui::fps_ui::FpsState::fixture(); self.tv.tvs = self.scene.tvs.clone(); self.tv.ready_for_controls_preview(); - if crate::samsung_ui::PREVIEW.load(Ordering::Acquire) { + if crate::gui::samsung_ui::PREVIEW.load(Ordering::Acquire) { self.page = Page::Tvs; let mut tv = self.tv.tvs[0].clone(); tv.id = "samsung-setup-fixture".into(); @@ -280,7 +281,8 @@ impl DirectorApp { true } Message::Scene( - crate::scene_ui::SceneMessage::Load | crate::scene_ui::SceneMessage::Loaded(..), + crate::gui::scene_ui::SceneMessage::Load + | crate::gui::scene_ui::SceneMessage::Loaded(..), ) => { self.end(); self.scene.displays = self.display.presets.clone(); @@ -289,17 +291,19 @@ impl DirectorApp { self.status = "Ready.".into(); true } - Message::Scene(crate::scene_ui::SceneMessage::Apply(_)) => { + Message::Scene(crate::gui::scene_ui::SceneMessage::Apply(_)) => { self.status = "Preview only. No devices or settings changed.".into(); true } - Message::Tv(crate::tv_ui::TvMessage::Load | crate::tv_ui::TvMessage::Loaded(..)) => { + Message::Tv( + crate::gui::tv_ui::TvMessage::Load | crate::gui::tv_ui::TvMessage::Loaded(..), + ) => { self.end(); self.status = "Ready.".into(); true } - Message::Tv(crate::tv_ui::TvMessage::SetupPair) - if crate::samsung_ui::PREVIEW.load(Ordering::Acquire) => + Message::Tv(crate::gui::tv_ui::TvMessage::SetupPair) + if crate::gui::samsung_ui::PREVIEW.load(Ordering::Acquire) => { if let Some(tv) = &self.tv.draft && tv.address == "192.0.2.98" @@ -349,8 +353,8 @@ impl DirectorApp { self.status = "Fixture paired. No real network connection.".into(); true } - Message::Tv(crate::tv_ui::TvMessage::TestHdmi) - if crate::samsung_ui::PREVIEW.load(Ordering::Acquire) => + Message::Tv(crate::gui::tv_ui::TvMessage::TestHdmi) + if crate::gui::samsung_ui::PREVIEW.load(Ordering::Acquire) => { if self.tv.test_ready && let Some(tv) = &mut self.tv.draft @@ -364,8 +368,8 @@ impl DirectorApp { self.status = "Fixture direct command sent. No real TV was contacted.".into(); true } - Message::Tv(crate::tv_ui::TvMessage::ExportReport) - if crate::samsung_ui::PREVIEW.load(Ordering::Acquire) => + Message::Tv(crate::gui::tv_ui::TvMessage::ExportReport) + if crate::gui::samsung_ui::PREVIEW.load(Ordering::Acquire) => { if let Some(tv) = &self.tv.draft { let data = director::tv::samsung::report(tv).unwrap(); @@ -382,11 +386,11 @@ impl DirectorApp { self.status = "Fixture redacted report exported.".into(); true } - Message::Tv(crate::tv_ui::TvMessage::Edit(id)) => { + Message::Tv(crate::gui::tv_ui::TvMessage::Edit(id)) => { self.tv.draft = self.tv.tvs.iter().find(|t| &t.id == id).cloned(); true } - Message::Tv(crate::tv_ui::TvMessage::Save) => { + Message::Tv(crate::gui::tv_ui::TvMessage::Save) => { if let Some(d) = self.tv.draft.take() { if let Some(t) = self.tv.tvs.iter_mut().find(|t| t.id == d.id) { *t = d; @@ -398,15 +402,15 @@ impl DirectorApp { self.status = "TV link saved in preview memory only.".into(); true } - Message::Tv(crate::tv_ui::TvMessage::Control( - crate::tv_controls_ui::ControlMessage::Open(_) - | crate::tv_controls_ui::ControlMessage::Close - | crate::tv_controls_ui::ControlMessage::Details(_), - )) if crate::samsung_ui::PREVIEW.load(Ordering::Acquire) => false, + Message::Tv(crate::gui::tv_ui::TvMessage::Control( + crate::gui::tv_controls_ui::ControlMessage::Open(_) + | crate::gui::tv_controls_ui::ControlMessage::Close + | crate::gui::tv_controls_ui::ControlMessage::Details(_), + )) if crate::gui::samsung_ui::PREVIEW.load(Ordering::Acquire) => false, Message::Tv( - crate::tv_ui::TvMessage::ReadDetails - | crate::tv_ui::TvMessage::SetupPair - | crate::tv_ui::TvMessage::Control(_), + crate::gui::tv_ui::TvMessage::ReadDetails + | crate::gui::tv_ui::TvMessage::SetupPair + | crate::gui::tv_ui::TvMessage::Control(_), ) => true, Message::Navigate(Some(page)) if !["audio", "displays", "scenes", "tvs", "current"].contains(&page.as_str()) => diff --git a/src/preset_cards_ui.rs b/src/gui/preset_cards_ui.rs similarity index 94% rename from src/preset_cards_ui.rs rename to src/gui/preset_cards_ui.rs index 8e04f02..3c476c4 100644 --- a/src/preset_cards_ui.rs +++ b/src/gui/preset_cards_ui.rs @@ -1,5 +1,5 @@ //! Saved-state previews. Rendering never queries or changes a device. -use crate::{DirectorApp, Message, display_ui::DisplayMessage}; +use crate::{DirectorApp, Message, gui::display_ui::DisplayMessage}; use director::{ display::display_mirroring, display::displays::{Layout, Monitor}, @@ -59,9 +59,9 @@ pub(crate) fn card( .width(CARD_WIDTH) .height(height) .padding(14.0) - .corner_radius(crate::ui::RADIUS_L) - .background(crate::ui::card_fill()) - .border_brush(crate::ui::card_stroke()) + .corner_radius(crate::gui::ui::RADIUS_L) + .background(crate::gui::ui::card_fill()) + .border_brush(crate::gui::ui::card_stroke()) .border_thickness(1.0) .content( StackPanel::new().spacing(12.0).children(( @@ -237,15 +237,15 @@ fn preview(layout: &Layout, height: f64, tooltips: bool) -> View { .fold(f64::NEG_INFINITY, f64::max); if active.is_empty() { return Border::new() - .background(crate::ui::SUBTLE_FILL) - .corner_radius(crate::ui::RADIUS_S) + .background(crate::gui::ui::SUBTLE_FILL) + .corner_radius(crate::gui::ui::RADIUS_S) .content( Grid::new() .width(WIDTH) .height(height) .children((TextBlock::new() .text("All displays off") - .font_size(crate::ui::CAPTION) + .font_size(crate::gui::ui::CAPTION) .opacity(0.72) .horizontal_alignment(HorizontalAlignment::Center) .vertical_alignment(VerticalAlignment::Center),)), @@ -305,14 +305,14 @@ fn preview(layout: &Layout, height: f64, tooltips: bool) -> View { 0.0, 0.0, )) - .background(crate::ui::SCREEN_FILL) + .background(crate::gui::ui::SCREEN_FILL) .border_brush(if d.primary() { - crate::ui::SCREEN_PRIMARY + crate::gui::ui::SCREEN_PRIMARY } else { - crate::ui::SCREEN_OTHER + crate::gui::ui::SCREEN_OTHER }) .border_thickness(1.0) - .corner_radius(crate::ui::RADIUS_S) + .corner_radius(crate::gui::ui::RADIUS_S) .content( StackPanel::new() .vertical_alignment(VerticalAlignment::Center) @@ -329,8 +329,8 @@ fn preview(layout: &Layout, height: f64, tooltips: bool) -> View { }) .collect::>(); Border::new() - .background(crate::ui::SUBTLE_FILL) - .corner_radius(crate::ui::RADIUS_S) + .background(crate::gui::ui::SUBTLE_FILL) + .corner_radius(crate::gui::ui::RADIUS_S) .content( Grid::new() .width(WIDTH) @@ -351,7 +351,7 @@ impl DirectorApp { layout_preview(&p.layout, 200.0), TextBlock::new() .text(off_summary(&p.layout).unwrap_or_default()) - .font_size(crate::ui::CAPTION) + .font_size(crate::gui::ui::CAPTION) .opacity(0.72) .text_wrapping(TextWrapping::NoWrap) .text_trimming(TextTrimming::CharacterEllipsis) @@ -362,10 +362,10 @@ impl DirectorApp { card( &p.name, None, - crate::command_ui::command_button( + crate::gui::command_ui::command_button( cx, - crate::command_ui::Target { - kind: crate::command_ui::Kind::Display, + crate::gui::command_ui::Target { + kind: crate::gui::command_ui::Kind::Display, name: p.name.clone(), id: p.id.clone(), can_end: false, @@ -396,7 +396,7 @@ impl DirectorApp { .on_click(cx.callback(move |()| { Message::Display(DisplayMessage::Delete(delete.clone())) })) - .content(crate::icons::delete_small()) + .content(crate::gui::icons::delete_small()) .tooltip("Delete display preset"), ], DISPLAY_CARD_HEIGHT, diff --git a/src/samsung_ui.rs b/src/gui/samsung_ui.rs similarity index 84% rename from src/samsung_ui.rs rename to src/gui/samsung_ui.rs index 344bb48..63abc1d 100644 --- a/src/samsung_ui.rs +++ b/src/gui/samsung_ui.rs @@ -1,16 +1,16 @@ //! Explicit, optional direct-command compatibility testing for Samsung and Android TV. -use crate::{DirectorApp, Message, tv_ui::TvMessage}; +use crate::{DirectorApp, Message, gui::tv_ui::TvMessage}; use director::tv::tvs::Tv; use windows_reactor::*; fn msg(m: TvMessage) -> Message { Message::Tv(m) } -use crate::ui::note; +use crate::gui::ui::note; impl DirectorApp { pub(crate) fn tv_test_report(&self, cx: &ViewContext, tv: &Tv, checks: bool) -> View { let f = &tv.compatibility().feedback; StackPanel::new().spacing(12.0).children(( - TextBlock::new().text("Test report").font_size(crate::ui::SUBTITLE).font_weight(FontWeight::SEMI_BOLD), + TextBlock::new().text("Test report").font_size(crate::gui::ui::SUBTITLE).font_weight(FontWeight::SEMI_BOLD), note("Enter the TV model and software version from its Settings → About page if you can find them. Use only model/version information here."), TextBox::new().automation_name("Report TV model").text(f.tv_model.clone()).placeholder_text(tv.compatibility().model.as_deref().unwrap_or("TV model, for example TCL 55C745")).is_enabled(!self.busy).on_text_changed(cx.callback(|v|msg(TvMessage::ReportModel(v)))).slot(TextBoxSlot::Header,"TV model (optional if already detected)"), TextBox::new().automation_name("Report TV software").text(f.tv_software.clone()).placeholder_text("Version from the TV’s About page, if available").is_enabled(!self.busy).on_text_changed(cx.callback(|v|msg(TvMessage::ReportSoftware(v)))).slot(TextBoxSlot::Header,"TV software version (optional)"), @@ -40,7 +40,7 @@ impl DirectorApp { .test_confirmation .and_then(|i| tv.compatibility().tests.get(i)); StackPanel::new().spacing(16.0).children(( - TextBlock::new().text(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Android TV compatibility"}else{"Samsung compatibility"}).font_size(crate::ui::SUBTITLE).font_weight(FontWeight::SEMI_BOLD), + TextBlock::new().text(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Android TV compatibility"}else{"Samsung compatibility"}).font_size(crate::gui::ui::SUBTITLE).font_weight(FontWeight::SEMI_BOLD), note(format!("Model: {} · {}: {}",tv.compatibility().model.as_deref().unwrap_or("Not reported"),if tv.brand==director::tv::tvs::Brand::TclAndroid{"Remote Service"}else{"Firmware"},tv.compatibility().firmware.as_deref().unwrap_or("Not reported"))), note("Pairing enables local power control. Input switching is optional. These TVs do not reliably acknowledge remote keys or report the selected input. Only commands you confirm will appear in controls and scenes."), if paired{StackPanel::new().spacing(12.0).children(( @@ -49,7 +49,7 @@ impl DirectorApp { note("Connect something visible to the chosen port. Using the physical remote, switch the TV to a different input before testing. Director sends one direct command; it does not navigate menus."), CheckBox::new().automation_name("TV is on a different input").is_checked(Some(self.tv.test_ready)).is_enabled(!self.busy&&pending.is_none()).on_is_checked_changed(cx.callback(|v|msg(TvMessage::TestReady(v)))).content("The TV is on a different input"), Button::new().automation_name(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Test direct Android TV HDMI command"}else{"Test direct Samsung HDMI command"}).is_enabled(!self.busy&&self.tv.test_ready&&pending.is_none()).on_click(cx.message(msg(TvMessage::TestHdmi))).content(format!("Test HDMI {port}")), - if let Some(test)=pending{Border::new().padding(16.0).corner_radius(crate::ui::RADIUS_L).border_brush(crate::ui::card_stroke()).border_thickness(1.0).content(StackPanel::new().spacing(12.0).children((TextBlock::new().text(format!("Did the TV switch to HDMI {}?",test.port)).font_weight(FontWeight::SEMI_BOLD).text_wrapping(TextWrapping::Wrap),note("Confirm only if the TV actually changed from the other input to the selected HDMI port."),StackPanel::new().orientation(Orientation::Horizontal).spacing(8.0).children((Button::new().automation_name(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Android TV HDMI test succeeded"}else{"Samsung HDMI test succeeded"}).style(ButtonStyle::Accent).is_enabled(!self.busy).on_click(cx.message(msg(TvMessage::ConfirmTest(true)))).content("Yes, it switched"),Button::new().automation_name(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Android TV HDMI test failed"}else{"Samsung HDMI test failed"}).is_enabled(!self.busy).on_click(cx.message(msg(TvMessage::ConfirmTest(false)))).content("No"))))))}else{View::empty()}, + if let Some(test)=pending{Border::new().padding(16.0).corner_radius(crate::gui::ui::RADIUS_L).border_brush(crate::gui::ui::card_stroke()).border_thickness(1.0).content(StackPanel::new().spacing(12.0).children((TextBlock::new().text(format!("Did the TV switch to HDMI {}?",test.port)).font_weight(FontWeight::SEMI_BOLD).text_wrapping(TextWrapping::Wrap),note("Confirm only if the TV actually changed from the other input to the selected HDMI port."),StackPanel::new().orientation(Orientation::Horizontal).spacing(8.0).children((Button::new().automation_name(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Android TV HDMI test succeeded"}else{"Samsung HDMI test succeeded"}).style(ButtonStyle::Accent).is_enabled(!self.busy).on_click(cx.message(msg(TvMessage::ConfirmTest(true)))).content("Yes, it switched"),Button::new().automation_name(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Android TV HDMI test failed"}else{"Samsung HDMI test failed"}).is_enabled(!self.busy).on_click(cx.message(msg(TvMessage::ConfirmTest(false)))).content("No"))))))}else{View::empty()}, note(if confirmed.is_empty(){"No direct inputs confirmed. Input controls stay hidden; you can skip this test and use power control.".into()}else{format!("Confirmed: {}",confirmed.iter().map(|i|i.label.as_str()).collect::>().join(", "))}), if confirmed.is_empty(){View::empty()}else{ComboBox::new().automation_name(if tv.brand==director::tv::tvs::Brand::TclAndroid{"Android TV PC input"}else{"Samsung PC input"}).items_source(std::iter::once("No automatic PC input".into()).chain(confirmed.iter().map(|i|i.label.clone())).collect::>()).selected_index(Some(tv.pc_input.as_ref().and_then(|pc|confirmed.iter().position(|i|i.id==pc.id)).map_or(0,|i|i+1))).horizontal_alignment(HorizontalAlignment::Stretch).is_enabled(!self.busy).on_selection_changed(cx.callback(|i|msg(TvMessage::PcInput(i)))).slot(ComboBoxSlot::Header,"PC input for scenes")}, ))}else{note("Pair this TV to run compatibility tests.")}, @@ -65,7 +65,7 @@ pub(crate) static PREVIEW: std::sync::atomic::AtomicBool = #[ignore = "Owned-window Samsung setup fixture; no network, commands or real settings writes"] fn samsung_setup_fixture() { PREVIEW.store(true, std::sync::atomic::Ordering::Release); - crate::preset_cards_preview::ENABLED.store(true, std::sync::atomic::Ordering::Release); + crate::gui::preset_cards_preview::ENABLED.store(true, std::sync::atomic::Ordering::Release); director::diagnostics::init(); windows_reactor::App::run_component::(()).unwrap(); director::diagnostics::flush(); @@ -76,7 +76,7 @@ fn samsung_setup_fixture() { #[ignore = "Owned TCL setup fixture; no real network or settings writes"] fn android_setup_fixture() { PREVIEW.store(true, std::sync::atomic::Ordering::Release); - crate::preset_cards_preview::ENABLED.store(true, std::sync::atomic::Ordering::Release); + crate::gui::preset_cards_preview::ENABLED.store(true, std::sync::atomic::Ordering::Release); director::diagnostics::init(); windows_reactor::App::run_component::(()).unwrap(); director::diagnostics::flush(); diff --git a/src/scene_editor_ui.rs b/src/gui/scene_editor_ui.rs similarity index 96% rename from src/scene_editor_ui.rs rename to src/gui/scene_editor_ui.rs index c6ca74c..4a8fa33 100644 --- a/src/scene_editor_ui.rs +++ b/src/gui/scene_editor_ui.rs @@ -3,7 +3,7 @@ //! Each block shows a one-line summary and expands in place to edit that step. Unused steps //! are muted "+ Add" slots. When leaving runs at a different time, so it sits apart from the //! line. -use crate::{DirectorApp, Message, scene_ui::SceneMessage}; +use crate::{DirectorApp, Message, gui::scene_ui::SceneMessage}; use director::scene::scenes::{self, Action, ActionList, Scene}; use windows_reactor::*; @@ -73,7 +73,7 @@ impl Step { fn msg(m: SceneMessage) -> Message { Message::Scene(m) } -use crate::ui::note; +use crate::gui::ui::note; /// The widest the flow column gets. const FLOW_WIDTH: f64 = 720.0; /// Every step card, filled or empty, has this height. @@ -94,7 +94,7 @@ const DASH_COLOR: Color = Color::argb(110, 128, 128, 128); /// A small down arrow between steps ("then"), centred on the cards' icon column. fn connector() -> View { StackPanel::new() - .opacity(crate::ui::SECONDARY) + .opacity(crate::gui::ui::SECONDARY) .margin(Thickness::new( CONTENT_INSET + (ICON_COLUMN - ARROW) / 2.0, 4.0, @@ -263,7 +263,8 @@ impl DirectorApp { /// bar, up to FLOW_WIDTH. fn flow_width(&self) -> f64 { // Room for the scroll bar's gutter beside the column. - (crate::ui::page_width(self.window_width, self.pane_open) - 28.0).clamp(320.0, FLOW_WIDTH) + (crate::gui::ui::page_width(self.window_width, self.pane_open) - 28.0) + .clamp(320.0, FLOW_WIDTH) } /// One step as a fixed-size card. A filled step shows its summary with edit and remove; @@ -325,17 +326,17 @@ impl DirectorApp { .margin(Thickness::new(0.0, 0.0, 8.0, 0.0)) .vertical_alignment(VerticalAlignment::Center) .children(( - crate::preset_cards_ui::card_icon_button(Button::new()) + crate::gui::preset_cards_ui::card_icon_button(Button::new()) .automation_name(format!("Edit {}", step.title())) .is_enabled(available) .on_click(cx.message(msg(SceneMessage::Open(Some(step))))) - .content(crate::preset_cards_ui::card_edit_icon()) + .content(crate::gui::preset_cards_ui::card_edit_icon()) .tooltip(format!("Edit {}", step.title())), - crate::preset_cards_ui::card_icon_button(Button::new()) + crate::gui::preset_cards_ui::card_icon_button(Button::new()) .automation_name(format!("Remove {}", step.title())) .is_enabled(available) .on_click(cx.message(msg(SceneMessage::ClearStep(step)))) - .content(crate::icons::delete_small()) + .content(crate::gui::icons::delete_small()) .tooltip(format!("Remove {} from this scene", step.title())), )) } else { @@ -373,10 +374,10 @@ impl DirectorApp { if used { Border::new() .height(CARD_HEIGHT) - .corner_radius(crate::ui::RADIUS_L) + .corner_radius(crate::gui::ui::RADIUS_L) .border_thickness(1.0) - .border_brush(crate::ui::card_stroke()) - .background(crate::ui::card_fill()) + .border_brush(crate::gui::ui::card_stroke()) + .background(crate::gui::ui::card_fill()) .padding(1.0) .content(content) } else { @@ -444,10 +445,10 @@ impl DirectorApp { ); Border::new() .height(CARD_HEIGHT) - .corner_radius(crate::ui::RADIUS_L) + .corner_radius(crate::gui::ui::RADIUS_L) .border_thickness(1.0) - .border_brush(crate::ui::card_stroke()) - .background(crate::ui::card_fill()) + .border_brush(crate::gui::ui::card_stroke()) + .background(crate::gui::ui::card_fill()) .padding(1.0) .margin(Thickness::new(0.0, 0.0, 0.0, 8.0)) .content( @@ -458,14 +459,14 @@ impl DirectorApp { .grid_column(0) .grid_column_span(2) .content(header), - crate::preset_cards_ui::card_icon_button(Button::new()) + crate::gui::preset_cards_ui::card_icon_button(Button::new()) .grid_column(1) .automation_name(format!("Don't turn off {name} when leaving")) .is_enabled(available) .vertical_alignment(VerticalAlignment::Center) .margin(Thickness::new(0.0, 0.0, 8.0, 0.0)) .on_click(cx.message(msg(SceneMessage::TvOffWhenLeaving(false)))) - .content(crate::icons::delete_small()) + .content(crate::gui::icons::delete_small()) .tooltip("Don't turn the TV off when leaving"), )), ) @@ -635,7 +636,7 @@ impl DirectorApp { .as_ref() .and_then(|id| self.scene.displays.iter().find(|p| &p.id == id)) .map(|p| { - crate::preset_cards_ui::layout_preview_in_dialog(&p.layout, 124.0) + crate::gui::preset_cards_ui::layout_preview_in_dialog(&p.layout, 124.0) }) .unwrap_or_else(View::empty), Button::new() @@ -680,14 +681,14 @@ impl DirectorApp { )) } Step::Sound => self.sound_editor(cx, d), - Step::Fps => self.fps_controls(cx, crate::fps_ui::Target::Scene), + Step::Fps => self.fps_controls(cx, crate::gui::fps_ui::Target::Scene), } } /// The Sound step: output (a device or a TV's sound), volume, mute, a separate calls /// device and the microphone. Anything left as is stays as it is when the scene runs. fn sound_editor(&self, cx: &ViewContext, d: &Scene) -> View { - use crate::scene_ui::{SoundEdit, device_choices, mute_choice, sound_device}; + use crate::gui::scene_ui::{SoundEdit, device_choices, mute_choice, sound_device}; let available = !self.busy; let edit = |e: SoundEdit| msg(SceneMessage::Sound(e)); let empty = scenes::Sound::default(); @@ -698,7 +699,7 @@ impl DirectorApp { .iter() .find(|o| o.id == device.id) .map_or(format!("{} — not found", device.name), |o| { - crate::audio_relink_ui::device_label(o) + crate::gui::audio_relink_ui::device_label(o) }) }; let outputs = device_choices(&self.outputs, sound_device(sound).as_ref()); @@ -996,15 +997,15 @@ impl DirectorApp { .text_trimming(TextTrimming::CharacterEllipsis), TextBlock::new() .text(folder) - .font_size(crate::ui::CAPTION) - .opacity(crate::ui::SECONDARY) + .font_size(crate::gui::ui::CAPTION) + .opacity(crate::gui::ui::SECONDARY) .text_trimming(TextTrimming::CharacterEllipsis), )) } else { TextBlock::new() .grid_column(1) .text("No app chosen yet") - .opacity(crate::ui::SECONDARY) + .opacity(crate::gui::ui::SECONDARY) .vertical_alignment(VerticalAlignment::Center) .into() }, @@ -1042,7 +1043,7 @@ impl DirectorApp { Border::new() .padding(Thickness::new(14.0, 2.0, 0.0, 2.0)) .border_thickness(Thickness::new(2.0, 0.0, 0.0, 0.0)) - .border_brush(crate::ui::card_stroke()) + .border_brush(crate::gui::ui::card_stroke()) .content( StackPanel::new().spacing(10.0).children(( TextBox::new() @@ -1099,9 +1100,9 @@ impl DirectorApp { format!("action-{i}"), Border::new() .padding(14.0) - .corner_radius(crate::ui::RADIUS_L) + .corner_radius(crate::gui::ui::RADIUS_L) .border_thickness(1.0) - .border_brush(crate::ui::card_stroke()) + .border_brush(crate::gui::ui::card_stroke()) .content(StackPanel::new().spacing(10.0).children(( Grid::new() .columns([GridLength::Star(1.0), GridLength::Auto]) @@ -1134,7 +1135,7 @@ impl DirectorApp { .on_click(cx.callback(move |()| { msg(SceneMessage::Remove(list, i)) })) - .content(crate::icons::delete()), + .content(crate::gui::icons::delete()), )), )), body, @@ -1229,8 +1230,8 @@ impl DirectorApp { let changed = self.draft_changed(crate::Page::Scenes); let can_save = self.scene_ready() && problem.is_none() && !d.name.trim().is_empty() && changed; - crate::ui::page( - crate::ui::header( + crate::gui::ui::page( + crate::gui::ui::header( if d.name.trim().is_empty() { "New scene" } else { @@ -1240,16 +1241,16 @@ impl DirectorApp { vec![], ), column, - Some(crate::ui::footer( + Some(crate::gui::ui::footer( StackPanel::new() .spacing(2.0) .children(( - crate::ui::note(match &problem { + crate::gui::ui::note(match &problem { Some(e) if !d.name.trim().is_empty() => e.clone(), _ if !changed => "No changes to save.".into(), _ => "Saving won’t change your setup.".into(), }), - crate::ui::caption( + crate::gui::ui::caption( "If a step fails, Director restores your previous settings. Change this in Options.", ), )), @@ -1334,10 +1335,10 @@ mod tests { // Shared helpers can hide a tooltip (the display preview did), so the step dialogs // may only call helpers checked to be tooltip-free. Check a new one, then add it here. let safe = [ - "crate::icons::delete(", - "crate::preset_cards_ui::layout_preview_in_dialog(", + "crate::gui::icons::delete(", + "crate::gui::preset_cards_ui::layout_preview_in_dialog(", // Returns a String label. - "crate::audio_relink_ui::device_label(", + "crate::gui::audio_relink_ui::device_label(", ]; let steps = region( editor, @@ -1352,10 +1353,10 @@ mod tests { let call = &rest[..(path + 1).min(rest.len())]; // A call to a function in another UI module (not a type or enum path). let last = call.trim_end_matches('(').rsplit("::").next().unwrap_or(""); - // crate::ui is checked whole above, so its helpers are all tooltip-free. + // crate::gui::ui is checked whole above, so its helpers are all tooltip-free. if call.ends_with('(') && last.starts_with(|c: char| c.is_lowercase()) - && !call.starts_with("crate::ui::") + && !call.starts_with("crate::gui::ui::") { assert!( safe.contains(&call), diff --git a/src/scene_ui.rs b/src/gui/scene_ui.rs similarity index 96% rename from src/scene_ui.rs rename to src/gui/scene_ui.rs index 8869dc3..8c437ff 100644 --- a/src/scene_ui.rs +++ b/src/gui/scene_ui.rs @@ -109,11 +109,11 @@ pub(crate) enum SceneMessage { /// Open or close an app action's Advanced options. ActionAdvanced(ActionList, usize, bool), /// Open a step's editor dialog (`None` closes it, keeping the changes). - Open(Option), + Open(Option), /// The step dialog closed: Done keeps the changes, anything else restores them. StepClosed(ContentDialogResult), /// Reset a step to "leave unchanged". - ClearStep(crate::scene_editor_ui::Step), + ClearStep(crate::gui::scene_editor_ui::Step), End, Save, Saved(Result, String>), @@ -125,7 +125,7 @@ pub(crate) enum SceneMessage { Confirm(ContentDialogResult), Finished(u64, Result), /// The first-run card that saves the current setup as a scene. - Starter(crate::starter_ui::StarterMessage), + Starter(crate::gui::starter_ui::StarterMessage), } #[derive(Clone)] pub(crate) enum Event { @@ -146,7 +146,7 @@ pub(crate) struct SceneState { confirm: Option>, remaining: Option, /// The step whose editor dialog is open. - pub(crate) open: Option, + pub(crate) open: Option, /// The draft as it was when the step dialog opened, for Cancel. pub(crate) snapshot: Option, /// The scene applied last during this Windows session. @@ -154,12 +154,12 @@ pub(crate) struct SceneState { /// App actions whose Advanced options section is open. pub(crate) advanced: Vec<(ActionList, usize)>, /// The first-run card: what it read and what's ticked. - pub(crate) starter: crate::starter_ui::StarterState, + pub(crate) starter: crate::gui::starter_ui::StarterState, } fn msg(m: SceneMessage) -> Message { Message::Scene(m) } -use crate::ui::note; +use crate::gui::ui::note; /// The height a scene card needs: its header, the 124 DIP hero panel and its text lines. /// Lines are estimated from their length, since a long line wraps in the 312 DIP column. /// The height of one summary line, as measured on a card. @@ -223,7 +223,7 @@ fn hero_panel(glyph: &str, title: String, level: Level, lines: Vec) -> V i.to_string(), TextBlock::new() .text(line) - .font_size(crate::ui::CAPTION) + .font_size(crate::gui::ui::CAPTION) .opacity(0.72) .text_trimming(TextTrimming::CharacterEllipsis), ) @@ -232,8 +232,8 @@ fn hero_panel(glyph: &str, title: String, level: Level, lines: Vec) -> V Border::new() .height(124.0) .padding(Thickness::xy(16.0, 12.0)) - .corner_radius(crate::ui::RADIUS_S) - .background(crate::ui::SUBTLE_FILL) + .corner_radius(crate::gui::ui::RADIUS_S) + .background(crate::gui::ui::SUBTLE_FILL) .content( Grid::new() .columns([GridLength::Auto, GridLength::Star(1.0)]) @@ -242,7 +242,7 @@ fn hero_panel(glyph: &str, title: String, level: Level, lines: Vec) -> V Viewbox::new() .width(36.0) .height(36.0) - .opacity(crate::ui::SECONDARY) + .opacity(crate::gui::ui::SECONDARY) .vertical_alignment(VerticalAlignment::Center) .slot(ViewboxSlot::Child, FontIcon::new().glyph(glyph)), StackPanel::new() @@ -277,11 +277,11 @@ impl DirectorApp { } fn scene_save(&mut self, next: Vec, cx: &ComponentContext) { #[cfg(test)] - if crate::preset_cards_preview::ENABLED.load(Ordering::Acquire) { + if crate::gui::preset_cards_preview::ENABLED.load(Ordering::Acquire) { self.scene.scenes = next; - if crate::fps_ui::PREVIEW.load(Ordering::Acquire) { + if crate::gui::fps_ui::PREVIEW.load(Ordering::Acquire) { std::fs::write( - crate::preset_cards_preview::output("fps-scenes-fixture.json"), + crate::gui::preset_cards_preview::output("fps-scenes-fixture.json"), serde_json::to_vec_pretty(&self.scene.scenes).unwrap(), ) .unwrap(); @@ -323,12 +323,12 @@ impl DirectorApp { } pub(crate) fn update_scene(&mut self, m: SceneMessage, cx: &ComponentContext) { if matches!(&m, SceneMessage::Load) { - self.update_fps(crate::fps_ui::FpsMessage::Discover, cx); + self.update_fps(crate::gui::fps_ui::FpsMessage::Discover, cx); } let ready = self.scene_ready(); // The last item of each section's dropdown creates a new Library item in place. if ready && self.scene.draft.is_some() { - use crate::library_flow::{LibraryMessage, Slot}; + use crate::gui::library_flow::{LibraryMessage, Slot}; let create = match &m { SceneMessage::Display(Some(i)) if *i == self.scene.displays.len() + 1 => { Some(Slot::Display) @@ -625,7 +625,7 @@ impl DirectorApp { } } SceneMessage::ClearStep(step) if !self.busy => { - use crate::scene_editor_ui::Step; + use crate::gui::scene_editor_ui::Step; if let Some(d) = &mut self.scene.draft { match step { Step::Before => d.before.clear(), @@ -914,7 +914,7 @@ impl DirectorApp { }; TextBlock::new() .text("●") - .foreground(crate::ui::SUCCESS) + .foreground(crate::gui::ui::SUCCESS) .horizontal_alignment(HorizontalAlignment::Center) .automation_name(label.as_str()) .tooltip(label.as_str()) @@ -927,7 +927,7 @@ impl DirectorApp { if let Err(e) = resolved { TextBlock::new() .text(e) - .foreground(crate::ui::critical()) + .foreground(crate::gui::ui::critical()) .text_wrapping(TextWrapping::Wrap) .into() } else { @@ -936,13 +936,13 @@ impl DirectorApp { )); KeyedView::new( s.id.clone(), - crate::preset_cards_ui::card( + crate::gui::preset_cards_ui::card( &name, Some(lead), - crate::command_ui::command_button( + crate::gui::command_ui::command_button( cx, - crate::command_ui::Target { - kind: crate::command_ui::Kind::Scene, + crate::gui::command_ui::Target { + kind: crate::gui::command_ui::Kind::Scene, name: s.name.clone(), id: s.id.clone(), can_end: s.has_leave_work(), @@ -950,7 +950,7 @@ impl DirectorApp { ), body, vec![ - crate::preset_cards_ui::action_button( + crate::gui::preset_cards_ui::action_button( Button::new() .automation_name(if returns { action_label.clone() @@ -977,15 +977,15 @@ impl DirectorApp { "Apply scene" }, ), - crate::preset_cards_ui::card_icon_button(Button::new()) + crate::gui::preset_cards_ui::card_icon_button(Button::new()) .automation_name(format!("Edit {}", name)) .is_enabled(self.scene_ready()) .on_click( cx.callback(move |()| msg(SceneMessage::Edit(edit.clone()))), ) - .content(crate::preset_cards_ui::card_edit_icon()) + .content(crate::gui::preset_cards_ui::card_edit_icon()) .tooltip("Edit scene"), - crate::preset_cards_ui::card_icon_button(Button::new()) + crate::gui::preset_cards_ui::card_icon_button(Button::new()) .automation_name(format!("Delete {}", name)) .is_enabled(self.scene_ready()) .on_click( @@ -993,7 +993,7 @@ impl DirectorApp { msg(SceneMessage::Delete(delete.clone())) }), ) - .content(crate::icons::delete_small()) + .content(crate::gui::icons::delete_small()) .tooltip("Delete scene"), ], card_height, @@ -1009,7 +1009,7 @@ impl DirectorApp { GridLength::Auto, ]) .children(( - crate::ui::header( + crate::gui::ui::header( "Scenes", "Switch your whole setup in one click.", vec![ @@ -1031,7 +1031,7 @@ impl DirectorApp { .content(self.starter_card(cx)), ) } else { - crate::preset_cards_ui::card_grid(2, card_height, cards) + crate::gui::preset_cards_ui::card_grid(2, card_height, cards) }, if self.scene.cancel.is_some() { Button::new() @@ -1191,7 +1191,7 @@ impl DirectorApp { .as_ref() .and_then(|id| self.scene.displays.iter().find(|p| &p.id == id)) { - return crate::preset_cards_ui::layout_preview(&p.layout, 124.0); + return crate::gui::preset_cards_ui::layout_preview(&p.layout, 124.0); } if let Some(sound) = &s.sound { let output = match &sound.output { @@ -1383,7 +1383,7 @@ fn pick_path(folder: bool) -> Result, String> { .map_err(|e| e.to_string())?; } dialog.SetOptions(options).map_err(|e| e.to_string())?; - match dialog.Show(Some(crate::close_guard::window()?)) { + match dialog.Show(Some(crate::gui::close_guard::window()?)) { Ok(()) => {} Err(e) if e.code().0 == 0x800704C7u32 as i32 => return Ok(None), Err(e) => return Err(format!("Could not open the file picker: {e}")), diff --git a/src/starter_ui.rs b/src/gui/starter_ui.rs similarity index 94% rename from src/starter_ui.rs rename to src/gui/starter_ui.rs index 0fbd6c0..5228051 100644 --- a/src/starter_ui.rs +++ b/src/gui/starter_ui.rs @@ -1,6 +1,6 @@ //! The Scenes page's first run: one card that saves how the PC is set up right now as the //! everyday scene, and afterwards a tip about making the next one. See `director::scene::starter`. -use crate::{DirectorApp, Message, scene_ui::SceneMessage, work}; +use crate::{DirectorApp, Message, gui::scene_ui::SceneMessage, work}; use director::{ audio::{AudioBackend, Output}, display::displays::Layout, @@ -53,7 +53,7 @@ impl Default for StarterState { fn msg(m: StarterMessage) -> Message { Message::Scene(SceneMessage::Starter(m)) } -use crate::ui::note; +use crate::gui::ui::note; impl DirectorApp { /// The current FPS limit to keep, from the FPS survey the Scenes page already runs. @@ -244,17 +244,17 @@ impl DirectorApp { .horizontal_alignment(HorizontalAlignment::Left) .vertical_alignment(VerticalAlignment::Top) .padding(24.0) - .corner_radius(crate::ui::RADIUS_L) + .corner_radius(crate::gui::ui::RADIUS_L) .border_thickness(1.0) - .border_brush(crate::ui::card_stroke()) - .background(crate::ui::card_fill()) + .border_brush(crate::gui::ui::card_stroke()) + .background(crate::gui::ui::card_fill()) .automation_name("Start with your everyday setup") .content( StackPanel::new().spacing(18.0).children(( StackPanel::new().spacing(6.0).children(( TextBlock::new() .text("Start with your everyday setup") - .font_size(crate::ui::SUBTITLE) + .font_size(crate::gui::ui::SUBTITLE) .font_weight(FontWeight::SEMI_BOLD), note("Save how your PC is set up right now as a scene. Whenever another scene changes your screens or sound, this one brings everything back in one click."), )), @@ -270,8 +270,8 @@ impl DirectorApp { match problem { Some(p) if !name.is_empty() || !s.name.is_empty() => TextBlock::new() .text(p) - .font_size(crate::ui::CAPTION) - .foreground(crate::ui::critical()) + .font_size(crate::gui::ui::CAPTION) + .foreground(crate::gui::ui::critical()) .into(), _ => View::empty(), }, @@ -303,8 +303,8 @@ impl DirectorApp { .content(label), TextBlock::new() .text("Saving doesn’t change anything on your PC.") - .font_size(crate::ui::CAPTION) - .opacity(crate::ui::SECONDARY) + .font_size(crate::gui::ui::CAPTION) + .opacity(crate::gui::ui::SECONDARY) .vertical_alignment(VerticalAlignment::Center), )), HyperlinkButton::new() @@ -331,10 +331,10 @@ impl DirectorApp { Border::new() .padding(Thickness::xy(16.0, 12.0)) .margin(Thickness::new(0.0, 0.0, 0.0, 16.0)) - .corner_radius(crate::ui::RADIUS_L) + .corner_radius(crate::gui::ui::RADIUS_L) .border_thickness(1.0) - .border_brush(crate::ui::card_stroke()) - .background(crate::ui::card_fill()) + .border_brush(crate::gui::ui::card_stroke()) + .background(crate::gui::ui::card_fill()) .automation_name("Next scene tip") .content( Grid::new() @@ -343,7 +343,7 @@ impl DirectorApp { .children(( FontIcon::new() .glyph("\u{e946}") - .opacity(crate::ui::SECONDARY) + .opacity(crate::gui::ui::SECONDARY) .vertical_alignment(VerticalAlignment::Center), TextBlock::new() .grid_column(1) @@ -357,7 +357,7 @@ impl DirectorApp { .is_enabled(!self.busy && self.tip.pending.is_none()) .vertical_alignment(VerticalAlignment::Center) .on_click(cx.message(Message::Tip( - crate::tv_tip_ui::TipMessage::HideNextSceneTip, + crate::gui::tv_tip_ui::TipMessage::HideNextSceneTip, ))) .content("Got it"), )), diff --git a/src/status_ui.rs b/src/gui/status_ui.rs similarity index 100% rename from src/status_ui.rs rename to src/gui/status_ui.rs diff --git a/src/tv_controls_ui.rs b/src/gui/tv_controls_ui.rs similarity index 98% rename from src/tv_controls_ui.rs rename to src/gui/tv_controls_ui.rs index dc3a3e8..d616ee1 100644 --- a/src/tv_controls_ui.rs +++ b/src/gui/tv_controls_ui.rs @@ -1,6 +1,6 @@ //! Native TV controls. Status reads never hold the mutation guard. -use crate::tv_power_state::{Next, Progress, WakeRetries}; -use crate::{DirectorApp, Message, tv_ui::TvMessage}; +use crate::gui::tv_power_state::{Next, Progress, WakeRetries}; +use crate::{DirectorApp, Message, gui::tv_ui::TvMessage}; use director::{ audio::windows_audio::OperationLock, tv::tv_control::{self, Effect, PowerAction, PowerState, Report, Snapshot}, @@ -368,7 +368,7 @@ impl DirectorApp { live_details: String::new(), }); #[cfg(test)] - if crate::samsung_ui::PREVIEW.load(std::sync::atomic::Ordering::Acquire) { + if crate::gui::samsung_ui::PREVIEW.load(std::sync::atomic::Ordering::Acquire) { let tv = self .tv .tvs @@ -660,7 +660,7 @@ impl DirectorApp { state.status_details.clear(); // Mutations retain the shared guard, without leaking modal progress into the page. self.busy = true; - crate::close_guard::set_busy(true); + crate::gui::close_guard::set_busy(true); let _ = cx.spawn_background_with_rejection( move |_| { let report = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| { @@ -763,7 +763,9 @@ impl DirectorApp { .columns([GridLength::Star(1.0), GridLength::Auto]) .children(( StackPanel::new().spacing(4.0).children(( - TextBlock::new().text("Power").opacity(crate::ui::SECONDARY), + TextBlock::new() + .text("Power") + .opacity(crate::gui::ui::SECONDARY), TextBlock::new() .automation_name(format!("Power status: {status}")) .text(status) @@ -818,8 +820,8 @@ impl DirectorApp { if action == PowerAction::Wake && !tv.can_wake() { TextBlock::new() .text("No wake address saved. Complete TV setup to enable Wake.") - .font_size(crate::ui::CAPTION) - .opacity(crate::ui::SECONDARY) + .font_size(crate::gui::ui::CAPTION) + .opacity(crate::gui::ui::SECONDARY) .text_wrapping(TextWrapping::Wrap) .into() } else { @@ -845,7 +847,7 @@ impl DirectorApp { "Inputs appear when the TV is connected." }) .text_wrapping(TextWrapping::Wrap) - .opacity(crate::ui::SECONDARY) + .opacity(crate::gui::ui::SECONDARY) .into() } else { StackPanel::new().spacing(8.0).children(( @@ -855,7 +857,7 @@ impl DirectorApp { "Current TV input: {current}" )) .text(format!("Current: {current}")) - .opacity(crate::ui::SECONDARY) + .opacity(crate::gui::ui::SECONDARY) .text_wrapping(TextWrapping::Wrap) .into() } else { @@ -901,8 +903,8 @@ impl DirectorApp { TextBlock::new() .text(state.notice.clone()) .text_wrapping(TextWrapping::Wrap) - .font_size(crate::ui::CAPTION) - .opacity(crate::ui::SECONDARY) + .font_size(crate::gui::ui::CAPTION) + .opacity(crate::gui::ui::SECONDARY) .into() } else { View::empty() @@ -939,7 +941,7 @@ impl DirectorApp { .collect::>() .join("\n\n"), ) - .font_size(crate::ui::CAPTION) + .font_size(crate::gui::ui::CAPTION) .text_wrapping(TextWrapping::Wrap), ), ), diff --git a/src/tv_power_state.rs b/src/gui/tv_power_state.rs similarity index 100% rename from src/tv_power_state.rs rename to src/gui/tv_power_state.rs diff --git a/src/tv_tip_ui.rs b/src/gui/tv_tip_ui.rs similarity index 95% rename from src/tv_tip_ui.rs rename to src/gui/tv_tip_ui.rs index 230957b..38a1117 100644 --- a/src/tv_tip_ui.rs +++ b/src/gui/tv_tip_ui.rs @@ -1,5 +1,5 @@ //! Optional TV guidance, without changing a display or contacting a TV. -use crate::{DirectorApp, Message, Page, tv_ui::TvMessage, work}; +use crate::{DirectorApp, Message, Page, gui::tv_ui::TvMessage, work}; use director::{ audio::windows_audio::OperationLock, preferences::{self, Preferences}, @@ -140,11 +140,11 @@ impl DirectorApp { return View::empty(); } Border::new().padding(Thickness::uniform(14.0)) - .border_thickness(Thickness::uniform(1.0)).border_brush(crate::ui::card_stroke()) - .background(crate::ui::card_fill()).corner_radius(crate::ui::RADIUS_L) + .border_thickness(Thickness::uniform(1.0)).border_brush(crate::gui::ui::card_stroke()) + .background(crate::gui::ui::card_fill()).corner_radius(crate::gui::ui::RADIUS_L) .automation_name("TV setup tip").content( Grid::new().columns([GridLength::Auto,GridLength::Star(1.0),GridLength::Auto]).column_spacing(12.0).children(( - FontIcon::new().glyph("\u{e946}").opacity(crate::ui::SECONDARY).vertical_alignment(VerticalAlignment::Top).margin(Thickness::new(0.0,3.0,0.0,0.0)), + FontIcon::new().glyph("\u{e946}").opacity(crate::gui::ui::SECONDARY).vertical_alignment(VerticalAlignment::Top).margin(Thickness::new(0.0,3.0,0.0,0.0)), StackPanel::new().grid_column(1).spacing(8.0).children(( TextBlock::new().text("Setting up a TV?").font_size(16.0).font_weight(FontWeight::SEMI_BOLD), TextBlock::new().text("Add your TV for wake and PC-input controls. You can also turn it on and select its input yourself.") diff --git a/src/tv_ui.rs b/src/gui/tv_ui.rs similarity index 93% rename from src/tv_ui.rs rename to src/gui/tv_ui.rs index f4e3b3d..220233d 100644 --- a/src/tv_ui.rs +++ b/src/gui/tv_ui.rs @@ -54,7 +54,7 @@ pub(crate) enum TvMessage { Save, Saved(Result, String>), - Control(crate::tv_controls_ui::ControlMessage), + Control(crate::gui::tv_controls_ui::ControlMessage), Delete(String), DeleteClosed(ContentDialogResult), } @@ -62,7 +62,7 @@ pub(crate) enum TvMessage { pub(crate) struct TvState { pub(crate) tvs: Vec, pub(crate) add_after_load: bool, - pub(crate) controls: Option, + pub(crate) controls: Option, pub(crate) control_revision: u64, displays: Vec, pub draft: Option, @@ -90,14 +90,14 @@ fn input_label(input: &Input) -> String { format!("{} ({})", input.label, input.id) } } -use crate::ui::note; +use crate::gui::ui::note; /// Label and value rows, for a summary. fn review_rows(rows: &[(&str, String)]) -> View { Grid::new() .columns([GridLength::Auto, GridLength::Star(1.0)]) .rows(rows.iter().map(|_| GridLength::Auto)) - .column_spacing(crate::ui::GAP_L) - .row_spacing(crate::ui::GAP_S) + .column_spacing(crate::gui::ui::GAP_L) + .row_spacing(crate::gui::ui::GAP_S) .keyed_children( rows.iter() .enumerate() @@ -108,7 +108,7 @@ fn review_rows(rows: &[(&str, String)]) -> View { TextBlock::new() .grid_row(i as i32) .text(*label) - .opacity(crate::ui::SECONDARY), + .opacity(crate::gui::ui::SECONDARY), ), KeyedView::new( format!("value-{i}"), @@ -163,7 +163,7 @@ impl DirectorApp { } pub(crate) fn update_tv(&mut self, message: TvMessage, cx: &ComponentContext) { #[cfg(test)] - if crate::preset_cards_preview::ENABLED.load(std::sync::atomic::Ordering::Acquire) + if crate::gui::preset_cards_preview::ENABLED.load(std::sync::atomic::Ordering::Acquire) && matches!(message, TvMessage::Load) { self.end(); @@ -346,7 +346,7 @@ impl DirectorApp { msg(TvMessage::ReportExported((|| { let path = director::tv::samsung::export(&tv)?; let folder = path.parent().ok_or("Report folder was unavailable.")?; - let opened = crate::options_ui::open_folder(folder); + let opened = crate::gui::options_ui::open_folder(folder); Ok(format!( "Report: {}{}", path.display(), @@ -523,7 +523,7 @@ impl DirectorApp { ); self.flow.navigated(); } else { - self.library_cancelled(crate::library_flow::Slot::Tv, cx); + self.library_cancelled(crate::gui::library_flow::Slot::Tv, cx); } } TvMessage::Name(v) if !self.busy => { @@ -868,7 +868,7 @@ impl DirectorApp { TvMessage::Saved(result) => match result { Ok(tvs) => { self.end(); - let added = crate::library_flow::added_id( + let added = crate::gui::library_flow::added_id( self.tv.tvs.iter().map(|t| t.id.as_str()), tvs.iter().map(|t| t.id.as_str()), ); @@ -881,7 +881,7 @@ impl DirectorApp { self.status = "TVs saved.".into(); self.guard_saved(true, cx); self.announce(cx); - self.library_saved(crate::library_flow::Slot::Tv, added, cx); + self.library_saved(crate::gui::library_flow::Slot::Tv, added, cx); } Err(e) => self.failure(e), }, @@ -978,8 +978,8 @@ impl DirectorApp { .as_ref() .map_or("Not linked", |i| i.label.as_str()) ), - crate::ui::CAPTION, - crate::ui::SECONDARY, + crate::gui::ui::CAPTION, + crate::gui::ui::SECONDARY, ), line( format!( @@ -988,60 +988,60 @@ impl DirectorApp { .as_ref() .map_or("Not linked", |d| d.name.as_str()) ), - crate::ui::CAPTION, - crate::ui::SECONDARY, + crate::gui::ui::CAPTION, + crate::gui::ui::SECONDARY, ), line( format!( "Audio: {}", tv.audio.as_ref().map_or("Not linked", |a| a.name.as_str()) ), - crate::ui::CAPTION, - crate::ui::SECONDARY, + crate::gui::ui::CAPTION, + crate::gui::ui::SECONDARY, ), )); KeyedView::new( tv.id.clone(), - crate::preset_cards_ui::card( + crate::gui::preset_cards_ui::card( &tv.name, None, View::empty(), body, vec![ - crate::preset_cards_ui::card_icon_button(Button::new()) + crate::gui::preset_cards_ui::card_icon_button(Button::new()) .automation_name(format!("Control {}", tv.name)) .is_enabled(ready) .on_click(cx.callback(move |()| { msg(TvMessage::Control( - crate::tv_controls_ui::ControlMessage::Open( + crate::gui::tv_controls_ui::ControlMessage::Open( controls.clone(), ), )) })) - .content(crate::icons::remote()) + .content(crate::gui::icons::remote()) .tooltip("TV controls"), - crate::preset_cards_ui::card_icon_button(Button::new()) + crate::gui::preset_cards_ui::card_icon_button(Button::new()) .automation_name(format!("Edit {}", tv.name)) .is_enabled(ready) .on_click(cx.callback(move |()| msg(TvMessage::Edit(edit.clone())))) - .content(crate::preset_cards_ui::card_edit_icon()) + .content(crate::gui::preset_cards_ui::card_edit_icon()) .tooltip("Edit TV"), - crate::preset_cards_ui::card_icon_button(Button::new()) + crate::gui::preset_cards_ui::card_icon_button(Button::new()) .automation_name(format!("Remove {}", tv.name)) .is_enabled(ready) .on_click( cx.callback(move |()| msg(TvMessage::Delete(delete.clone()))), ) - .content(crate::icons::delete_small()) + .content(crate::gui::icons::delete_small()) .tooltip("Remove TV"), ], - crate::preset_cards_ui::TV_CARD_HEIGHT, + crate::gui::preset_cards_ui::TV_CARD_HEIGHT, ), ) }) .collect::>(); let list = if self.tv.tvs.is_empty() { - Border::new().grid_row(1).content(crate::ui::empty_state( + Border::new().grid_row(1).content(crate::gui::ui::empty_state( if self.busy { "Loading your TVs…" } else if !self.tv.ready { @@ -1053,12 +1053,16 @@ impl DirectorApp { None, )) } else { - crate::preset_cards_ui::card_grid(1, crate::preset_cards_ui::TV_CARD_HEIGHT, cards) + crate::gui::preset_cards_ui::card_grid( + 1, + crate::gui::preset_cards_ui::TV_CARD_HEIGHT, + cards, + ) }; Grid::new() .rows([GridLength::Auto, GridLength::Star(1.0)]) .children(( - crate::ui::header( + crate::gui::ui::header( "TVs", "Paired TVs that scenes can wake and switch.", vec![ @@ -1197,7 +1201,7 @@ impl DirectorApp { fn android_pairing_view(&self, cx: &ViewContext, tv: &Tv) -> View { let waiting = self.tv.android_waiting(); StackPanel::new().spacing(16.0).children(( - TextBlock::new().text(tv.name.clone()).font_size(crate::ui::SUBTITLE), + TextBlock::new().text(tv.name.clone()).font_size(crate::gui::ui::SUBTITLE), note(if waiting{"Enter the six-character code shown on your TV. The code is used only for this pairing and is never saved or logged."}else{"Turn on the TV, then choose Pair TV. Director will ask Android TV Remote Service to show a pairing code. No Android developer settings are needed."}), if waiting{StackPanel::new().spacing(8.0).children((TextBlock::new().text("TV pairing code").font_weight(FontWeight::SEMI_BOLD),TextBox::new().automation_name("Android TV pairing code").text(self.tv.android_code.clone()).placeholder_text("e.g. A1B2C3").is_enabled(!self.busy).on_text_changed(cx.callback(|s|msg(TvMessage::AndroidCode(s)))),note("Codes expire after two minutes. Use Back, then Pair TV to request a new code.")))}else{View::empty()}, note("Only TCL Android / Google TV is supported here. Roku and Fire TV models use different control systems."), @@ -1242,9 +1246,9 @@ impl DirectorApp { )), Step::Pair if tv.brand==tvs::Brand::TclAndroid=>self.android_pairing_view(cx,tv), Step::Pair=>StackPanel::new().spacing(16.0).children(( - TextBlock::new().text(format!("{} · {}",tv.name,tv.address)).font_size(crate::ui::SUBTITLE), + TextBlock::new().text(format!("{} · {}",tv.name,tv.address)).font_size(crate::gui::ui::SUBTITLE), note(if tv.credential.is_some(){"Pairing succeeded. Director will read the TV’s inputs and network addresses. If that read failed, retry below without pairing again."}else{"Choose Pair TV, then accept the connection prompt on the TV. Director will read its inputs and available wake addresses automatically."}), - crate::ui::caption("If the TV can’t be reached, use Back to correct its IP address or connection method."), + crate::gui::ui::caption("If the TV can’t be reached, use Back to correct its IP address or connection method."), if tv.brand!=tvs::Brand::Lg{self.tv_test_report(cx,tv,false)}else{View::empty()}, )), Step::Input if tv.brand!=tvs::Brand::Lg=>self.samsung_compatibility(cx,tv), @@ -1258,17 +1262,17 @@ impl DirectorApp { TextBlock::new().text(tv.network.summary()).text_wrapping(TextWrapping::Wrap), note(s.network_warning.clone().unwrap_or_default()), self.tv_mac_field(cx,&s.manual_mac,s.manual_mac_enabled), - if tv.brand==tvs::Brand::TclAndroid{crate::ui::caption("Enable Screenless service / network standby in the TV’s power settings. Director uses the direct Wake command while reachable, with optional Wake-on-LAN fallback if a MAC is saved.")}else{View::empty()}, - crate::ui::caption("For wake to work, keep the TV on the network and turn on its network or mobile power-on setting."), + if tv.brand==tvs::Brand::TclAndroid{crate::gui::ui::caption("Enable Screenless service / network standby in the TV’s power settings. Director uses the direct Wake command while reachable, with optional Wake-on-LAN fallback if a MAC is saved.")}else{View::empty()}, + crate::gui::ui::caption("For wake to work, keep the TV on the network and turn on its network or mobile power-on setting."), )), Step::Display=>StackPanel::new().spacing(16.0).children(( note("Optionally identify which Windows monitor entry belongs to this TV."), self.tv_display_picker(cx,tv), self.tv_audio_picker(cx,tv), - crate::ui::caption("This link helps scenes coordinate. It doesn’t change your screens or tie the TV to a display preset."), + crate::gui::ui::caption("This link helps scenes coordinate. It doesn’t change your screens or tie the TV to a display preset."), )), Step::Review=>StackPanel::new().spacing(16.0).children(( - crate::ui::subtitle(tv.name.clone()), + crate::gui::ui::subtitle(tv.name.clone()), review_rows(&[ ("Address", tv.address.clone()), ("Pairing", "Complete".into()), @@ -1276,7 +1280,7 @@ impl DirectorApp { ("Windows display", tv.display.as_ref().map_or("Not linked", |d| d.name.as_str()).into()), ("Wake", if tv.brand == tvs::Brand::TclAndroid { "Direct remote; network standby required" } else if tv.network.targets().is_empty() { "Not set up" } else { "Address saved" }.into()), ]), - crate::ui::caption("Save this TV to finish. Waking it and switching inputs are chosen in each scene."), + crate::gui::ui::caption("Save this TV to finish. Waking it and switching inputs are chosen in each scene."), )), }; let pair = s.step == Step::Pair && !s.valid_step(tv); @@ -1318,17 +1322,17 @@ impl DirectorApp { || !pair || !self.tv.android_waiting() || director::tv::android_tv::code(&self.tv.android_code).is_ok()); - crate::ui::page( - crate::ui::header( + crate::gui::ui::page( + crate::gui::ui::header( s.step.title(), &format!("TV setup · Step {} of {}", s.step.number(), Step::COUNT), vec![], ), Border::new() - .max_width(crate::ui::FORM_WIDTH) + .max_width(crate::gui::ui::FORM_WIDTH) .horizontal_alignment(HorizontalAlignment::Left) .content(content), - Some(crate::ui::footer( + Some(crate::gui::ui::footer( Button::new() .horizontal_alignment(HorizontalAlignment::Left) .is_enabled(!self.busy && s.step != Step::Brand) @@ -1356,21 +1360,21 @@ impl DirectorApp { || self.tv.manual_mac.trim().is_empty() || self.tv.manual_mac.parse::().is_ok()); Grid::new().rows([GridLength::Auto,GridLength::Star(1.0),GridLength::Auto]).children(( - crate::ui::header("Edit TV","Device connections · Scene actions are configured separately.",vec![]), - ScrollViewer::new().grid_row(1).horizontal_scroll_bar_visibility(ScrollBarVisibility::Disabled).content(StackPanel::new().spacing(crate::ui::GAP_XXL).max_width(crate::ui::FORM_WIDTH).horizontal_alignment(HorizontalAlignment::Left).children(( - crate::ui::section("Connection", if changed { "Continue through setup to pair the new connection. Your saved TV stays unchanged until you finish." } else { "Pairing is kept when you change anything except the address or connection method." }, None, StackPanel::new().spacing(crate::ui::GAP_M).children(( - crate::ui::label("TV name"), + crate::gui::ui::header("Edit TV","Device connections · Scene actions are configured separately.",vec![]), + ScrollViewer::new().grid_row(1).horizontal_scroll_bar_visibility(ScrollBarVisibility::Disabled).content(StackPanel::new().spacing(crate::gui::ui::GAP_XXL).max_width(crate::gui::ui::FORM_WIDTH).horizontal_alignment(HorizontalAlignment::Left).children(( + crate::gui::ui::section("Connection", if changed { "Continue through setup to pair the new connection. Your saved TV stays unchanged until you finish." } else { "Pairing is kept when you change anything except the address or connection method." }, None, StackPanel::new().spacing(crate::gui::ui::GAP_M).children(( + crate::gui::ui::label("TV name"), TextBox::new().automation_name("TV name").text(tv.name.clone()).is_enabled(!self.busy).on_text_changed(cx.callback(|v|msg(TvMessage::Name(v)))), - crate::ui::label("IP address"), + crate::gui::ui::label("IP address"), TextBox::new().automation_name("TV IP address").text(tv.address.clone()).is_enabled(!self.busy).on_text_changed(cx.callback(|v|msg(TvMessage::Address(v)))), self.tv_connection_options(cx,tv), ))), - crate::ui::section("PC input", "The TV input this PC is connected to.", None, if tv.brand==tvs::Brand::Lg{self.tv_input_picker(cx,tv,true)}else{self.samsung_compatibility(cx,tv)}), - crate::ui::section("Wake", &if tv.network.targets().is_empty(){"No wake address saved. You can enter a MAC address below.".to_string()}else{tv.network.summary()}, None, self.tv_mac_field(cx,&self.tv.manual_mac,self.tv.manual_mac_enabled)), - crate::ui::section("Windows display", "Optional: the display and sound output this TV appears as in Windows.", None, StackPanel::new().spacing(crate::ui::GAP_M).children((self.tv_display_picker(cx,tv), self.tv_audio_picker(cx,tv)))), + crate::gui::ui::section("PC input", "The TV input this PC is connected to.", None, if tv.brand==tvs::Brand::Lg{self.tv_input_picker(cx,tv,true)}else{self.samsung_compatibility(cx,tv)}), + crate::gui::ui::section("Wake", &if tv.network.targets().is_empty(){"No wake address saved. You can enter a MAC address below.".to_string()}else{tv.network.summary()}, None, self.tv_mac_field(cx,&self.tv.manual_mac,self.tv.manual_mac_enabled)), + crate::gui::ui::section("Windows display", "Optional: the display and sound output this TV appears as in Windows.", None, StackPanel::new().spacing(crate::gui::ui::GAP_M).children((self.tv_display_picker(cx,tv), self.tv_audio_picker(cx,tv)))), ))), Grid::new().grid_row(2).columns([GridLength::Star(1.0),GridLength::Auto]).margin(Thickness::new(0.0,20.0,0.0,0.0)).children(( - TextBlock::new().grid_column(0).text("Saving only remembers your choices. Nothing changes on the TV.").opacity(crate::ui::SECONDARY).text_wrapping(TextWrapping::Wrap).vertical_alignment(VerticalAlignment::Center), + TextBlock::new().grid_column(0).text("Saving only remembers your choices. Nothing changes on the TV.").opacity(crate::gui::ui::SECONDARY).text_wrapping(TextWrapping::Wrap).vertical_alignment(VerticalAlignment::Center), StackPanel::new().grid_column(1).orientation(Orientation::Horizontal).spacing(8.0).children(( Button::new().is_enabled(!self.busy).on_click(cx.message(msg(TvMessage::Cancel))).content("Cancel"), Button::new().style(ButtonStyle::Accent).is_enabled(self.tv_ready()&&valid&&(changed||self.draft_changed(crate::Page::Tvs))).on_click(cx.message(msg(TvMessage::Save))).content(if changed{"Continue setup"}else{"Save TV"}), diff --git a/src/ui.rs b/src/gui/ui.rs similarity index 100% rename from src/ui.rs rename to src/gui/ui.rs diff --git a/src/main.rs b/src/main.rs index 3aec2d6..ae0c747 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,32 +1,12 @@ #![windows_subsystem = "windows"] -mod audio_relink_ui; -mod clipboard; -mod close_guard; -mod command_ui; -mod crash_ui; -mod current_ui; -mod display_editor_ui; -mod display_setup_ui; -mod display_ui; -mod fps_ui; -mod icons; -mod library_flow; -mod nav_guard; -mod options_ui; -#[cfg(test)] -mod preset_cards_preview; -mod preset_cards_ui; -mod samsung_ui; -mod scene_editor_ui; -mod scene_ui; -mod starter_ui; -mod status_ui; -mod tv_controls_ui; -mod tv_power_state; -mod tv_tip_ui; -mod tv_ui; -mod ui; +mod gui; use display_ui::{DisplayMessage, DisplayState}; +use gui::{ + audio_relink_ui, close_guard, command_ui, crash_ui, current_ui, display_setup_ui, display_ui, + fps_ui, library_flow, nav_guard, options_ui, scene_ui, status_ui, tv_tip_ui, tv_ui, +}; +#[cfg(test)] +use gui::{preset_cards_preview, tv_controls_ui}; #[derive(Clone, Copy, PartialEq, Eq)] enum Page { Current, @@ -164,9 +144,9 @@ impl DirectorApp { let selected = self.page == Page::Options; // The pill and the selected fill sit outside the button, which clips its content. Border::new() - .corner_radius(crate::ui::RADIUS_S) + .corner_radius(crate::gui::ui::RADIUS_S) .background(if selected { - Brush::from(crate::ui::SUBTLE_FILL) + Brush::from(crate::gui::ui::SUBTLE_FILL) } else { Brush::from(Color::transparent()) }) @@ -427,10 +407,10 @@ impl Component for DirectorApp { let status = self.status_view(cx); let body = Border::new() .padding(Thickness::new( - crate::ui::PAGE_PADDING_X, - crate::ui::PAGE_PADDING_Y, - crate::ui::PAGE_PADDING_X, - crate::ui::PAGE_PADDING_Y, + crate::gui::ui::PAGE_PADDING_X, + crate::gui::ui::PAGE_PADDING_Y, + crate::gui::ui::PAGE_PADDING_X, + crate::gui::ui::PAGE_PADDING_Y, )) .content( Grid::new() @@ -459,7 +439,7 @@ impl Component for DirectorApp { let nav = NavigationView::new() .grid_row(1) .is_pane_toggle_button_visible(false) - .open_pane_length(crate::ui::PANE_OPEN) + .open_pane_length(crate::gui::ui::PANE_OPEN) .pane_display_mode(NavigationViewPaneDisplayMode::Left) .is_pane_open(self.pane_open) .on_is_pane_open_changed(cx.callback(Message::Pane)) From f6c0e8317649f995059beef1d31e610b44770512 Mon Sep 17 00:00:00 2001 From: Zacharias Xenakis Date: Sun, 8 Nov 2026 17:32:43 +0200 Subject: [PATCH 3/4] refactor(ui): rename the Now page and editor-flow modules after the current pages --- src/gui/display_editor_ui.rs | 14 +- src/gui/display_ui.rs | 8 +- src/gui/{library_flow.rs => editor_flow.rs} | 60 ++--- src/gui/fps_ui.rs | 28 +-- src/gui/mod.rs | 4 +- src/gui/nav_guard.rs | 14 +- src/gui/{current_ui.rs => now_ui.rs} | 262 ++++++++++---------- src/gui/scene_editor_ui.rs | 2 +- src/gui/scene_ui.rs | 10 +- src/gui/tv_ui.rs | 6 +- src/main.rs | 32 +-- 11 files changed, 214 insertions(+), 226 deletions(-) rename src/gui/{library_flow.rs => editor_flow.rs} (80%) rename src/gui/{current_ui.rs => now_ui.rs} (82%) diff --git a/src/gui/display_editor_ui.rs b/src/gui/display_editor_ui.rs index 54d2d9f..3ae6c21 100644 --- a/src/gui/display_editor_ui.rs +++ b/src/gui/display_editor_ui.rs @@ -8,7 +8,7 @@ use windows_reactor::*; #[derive(Clone, Copy)] pub(crate) enum EditorTarget { Preset, - Current, + Now, } /// How many monitor cards fit side by side in a column `width` wide (at least 1, at most 3). pub(crate) fn monitor_columns(width: f64) -> usize { @@ -20,9 +20,7 @@ pub(crate) fn monitor_columns(width: f64) -> usize { fn route(target: EditorTarget, value: DisplayMessage) -> Message { match target { EditorTarget::Preset => Message::Display(value), - EditorTarget::Current => { - Message::Current(crate::gui::current_ui::CurrentMessage::Display(value)) - } + EditorTarget::Now => Message::Now(crate::gui::now_ui::NowMessage::Display(value)), } } fn msg(target: EditorTarget, index: usize, change: Change) -> Message { @@ -70,7 +68,7 @@ fn preview( ) -> View { let drag = match target { EditorTarget::Preset => app.display.drag.as_ref(), - EditorTarget::Current => app.current.display.drag.as_ref(), + EditorTarget::Now => app.now.display.drag.as_ref(), }; let (width, height) = app.map_size(); let map = drag.map_or_else( @@ -79,7 +77,7 @@ fn preview( ); let selected = match target { EditorTarget::Preset => app.display.selected, - EditorTarget::Current => app.current.display.selected, + EditorTarget::Now => app.now.display.selected, }; let cards = layout .monitors @@ -298,7 +296,7 @@ impl DirectorApp { }; let selected = match target { EditorTarget::Preset => self.display.selected, - EditorTarget::Current => self.current.display.selected, + EditorTarget::Now => self.now.display.selected, }; let cards = (0..layout.monitors.len()) .map(|i| { @@ -371,7 +369,7 @@ impl DirectorApp { ) -> MonitorParts { let revision = match target { EditorTarget::Preset => self.display.orientation_revision, - EditorTarget::Current => self.current.display.orientation_revision, + EditorTarget::Now => self.now.display.orientation_revision, }; let m = &layout.monitors[i]; let options = director::display::display_mirroring::common_options(editor, layout, i); diff --git a/src/gui/display_ui.rs b/src/gui/display_ui.rs index f58469d..be59586 100644 --- a/src/gui/display_ui.rs +++ b/src/gui/display_ui.rs @@ -277,7 +277,7 @@ impl DirectorApp { self.status = notice; self.announce(cx); } - self.library_resume(cx); + self.flow_resume(cx); } DisplayMessage::Create if self.display_ready() && self.display.draft.is_none() => { self.begin("Reading monitors and supported display modes…"); @@ -499,7 +499,7 @@ impl DirectorApp { self.error = false; self.status = "Ready.".into(); self.details.clear(); - self.library_cancelled(crate::gui::library_flow::Slot::Display, cx); + self.flow_cancelled(crate::gui::editor_flow::Slot::Display, cx); } DisplayMessage::Save if self.display_ready() && self.display.drag.is_none() => { if let Some(mut preset) = self.display.draft.clone() { @@ -523,7 +523,7 @@ impl DirectorApp { DisplayMessage::Saved(result) => match result { Ok(p) => { self.end(); - let added = crate::gui::library_flow::added_id( + let added = crate::gui::editor_flow::added_id( self.display.presets.iter().map(|p| p.id.as_str()), p.iter().map(|p| p.id.as_str()), ); @@ -535,7 +535,7 @@ impl DirectorApp { self.status = "Display presets saved. Your screens are unchanged.".into(); self.guard_saved(true, cx); self.announce(cx); - self.library_saved(crate::gui::library_flow::Slot::Display, added, cx); + self.flow_saved(crate::gui::editor_flow::Slot::Display, added, cx); } Err(e) => self.failure(e), }, diff --git a/src/gui/library_flow.rs b/src/gui/editor_flow.rs similarity index 80% rename from src/gui/library_flow.rs rename to src/gui/editor_flow.rs index d7a3c3e..66074fb 100644 --- a/src/gui/library_flow.rs +++ b/src/gui/editor_flow.rs @@ -1,8 +1,8 @@ -//! Cross-page flows between Now, Scenes and the Library. +//! Cross-page flows between Now, Scenes and the Displays and TVs editors. //! //! Now can seed a new display preset from what it has staged, and the scene editor can create a //! display preset or TV in place and get back to the scene with it selected. Every flow ends in -//! the normal Library editor, so saving still only saves. +//! the normal Displays or TVs editor, so saving still only saves. use crate::{ DirectorApp, Message, Page, gui::display_ui::DisplayMessage, gui::scene_ui::SceneMessage, work, }; @@ -16,7 +16,7 @@ pub(crate) enum Slot { } #[derive(Clone)] -pub(crate) enum LibraryMessage { +pub(crate) enum EditorFlowMessage { /// Open a new display preset, seeded from a staged layout when one is given. NewDisplay(Option), NewTv, @@ -27,7 +27,7 @@ pub(crate) enum LibraryMessage { } #[derive(Default)] -pub(crate) struct LibraryFlow { +pub(crate) struct EditorFlow { /// A new display preset to open once the Displays page has loaded. display_seed: Option>, /// A new scene draft to open once Scenes has loaded. @@ -38,7 +38,7 @@ pub(crate) struct LibraryFlow { scene_select: Option<(Slot, String)>, } -impl LibraryFlow { +impl EditorFlow { /// A user-initiated page change abandons any pending return to the scene. pub(crate) fn navigated(&mut self) { self.scene_return = None; @@ -46,23 +46,23 @@ impl LibraryFlow { } impl DirectorApp { - fn library_go(&mut self, tag: &str, cx: &ComponentContext) { + fn flow_go(&mut self, tag: &str, cx: &ComponentContext) { let before = self.page; self.navigate_now(Some(tag.into()), cx); // Entering a page reloads it (sometimes via a queued message) and its load handler // resumes the flow. Staying on the same page reloads nothing, so resume now. if self.page == before { - self.library_resume(cx); + self.flow_resume(cx); } } - pub(crate) fn update_library(&mut self, m: LibraryMessage, cx: &ComponentContext) { + pub(crate) fn update_editor_flow(&mut self, m: EditorFlowMessage, cx: &ComponentContext) { if self.busy { return; } match m { - LibraryMessage::NewDisplay(seed) => { + EditorFlowMessage::NewDisplay(seed) => { if self.display.draft.is_some() { - self.library_go("displays", cx); + self.flow_go("displays", cx); self.warn( "Finish or cancel the display preset you’re editing first.", "", @@ -70,34 +70,34 @@ impl DirectorApp { return; } self.flow.display_seed = Some(seed); - self.library_go("displays", cx); + self.flow_go("displays", cx); } - LibraryMessage::NewTv => { + EditorFlowMessage::NewTv => { if self.tv.draft.is_some() { - self.library_go("tvs", cx); + self.flow_go("tvs", cx); self.warn("Finish or cancel the TV you’re setting up first.", ""); return; } self.tv.add_after_load = true; - self.library_go("tvs", cx); + self.flow_go("tvs", cx); } - LibraryMessage::NewScene(scene) => { + EditorFlowMessage::NewScene(scene) => { if self.scene.draft.is_some() { - self.library_go("scenes", cx); + self.flow_go("scenes", cx); self.warn("Finish or cancel the scene you’re editing first.", ""); return; } self.flow.scene_seed = Some(*scene); - self.library_go("scenes", cx); + self.flow_go("scenes", cx); } - LibraryMessage::FromScene(slot) => { + EditorFlowMessage::FromScene(slot) => { if self.scene.draft.is_none() { return; } - self.update_library( + self.update_editor_flow( match slot { - Slot::Display => LibraryMessage::NewDisplay(None), - Slot::Tv => LibraryMessage::NewTv, + Slot::Display => EditorFlowMessage::NewDisplay(None), + Slot::Tv => EditorFlowMessage::NewTv, }, cx, ); @@ -106,8 +106,8 @@ impl DirectorApp { } } } - /// Opens a pending new preset once its Library page has finished loading. - pub(crate) fn library_resume(&mut self, cx: &ComponentContext) { + /// Opens a pending new preset once its Displays page has finished loading. + pub(crate) fn flow_resume(&mut self, cx: &ComponentContext) { // Keep a pending seed until its page has finished loading; a load may still be queued. if self.page == Page::Displays && self.display_ready() @@ -141,8 +141,8 @@ impl DirectorApp { self.status = "Name this scene to save the sound set in Now.".into(); } } - /// Call after a Library save succeeds, with the item it added (if any). - pub(crate) fn library_saved( + /// Call after a Displays or TVs save succeeds, with the item it added (if any). + pub(crate) fn flow_saved( &mut self, slot: Slot, new_id: Option, @@ -153,17 +153,17 @@ impl DirectorApp { { self.flow.scene_return = None; self.flow.scene_select = Some((slot, id)); - self.library_go("scenes", cx); + self.flow_go("scenes", cx); } } - pub(crate) fn library_cancelled(&mut self, slot: Slot, cx: &ComponentContext) { + pub(crate) fn flow_cancelled(&mut self, slot: Slot, cx: &ComponentContext) { if self.flow.scene_return == Some(slot) { self.flow.scene_return = None; - self.library_go("scenes", cx); + self.flow_go("scenes", cx); } } /// Selects a just-created item in the scene draft after the scene catalog reloads. - pub(crate) fn library_select_in_scene(&mut self, cx: &ComponentContext) { + pub(crate) fn flow_select_in_scene(&mut self, cx: &ComponentContext) { let Some((slot, id)) = self.flow.scene_select.take() else { return; }; @@ -209,7 +209,7 @@ mod tests { } #[test] fn navigating_clears_a_pending_scene_return() { - let mut flow = LibraryFlow { + let mut flow = EditorFlow { scene_return: Some(Slot::Tv), ..Default::default() }; diff --git a/src/gui/fps_ui.rs b/src/gui/fps_ui.rs index ca1fd12..9e7ca79 100644 --- a/src/gui/fps_ui.rs +++ b/src/gui/fps_ui.rs @@ -7,7 +7,7 @@ use windows_reactor::*; #[derive(Clone, Copy, PartialEq, Eq)] pub(crate) enum Target { Scene, - Current, + Now, } #[derive(Clone)] pub(crate) enum FpsMessage { @@ -72,18 +72,18 @@ impl DirectorApp { fn fps_request(&self, target: Target) -> Option<&Request> { match target { Target::Scene => self.scene.draft.as_ref().and_then(|d| d.fps.as_ref()), - Target::Current => self.fps.live.as_ref(), + Target::Now => self.fps.live.as_ref(), } } fn fps_request_mut(&mut self, target: Target) -> Option<&mut Request> { match target { Target::Scene => self.scene.draft.as_mut().and_then(|d| d.fps.as_mut()), - Target::Current => self.fps.live.as_mut(), + Target::Now => self.fps.live.as_mut(), } } fn fps_edited(&mut self, target: Target) { - if target == Target::Current { - self.current.fps_dirty = self.fps.live.is_some(); + if target == Target::Now { + self.now.fps_dirty = self.fps.live.is_some(); } } pub(crate) fn update_fps(&mut self, m: FpsMessage, cx: &ComponentContext) { @@ -137,7 +137,7 @@ impl DirectorApp { FpsMessage::Enable(target, on) if !self.busy => { let request = if on { self.fps_default() } else { None }; match target { - Target::Current => self.fps.live = request, + Target::Now => self.fps.live = request, Target::Scene => { if let Some(d) = &mut self.scene.draft { d.fps = request @@ -224,7 +224,7 @@ impl DirectorApp { }) } } - self.current.fps_dirty = false; + self.now.fps_dirty = false; self.status = "Fixture FPS applied. No real settings changed.".into(); self.announce(cx); return; @@ -254,7 +254,7 @@ impl DirectorApp { self.fps.caps = caps; match result { Ok(text) => { - self.current.fps_dirty = false; + self.now.fps_dirty = false; self.status = "FPS configuration applied.".into(); self.details = text; self.error = false; @@ -281,7 +281,7 @@ impl DirectorApp { .flatten(); scene .or_else(|| { - self.current + self.now .display .draft .as_ref() @@ -296,7 +296,7 @@ impl DirectorApp { } /// Now's staged FPS change can be applied: it's valid and its method is available. pub(crate) fn live_fps_ready(&self) -> bool { - self.current.fps_dirty + self.now.fps_dirty && self.fps.live.as_ref().is_some_and(|r| { r.validate().is_ok() && self @@ -337,7 +337,7 @@ impl DirectorApp { }) .unwrap_or_else(|| { // On Now with nothing staged, say what every method has set right now. - if target != Target::Current { + if target != Target::Now { return String::new(); } let set = self @@ -384,12 +384,12 @@ impl DirectorApp { .spacing(2.0) .vertical_alignment(VerticalAlignment::Center) .children(( - ui::label(if target == Target::Current { + ui::label(if target == Target::Now { "FPS limit" } else { "Change FPS limit" }), - ui::caption(if target == Target::Current && self.current.fps_dirty { + ui::caption(if target == Target::Now && self.now.fps_dirty { "Not applied yet: use Apply changes on the display map.".into() } else if on { current @@ -544,7 +544,7 @@ impl DirectorApp { let content = StackPanel::new() .spacing(ui::GAP_M) .children((header, status, check, body)); - if target == Target::Current { + if target == Target::Now { ui::card(content) } else { content diff --git a/src/gui/mod.rs b/src/gui/mod.rs index 17e91cb..95ee7e6 100644 --- a/src/gui/mod.rs +++ b/src/gui/mod.rs @@ -4,14 +4,14 @@ pub(crate) mod clipboard; pub(crate) mod close_guard; pub(crate) mod command_ui; pub(crate) mod crash_ui; -pub(crate) mod current_ui; pub(crate) mod display_editor_ui; pub(crate) mod display_setup_ui; pub(crate) mod display_ui; +pub(crate) mod editor_flow; pub(crate) mod fps_ui; pub(crate) mod icons; -pub(crate) mod library_flow; pub(crate) mod nav_guard; +pub(crate) mod now_ui; pub(crate) mod options_ui; #[cfg(test)] pub(crate) mod preset_cards_preview; diff --git a/src/gui/nav_guard.rs b/src/gui/nav_guard.rs index dc41e93..dbc78ce 100644 --- a/src/gui/nav_guard.rs +++ b/src/gui/nav_guard.rs @@ -43,7 +43,7 @@ fn changed(base: &Option, draft: Option<&T>) -> bool { fn page_name(page: Page) -> &'static str { match page { - Page::Current => "Now", + Page::Now => "Now", Page::Displays => "this display preset", Page::Tvs => "this TV", Page::Scenes => "this scene", @@ -85,7 +85,7 @@ impl DirectorApp { Page::Scenes => self.scene.draft.as_ref().is_some_and(|d| { !self.scene.scenes.iter().any(|s| s.id == d.id) || g.scene.as_ref() != Some(d) }), - Page::Current | Page::Options => false, + Page::Now | Page::Options => false, } } fn unsaved(&self) -> bool { @@ -94,7 +94,7 @@ impl DirectorApp { Page::Displays => changed(&g.display, self.display.draft.as_ref()), Page::Tvs => changed(&g.tv, self.tv.draft.as_ref()), Page::Scenes => changed(&g.scene, self.scene.draft.as_ref()), - Page::Current => self.current.dirty(), + Page::Now => self.now.dirty(), Page::Options => false, } } @@ -124,7 +124,7 @@ impl DirectorApp { }) } // Now applies changes rather than saving them. - Page::Current | Page::Options => false, + Page::Now | Page::Options => false, } } fn draft_name(&self) -> Option { @@ -182,7 +182,7 @@ impl DirectorApp { Page::Displays => Message::Display(DisplayMessage::Cancel), Page::Tvs => Message::Tv(crate::gui::tv_ui::TvMessage::Cancel), Page::Scenes => Message::Scene(crate::gui::scene_ui::SceneMessage::Cancel), - _ => Message::Current(crate::gui::current_ui::CurrentMessage::Load), + _ => Message::Now(crate::gui::now_ui::NowMessage::Load), }; ::update(self, discard, cx); // Discarding Now rereads Windows in the background; navigate right away. @@ -224,10 +224,10 @@ impl DirectorApp { let can_save = self.can_save(); let title = match self.draft_name() { Some(name) => format!("Save changes to “{name}”?"), - None if self.page == Page::Current => "Discard your Now edits?".into(), + None if self.page == Page::Now => "Discard your Now edits?".into(), None => "Save your changes?".into(), }; - let body = if self.page == Page::Current { + let body = if self.page == Page::Now { "You changed settings in Now without applying them. Discard them, or keep editing and apply them first.".to_string() } else if can_save { format!( diff --git a/src/gui/current_ui.rs b/src/gui/now_ui.rs similarity index 82% rename from src/gui/current_ui.rs rename to src/gui/now_ui.rs index 6909fcd..7ef6dbd 100644 --- a/src/gui/current_ui.rs +++ b/src/gui/now_ui.rs @@ -42,7 +42,7 @@ pub(crate) enum SoundChange { ToggleMute { input: bool }, } #[derive(Clone)] -pub(crate) enum CurrentMessage { +pub(crate) enum NowMessage { Load, Loaded(Displays, Devices), Display(DisplayMessage), @@ -75,7 +75,7 @@ pub(crate) enum CurrentMessage { SaveAudio, } #[derive(Default)] -pub(crate) struct CurrentState { +pub(crate) struct NowState { pub display: DisplayState, baseline: Option, outputs: Vec, @@ -103,7 +103,7 @@ pub(crate) struct CurrentState { /// Apply the staged FPS limit once the display change running now succeeds. fps_after_displays: bool, } -impl CurrentState { +impl NowState { pub fn dirty(&self) -> bool { self.fps_dirty || self.display_dirty() } @@ -203,8 +203,8 @@ impl CurrentState { .map(f64::from); } } -fn msg(value: CurrentMessage) -> Message { - Message::Current(value) +fn msg(value: NowMessage) -> Message { + Message::Now(value) } fn read_displays() -> Displays { let layout = windows_displays::capture()?; @@ -223,10 +223,10 @@ impl DirectorApp { target: Option, cx: &ComponentContext, ) { - if !self.guard_ready || self.current.sound_pending { + if !self.guard_ready || self.now.sound_pending { return; } - let state = &mut self.current; + let state = &mut self.now; state.sound_pending = true; state.tokens_at_start = (state.volume_token, state.mic_token); crate::gui::close_guard::set_busy(true); @@ -253,7 +253,7 @@ impl DirectorApp { } } })(); - msg(CurrentMessage::SoundDone(result, devices())) + msg(NowMessage::SoundDone(result, devices())) }); } pub(crate) fn load_current(&mut self, cx: &ComponentContext) { @@ -263,35 +263,33 @@ impl DirectorApp { #[cfg(test)] if crate::gui::preset_cards_preview::ENABLED.load(std::sync::atomic::Ordering::Acquire) { self.fps = crate::gui::fps_ui::FpsState::fixture(); - self.current.fps_dirty = false; + self.now.fps_dirty = false; return; } self.fps.live = None; - self.current.fps_dirty = false; + self.now.fps_dirty = false; self.update_fps(crate::gui::fps_ui::FpsMessage::Discover, cx); self.begin("Reading your current setup…"); - work(cx, || { - msg(CurrentMessage::Loaded(read_displays(), devices())) - }); + work(cx, || msg(NowMessage::Loaded(read_displays(), devices()))); } - pub(crate) fn update_current(&mut self, event: CurrentMessage, cx: &ComponentContext) { + pub(crate) fn update_now(&mut self, event: NowMessage, cx: &ComponentContext) { match event { - CurrentMessage::Load if !self.busy => self.load_current(cx), - CurrentMessage::Loaded(displays, audio) => { + NowMessage::Load if !self.busy => self.load_current(cx), + NowMessage::Loaded(displays, audio) => { self.end(); let mut errors = vec![]; match displays { - Ok((layout, options)) => self.current.set_displays(layout, options), + Ok((layout, options)) => self.now.set_displays(layout, options), Err(e) => { - self.current.display = DisplayState::default(); - self.current.baseline = None; + self.now.display = DisplayState::default(); + self.now.baseline = None; errors.push(e); } } match audio { - Ok((outputs, inputs)) => self.current.set_devices(outputs, inputs), + Ok((outputs, inputs)) => self.now.set_devices(outputs, inputs), Err(e) => { - self.current.set_devices(vec![], vec![]); + self.now.set_devices(vec![], vec![]); errors.push(e); } } @@ -304,18 +302,16 @@ impl DirectorApp { .into(); self.details = errors.join("\n"); } - CurrentMessage::Display(DisplayMessage::CaptureLost) - if !self.busy && self.current.display.drag.is_some() => + NowMessage::Display(DisplayMessage::CaptureLost) + if !self.busy && self.now.display.drag.is_some() => { - let token = self.current.display.drag_token; + let token = self.now.display.drag_token; work(cx, move || { std::thread::sleep(std::time::Duration::from_millis(25)); - msg(CurrentMessage::Display(DisplayMessage::CancelLostDrag( - token, - ))) + msg(NowMessage::Display(DisplayMessage::CancelLostDrag(token))) }); } - CurrentMessage::Display(event) if !self.busy => { + NowMessage::Display(event) if !self.busy => { // These editor messages are synchronous and perform no persistence // or device operations. Reuse the exact preset gesture/change logic. if matches!( @@ -328,19 +324,19 @@ impl DirectorApp { | DisplayMessage::CancelLostDrag(..) | DisplayMessage::Noop ) { - std::mem::swap(&mut self.display, &mut self.current.display); + std::mem::swap(&mut self.display, &mut self.now.display); self.update_display(event, cx); - std::mem::swap(&mut self.display, &mut self.current.display); - if !self.error && self.current.display_dirty() { + std::mem::swap(&mut self.display, &mut self.now.display); + if !self.error && self.now.display_dirty() { self.status = "Display changes ready to apply.".into(); } } } - CurrentMessage::ApplyDisplays - if !self.busy && self.guard_ready && self.current.display.drag.is_none() => + NowMessage::ApplyDisplays + if !self.busy && self.guard_ready && self.now.display.drag.is_none() => { if let (Some(draft), Some(editor)) = - (&self.current.display.draft, &self.current.display.editor) + (&self.now.display.draft, &self.now.display.editor) { if let Err(e) = editor.validate(&draft.layout) { self.failure(e); @@ -361,7 +357,7 @@ impl DirectorApp { details: vec![e], }, }; - msg(CurrentMessage::DisplaysApplied( + msg(NowMessage::DisplaysApplied( report, read_displays(), devices(), @@ -369,29 +365,29 @@ impl DirectorApp { }); } } - CurrentMessage::ApplyAll - if !self.busy && self.guard_ready && self.current.display.drag.is_none() => + NowMessage::ApplyAll + if !self.busy && self.guard_ready && self.now.display.drag.is_none() => { - if self.current.display_dirty() { - self.current.fps_after_displays = self.current.fps_dirty; - self.update_current(CurrentMessage::ApplyDisplays, cx); - } else if self.current.fps_dirty { + if self.now.display_dirty() { + self.now.fps_after_displays = self.now.fps_dirty; + self.update_now(NowMessage::ApplyDisplays, cx); + } else if self.now.fps_dirty { self.update_fps(crate::gui::fps_ui::FpsMessage::Apply, cx); } } - CurrentMessage::DisplaysApplied(report, actual, audio) => { + NowMessage::DisplaysApplied(report, actual, audio) => { self.end(); - let then_fps = std::mem::take(&mut self.current.fps_after_displays); + let then_fps = std::mem::take(&mut self.now.fps_after_displays); let succeeded = report.succeeded(); self.error = !succeeded; self.status = report.message; self.details = report.details.join("\n"); self.announce(cx); match actual { - Ok((layout, options)) => self.current.set_displays(layout, options), + Ok((layout, options)) => self.now.set_displays(layout, options), Err(e) => { - self.current.display = DisplayState::default(); - self.current.baseline = None; + self.now.display = DisplayState::default(); + self.now.baseline = None; self.error = true; self.details.push_str(&format!( " @@ -400,7 +396,7 @@ Could not read the resulting display state: {e}" } } match audio { - Ok((outputs, inputs)) => self.current.set_devices(outputs, inputs), + Ok((outputs, inputs)) => self.now.set_devices(outputs, inputs), Err(e) => self.details.push_str(&format!( " Could not read audio outputs: {e}" @@ -411,13 +407,13 @@ Could not read audio outputs: {e}" self.update_fps(crate::gui::fps_ui::FpsMessage::Apply, cx); } } - CurrentMessage::Device(input, Some(index)) if !self.busy => { - if let Some(device) = self.current.shown(input).get(index) - && self.current.default_device(input).map(|d| &d.id) != Some(&device.id) + NowMessage::Device(input, Some(index)) if !self.busy => { + if let Some(device) = self.now.shown(input).get(index) + && self.now.default_device(input).map(|d| &d.id) != Some(&device.id) { let id = device.id.clone(); // With a separate calls device, the main output leaves calls alone. - let roles = if !input && self.current.calls_separate() { + let roles = if !input && self.now.calls_separate() { Roles::Media } else { Roles::All @@ -425,15 +421,15 @@ Could not read audio outputs: {e}" self.sound_change(SoundChange::Use { input, roles }, Some(id), cx); } } - CurrentMessage::SplitCalls(on) if !self.busy && !self.current.sound_pending => { + NowMessage::SplitCalls(on) if !self.busy && !self.now.sound_pending => { // Re-renders report the switch's current state; only act on a real change. - if on == self.current.calls_separate() { + if on == self.now.calls_separate() { return; } - self.current.calls_split = on; + self.now.calls_split = on; if !on - && let Some(main) = self.current.default_device(false) - && self.current.calls_device().map(|c| &c.id) != Some(&main.id) + && let Some(main) = self.now.default_device(false) + && self.now.calls_device().map(|c| &c.id) != Some(&main.id) { let id = main.id.clone(); self.sound_change( @@ -446,9 +442,9 @@ Could not read audio outputs: {e}" ); } } - CurrentMessage::CallsDevice(Some(index)) if !self.busy => { - if let Some(device) = self.current.shown(false).get(index) - && self.current.calls_device().map(|d| &d.id) != Some(&device.id) + NowMessage::CallsDevice(Some(index)) if !self.busy => { + if let Some(device) = self.now.shown(false).get(index) + && self.now.calls_device().map(|d| &d.id) != Some(&device.id) { let id = device.id.clone(); self.sound_change( @@ -461,8 +457,8 @@ Could not read audio outputs: {e}" ); } } - CurrentMessage::Volume(input, value) if !self.busy && value.is_finite() => { - let state = &mut self.current; + NowMessage::Volume(input, value) if !self.busy && value.is_finite() => { + let state = &mut self.now; let (slider, token) = if input { (&mut state.mic_volume, &mut state.mic_token) } else { @@ -478,11 +474,11 @@ Could not read audio outputs: {e}" let token = *token; work(cx, move || { std::thread::sleep(SETTLE); - msg(CurrentMessage::VolumeSettled(input, token)) + msg(NowMessage::VolumeSettled(input, token)) }); } - CurrentMessage::VolumeSettled(input, token) => { - let state = &self.current; + NowMessage::VolumeSettled(input, token) => { + let state = &self.now; let (latest, value) = if input { (state.mic_token, state.mic_volume) } else { @@ -495,7 +491,7 @@ Could not read audio outputs: {e}" // Try again once the running change has finished. work(cx, move || { std::thread::sleep(SETTLE); - msg(CurrentMessage::VolumeSettled(input, token)) + msg(NowMessage::VolumeSettled(input, token)) }); return; } @@ -504,11 +500,11 @@ Could not read audio outputs: {e}" self.sound_change(SoundChange::Volume { input, percent }, None, cx); } } - CurrentMessage::ToggleMute(input) if !self.busy && !self.current.sound_pending => { + NowMessage::ToggleMute(input) if !self.busy && !self.now.sound_pending => { self.sound_change(SoundChange::ToggleMute { input }, None, cx); } - CurrentMessage::SoundDone(result, devices) => { - self.current.sound_pending = false; + NowMessage::SoundDone(result, devices) => { + self.now.sound_pending = false; crate::gui::close_guard::set_busy(false); match &result { Ok(message) => { @@ -524,9 +520,9 @@ Could not read audio outputs: {e}" } if let Ok((outputs, inputs)) = devices { // Keep a slider that moved again while this change ran where it is. - let (volume, mic) = (self.current.volume, self.current.mic_volume); - self.current.set_devices(outputs, inputs); - let state = &mut self.current; + let (volume, mic) = (self.now.volume, self.now.mic_volume); + self.now.set_devices(outputs, inputs); + let state = &mut self.now; let (output_at_start, mic_at_start) = state.tokens_at_start; if state.volume_token != output_at_start { state.volume = volume.or(state.volume); @@ -536,35 +532,35 @@ Could not read audio outputs: {e}" } } } - CurrentMessage::SaveDisplays + NowMessage::SaveDisplays if !self.busy - && self.current.display.drag.is_none() - && self.current.display.draft.is_some() => + && self.now.display.drag.is_none() + && self.now.display.draft.is_some() => { - self.current.save_name = Some(String::new()); - self.current.save_error = None; - self.current.save_revision += 1; + self.now.save_name = Some(String::new()); + self.now.save_error = None; + self.now.save_revision += 1; } - CurrentMessage::SaveName(name) => { - if let Some(current) = &mut self.current.save_name { + NowMessage::SaveName(name) => { + if let Some(current) = &mut self.now.save_name { *current = name; } } - CurrentMessage::SaveClosed(result) => { - let Some(name) = self.current.save_name.clone() else { + NowMessage::SaveClosed(result) => { + let Some(name) = self.now.save_name.clone() else { return; }; let name = name.trim().to_string(); if result != ContentDialogResult::Primary { - self.current.save_name = None; - self.current.save_error = None; + self.now.save_name = None; + self.now.save_error = None; return; } // Seed from the staged layout so unapplied edits are saved too. let (Some(draft), Some(editor)) = - (&self.current.display.draft, &self.current.display.editor) + (&self.now.display.draft, &self.now.display.editor) else { - self.current.save_name = None; + self.now.save_name = None; return; }; let error = if name.is_empty() { @@ -576,15 +572,15 @@ Could not read audio outputs: {e}" }; if let Some(e) = error { // Reopen the dialog with the reason and the name kept. - self.current.save_name = Some(name); - self.current.save_error = Some(e); - self.current.save_revision += 1; + self.now.save_name = Some(name); + self.now.save_error = Some(e); + self.now.save_revision += 1; return; } let layout = draft.layout.clone(); self.begin("Saving display preset…"); work(cx, move || { - msg(CurrentMessage::DisplaysSaved((|| { + msg(NowMessage::DisplaysSaved((|| { let _lock = OperationLock::acquire()?; let path = director::display::displays::path()?; let existing = director::display::displays::load(&path)?; @@ -606,12 +602,12 @@ Could not read audio outputs: {e}" })())) }); } - CurrentMessage::DisplaysSaved(result) => { + NowMessage::DisplaysSaved(result) => { self.end(); match result { Ok(name) => { - self.current.save_name = None; - self.current.save_error = None; + self.now.save_name = None; + self.now.save_error = None; self.error = false; self.details.clear(); // Show it among the presets; Now keeps its staged edits. The list's @@ -621,20 +617,20 @@ Could not read audio outputs: {e}" self.navigate_now(Some("displays".into()), cx); } Err(e) => { - self.current.save_error = Some(e); - self.current.save_revision += 1; + self.now.save_error = Some(e); + self.now.save_revision += 1; } } } - CurrentMessage::SaveAudio if !self.busy => { - let Some(output) = self.current.default_device(false) else { + NowMessage::SaveAudio if !self.busy => { + let Some(output) = self.now.default_device(false) else { return; }; let mut scene = director::scene::scenes::Scene::new(crate::gui::scene_ui::new_id(), ""); - scene.sound = Some(self.current.sound_now(output)); - self.update_library( - crate::gui::library_flow::LibraryMessage::NewScene(Box::new(scene)), + scene.sound = Some(self.now.sound_now(output)); + self.update_editor_flow( + crate::gui::editor_flow::EditorFlowMessage::NewScene(Box::new(scene)), cx, ); } @@ -643,7 +639,7 @@ Could not read audio outputs: {e}" } /// The optional separate calls output: a switch, and its picker while on. fn calls_row(&self, cx: &ViewContext) -> View { - let state = &self.current; + let state = &self.now; let available = !self.busy && !state.sound_pending && self.guard_ready; let on = state.calls_separate(); let devices = state.shown(false); @@ -659,7 +655,7 @@ Could not read audio outputs: {e}" .vertical_alignment(VerticalAlignment::Bottom) .is_on(on) .is_enabled(available && state.default_device(false).is_some()) - .on_toggled(cx.callback(|v| msg(CurrentMessage::SplitCalls(v)))) + .on_toggled(cx.callback(|v| msg(NowMessage::SplitCalls(v)))) .slot(ToggleSwitchSlot::Header, "Different device for calls"), ComboBox::new() .grid_column(1) @@ -670,13 +666,13 @@ Could not read audio outputs: {e}" .selected_index(current.and_then(|c| devices.iter().position(|o| o.id == c.id))) .placeholder_text("Same as the output above") .is_enabled(available && on) - .on_selection_changed(cx.callback(|i| msg(CurrentMessage::CallsDevice(i)))) + .on_selection_changed(cx.callback(|i| msg(NowMessage::CallsDevice(i)))) .slot(ComboBoxSlot::Header, "Calls output"), )) } /// The output (false) or microphone (true): device picker, mute button and volume slider. fn sound_row(&self, cx: &ViewContext, input: bool) -> View { - let state = &self.current; + let state = &self.now; let current = state.default_device(input); let available = !self.busy && !state.sound_pending && self.guard_ready; let muted = current.and_then(|d| d.muted) == Some(true); @@ -705,7 +701,7 @@ Could not read audio outputs: {e}" .is_enabled(available) .on_selection_changed(cx.callback(move |i: Option| { // The index is into the connected devices shown, not the full list. - msg(CurrentMessage::Device(input, i)) + msg(NowMessage::Device(input, i)) })) .slot( ComboBoxSlot::Header, @@ -725,7 +721,7 @@ Could not read audio outputs: {e}" if muted { "Unmute" } else { "Mute" } )) .is_enabled(available && current.is_some_and(|c| c.muted.is_some())) - .on_click(cx.message(msg(CurrentMessage::ToggleMute(input)))) + .on_click(cx.message(msg(NowMessage::ToggleMute(input)))) .content( StackPanel::new() .orientation(Orientation::Horizontal) @@ -758,7 +754,7 @@ Could not read audio outputs: {e}" .is_enabled(!self.busy && self.guard_ready && volume.is_some()) .vertical_alignment(VerticalAlignment::Center) .on_value_changed( - cx.callback(move |v: f64| msg(CurrentMessage::Volume(input, v))), + cx.callback(move |v: f64| msg(NowMessage::Volume(input, v))), ), TextBlock::new() .grid_column(2) @@ -770,49 +766,43 @@ Could not read audio outputs: {e}" } /// What Apply changes would apply, for its tooltip. fn staged_summary(&self) -> &'static str { - match (self.current.display_dirty(), self.current.fps_dirty) { + match (self.now.display_dirty(), self.now.fps_dirty) { (true, true) => "Apply the display and FPS limit changes", (true, false) => "Apply the display changes", (false, true) => "Apply the FPS limit change", (false, false) => "Change a display or the FPS limit first", } } - pub(crate) fn current_view(&self, cx: &ViewContext) -> View { + pub(crate) fn now_view(&self, cx: &ViewContext) -> View { use crate::gui::ui; - let dragging = self.current.display.drag.is_some(); - let dirty = self.current.dirty(); + let dragging = self.now.display.drag.is_some(); + let dirty = self.now.dirty(); let can_apply = !self.busy && self.guard_ready && !dragging - && (self.current.display_dirty() || self.current.fps_dirty) - && (!self.current.fps_dirty || self.live_fps_ready()); + && (self.now.display_dirty() || self.now.fps_dirty) + && (!self.now.fps_dirty || self.live_fps_ready()); // Apply and Discard sit in the map's bottom-right corner, as in Windows Settings. // Apply also applies a staged FPS limit, which says so in its card. let map_actions = vec![ Button::new() .automation_name("Discard current setup edits") .is_enabled(!self.busy && dirty) - .on_click(cx.message(msg(CurrentMessage::Load))) + .on_click(cx.message(msg(NowMessage::Load))) .content("Discard") .tooltip("Drop staged changes and read the current Windows setup again"), Button::new() .style(ButtonStyle::Accent) .automation_name("Apply current changes") .is_enabled(can_apply) - .on_click(cx.message(msg(CurrentMessage::ApplyAll))) + .on_click(cx.message(msg(NowMessage::ApplyAll))) .content("Apply changes") .tooltip(self.staged_summary()), ]; let displays = if let (Some(draft), Some(editor)) = - (&self.current.display.draft, &self.current.display.editor) + (&self.now.display.draft, &self.now.display.editor) { - self.monitor_editor_with( - &draft.layout, - editor, - cx, - EditorTarget::Current, - map_actions, - ) + self.monitor_editor_with(&draft.layout, editor, cx, EditorTarget::Now, map_actions) } else if self.busy { ui::loading("Reading your displays…") } else { @@ -825,8 +815,8 @@ Could not read audio outputs: {e}" Button::new() .style(ButtonStyle::Subtle) .automation_name("Save these displays as a preset") - .is_enabled(!self.busy && !dragging && self.current.display.draft.is_some()) - .on_click(cx.message(msg(CurrentMessage::SaveDisplays))) + .is_enabled(!self.busy && !dragging && self.now.display.draft.is_some()) + .on_click(cx.message(msg(NowMessage::SaveDisplays))) .content("Save as display preset…") .tooltip("Open a new display preset with this layout, including edits you haven’t applied"), ), @@ -842,8 +832,8 @@ Could not read audio outputs: {e}" Button::new() .style(ButtonStyle::Subtle) .automation_name("Save this sound as a scene") - .is_enabled(!self.busy && self.current.default_device(false).is_some()) - .on_click(cx.message(msg(CurrentMessage::SaveAudio))) + .is_enabled(!self.busy && self.now.default_device(false).is_some()) + .on_click(cx.message(msg(NowMessage::SaveAudio))) .content("Save as scene…") .tooltip("Open a new scene whose Sound step uses this output and volume"), ), @@ -858,7 +848,7 @@ Could not read audio outputs: {e}" let fps = ui::column( ui::FORM_WIDTH, 0.0, - (self.fps_controls(cx, crate::gui::fps_ui::Target::Current),), + (self.fps_controls(cx, crate::gui::fps_ui::Target::Now),), ); // No page title: the sidebar already says Now, and the sections explain themselves. ui::page( @@ -878,7 +868,7 @@ Could not read audio outputs: {e}" impl DirectorApp { /// Now's save-as-preset dialog: just a name. No tooltips inside dialogs. pub(crate) fn current_dialog(&self, cx: &ViewContext) -> View { - let Some(name) = &self.current.save_name else { + let Some(name) = &self.now.save_name else { return View::empty(); }; let dialog = ContentDialog::new() @@ -887,19 +877,19 @@ impl DirectorApp { .primary_button_text("Save") .close_button_text("Cancel") .is_primary_button_enabled(!self.busy && !name.trim().is_empty()) - .on_closed(cx.callback(|result| msg(CurrentMessage::SaveClosed(result)))) + .on_closed(cx.callback(|result| msg(NowMessage::SaveClosed(result)))) .content( StackPanel::new().spacing(crate::gui::ui::GAP_M).width(360.0).children(( TextBox::new() .automation_name("Display preset name") .text(name.clone()) .placeholder_text("For example, Desk monitors") - .on_text_changed(cx.callback(|v| msg(CurrentMessage::SaveName(v)))) + .on_text_changed(cx.callback(|v| msg(NowMessage::SaveName(v)))) .slot(TextBoxSlot::Header, "Name"), crate::gui::ui::caption( "Saves the layout shown here, including changes you haven’t applied. Your screens don’t change.", ), - match &self.current.save_error { + match &self.now.save_error { Some(e) => TextBlock::new() .text(e.clone()) .foreground(crate::gui::ui::critical()) @@ -910,7 +900,7 @@ impl DirectorApp { )), ); Grid::new().keyed_children([KeyedView::new( - format!("save-dialog-{}", self.current.save_revision), + format!("save-dialog-{}", self.now.save_revision), dialog, )]) } @@ -965,7 +955,7 @@ mod tests { #[test] fn live_edits_keep_an_independent_baseline_and_reset_without_presets() { let original = layout(); - let mut state = CurrentState::default(); + let mut state = NowState::default(); state.set_displays( original.clone(), vec![Options { @@ -994,7 +984,7 @@ mod tests { } #[test] fn save_as_scene_keeps_the_output_and_microphone_as_shown() { - let mut state = CurrentState::default(); + let mut state = NowState::default(); let mut speakers = output("speakers", true); speakers.muted = Some(false); let mut mic = output("mic", true); @@ -1018,7 +1008,7 @@ mod tests { } #[test] fn a_separate_calls_device_is_detected_and_saved_with_the_scene() { - let mut state = CurrentState::default(); + let mut state = NowState::default(); let mut desk = output("desk", true); desk.communications = true; state.set_devices(vec![desk, output("headset", false)], vec![]); @@ -1049,7 +1039,7 @@ mod tests { } #[test] fn sliders_follow_the_default_devices_and_pickers_hide_disconnected_ones() { - let mut state = CurrentState::default(); + let mut state = NowState::default(); let mut gone = output("gone", false); gone.active = false; let mut mic = output("mic", true); diff --git a/src/gui/scene_editor_ui.rs b/src/gui/scene_editor_ui.rs index 4a8fa33..9a601ed 100644 --- a/src/gui/scene_editor_ui.rs +++ b/src/gui/scene_editor_ui.rs @@ -1316,7 +1316,7 @@ mod tests { ( "save as display preset dialog", region( - include_str!("current_ui.rs"), + include_str!("now_ui.rs"), "pub(crate) fn current_dialog", "#[cfg(test)]", ), diff --git a/src/gui/scene_ui.rs b/src/gui/scene_ui.rs index 8c437ff..251ce9c 100644 --- a/src/gui/scene_ui.rs +++ b/src/gui/scene_ui.rs @@ -326,9 +326,9 @@ impl DirectorApp { self.update_fps(crate::gui::fps_ui::FpsMessage::Discover, cx); } let ready = self.scene_ready(); - // The last item of each section's dropdown creates a new Library item in place. + // The last item of each section's dropdown creates a new display preset or TV in place. if ready && self.scene.draft.is_some() { - use crate::gui::library_flow::{LibraryMessage, Slot}; + use crate::gui::editor_flow::{EditorFlowMessage, Slot}; let create = match &m { SceneMessage::Display(Some(i)) if *i == self.scene.displays.len() + 1 => { Some(Slot::Display) @@ -337,7 +337,7 @@ impl DirectorApp { _ => None, }; if let Some(slot) = create { - self.update_library(LibraryMessage::FromScene(slot), cx); + self.update_editor_flow(EditorFlowMessage::FromScene(slot), cx); return; } } @@ -373,8 +373,8 @@ impl DirectorApp { self.scene.ready = true; self.scene.active = director::scene::scene_session::active(); self.status = "Ready.".into(); - self.library_select_in_scene(cx); - self.library_resume(cx); + self.flow_select_in_scene(cx); + self.flow_resume(cx); self.starter_loaded(cx); } Err(e) => { diff --git a/src/gui/tv_ui.rs b/src/gui/tv_ui.rs index 220233d..02bd473 100644 --- a/src/gui/tv_ui.rs +++ b/src/gui/tv_ui.rs @@ -523,7 +523,7 @@ impl DirectorApp { ); self.flow.navigated(); } else { - self.library_cancelled(crate::gui::library_flow::Slot::Tv, cx); + self.flow_cancelled(crate::gui::editor_flow::Slot::Tv, cx); } } TvMessage::Name(v) if !self.busy => { @@ -868,7 +868,7 @@ impl DirectorApp { TvMessage::Saved(result) => match result { Ok(tvs) => { self.end(); - let added = crate::gui::library_flow::added_id( + let added = crate::gui::editor_flow::added_id( self.tv.tvs.iter().map(|t| t.id.as_str()), tvs.iter().map(|t| t.id.as_str()), ); @@ -881,7 +881,7 @@ impl DirectorApp { self.status = "TVs saved.".into(); self.guard_saved(true, cx); self.announce(cx); - self.library_saved(crate::gui::library_flow::Slot::Tv, added, cx); + self.flow_saved(crate::gui::editor_flow::Slot::Tv, added, cx); } Err(e) => self.failure(e), }, diff --git a/src/main.rs b/src/main.rs index ae0c747..ed3f201 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,14 +2,14 @@ mod gui; use display_ui::{DisplayMessage, DisplayState}; use gui::{ - audio_relink_ui, close_guard, command_ui, crash_ui, current_ui, display_setup_ui, display_ui, - fps_ui, library_flow, nav_guard, options_ui, scene_ui, status_ui, tv_tip_ui, tv_ui, + audio_relink_ui, close_guard, command_ui, crash_ui, display_setup_ui, display_ui, editor_flow, + fps_ui, nav_guard, now_ui, options_ui, scene_ui, status_ui, tv_tip_ui, tv_ui, }; #[cfg(test)] use gui::{preset_cards_preview, tv_controls_ui}; #[derive(Clone, Copy, PartialEq, Eq)] enum Page { - Current, + Now, Displays, Tvs, Options, @@ -28,7 +28,7 @@ enum Message { Command(command_ui::CommandMessage), Crash(crash_ui::CrashMessage), Display(DisplayMessage), - Current(current_ui::CurrentMessage), + Now(now_ui::NowMessage), Fps(fps_ui::FpsMessage), Tv(tv_ui::TvMessage), Scene(scene_ui::SceneMessage), @@ -45,12 +45,12 @@ enum Message { struct DirectorApp { window_width: f64, page: Page, - current: current_ui::CurrentState, + now: now_ui::NowState, fps: fps_ui::FpsState, display: DisplayState, tv: tv_ui::TvState, scene: scene_ui::SceneState, - flow: library_flow::LibraryFlow, + flow: editor_flow::EditorFlow, nav: nav_guard::NavGuard, /// The scene or preset whose shortcut command is shown. command: Option, @@ -118,7 +118,7 @@ impl DirectorApp { self.details.clear(); if next == Page::Scenes { self.update_scene(scene_ui::SceneMessage::Load, context); - } else if next == Page::Current && !self.current.dirty() { + } else if next == Page::Now && !self.now.dirty() { self.load_current(context); } else if next == Page::Displays && self.display.draft.is_none() { self.update_display(DisplayMessage::Refresh, context); @@ -199,7 +199,7 @@ impl DirectorApp { /// The page a navigation tag names. fn page_for(tag: &str) -> Option { Some(match tag { - "current" => Page::Current, + "current" => Page::Now, "displays" => Page::Displays, "tvs" => Page::Tvs, "options" => Page::Options, @@ -220,7 +220,7 @@ impl Component for DirectorApp { id.clone(), )))); } else { - // Scenes is the start page; Library pages reload themselves on entry. + // Scenes is the start page; Displays and TVs reload themselves on entry. let _ = context .sender() .send(Message::Scene(scene_ui::SceneMessage::Load)); @@ -232,12 +232,12 @@ impl Component for DirectorApp { } else { Page::Scenes }, - current: current_ui::CurrentState::default(), + now: now_ui::NowState::default(), fps: fps_ui::FpsState::default(), display: DisplayState::default(), tv: tv_ui::TvState::default(), scene: scene_ui::SceneState::default(), - flow: library_flow::LibraryFlow::default(), + flow: editor_flow::EditorFlow::default(), nav: nav_guard::NavGuard::default(), command: None, crash: director::crash::pending(), @@ -307,7 +307,7 @@ impl Component for DirectorApp { } Message::Display(message) => self.update_display(message, context), Message::Fps(message) => self.update_fps(message, context), - Message::Current(message) => self.update_current(message, context), + Message::Now(message) => self.update_now(message, context), Message::Scene(message) => self.update_scene(message, context), Message::Status(message) => self.update_status(message), Message::Tv(message) => self.update_tv(message, context), @@ -382,8 +382,8 @@ impl Component for DirectorApp { None }, ); - let content = if self.page == Page::Current { - self.current_view(cx) + let content = if self.page == Page::Now { + self.now_view(cx) } else if self.page == Page::Displays { self.display_view(cx) } else if self.page == Page::Tvs { @@ -396,7 +396,7 @@ impl Component for DirectorApp { // Keep each page's native scroll/focus tree separate; drafts remain in state. let content = Grid::new().keyed_children([KeyedView::new( match self.page { - Page::Current => "current-page", + Page::Now => "current-page", Page::Displays => "display-page", Page::Tvs => "tv-page", Page::Options => "options-page", @@ -456,7 +456,7 @@ impl Component for DirectorApp { ), KeyedView::new( "current", - self.nav_item(Page::Current, "current", "Now", "\u{e9e9}"), + self.nav_item(Page::Now, "current", "Now", "\u{e9e9}"), ), KeyedView::new( "displays", From a42c22fffa7a0e0c4812d02700fd9aa73b79ffdd Mon Sep 17 00:00:00 2001 From: Zacharias Xenakis Date: Sun, 8 Nov 2026 17:34:00 +0200 Subject: [PATCH 4/4] docs: describe the new source folders --- CONTRIBUTING.md | 4 ++-- docs/ARCHITECTURE.md | 29 ++++++++++++++++------------- docs/DESIGN.md | 4 ++-- docs/DEVELOPMENT.md | 6 +++--- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5932612..c51918c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -38,9 +38,9 @@ Some things can't be tested in CI: applying layouts, switching audio, and talkin ### Conventions -- Use the shared UI vocabulary in `src/ui.rs` (type ramp, spacing, theme brushes, page, section and card builders) instead of raw sizes and colours. +- Use the shared UI vocabulary in `src/gui/ui.rs` (type ramp, spacing, theme brushes, page, section and card builders) instead of raw sizes and colours. - Don't put tooltips inside a `ContentDialog`: the pinned Reactor closes the window. See [docs/DEVELOPMENT.md](docs/DEVELOPMENT.md#winui-rules-worth-knowing). -- Device and settings changes take `windows_audio::OperationLock`, run off the UI thread, verify by reading back, and restore what they changed on failure. +- Device and settings changes take `audio::windows_audio::OperationLock`, run off the UI thread, verify by reading back, and restore what they changed on failure. - Talk to Windows and TVs directly rather than through helper programs. New dependencies need a reason, and their licenses must be accepted in `packaging/about.toml`; regenerate `THIRD_PARTY_LICENSES.md` when they change. By contributing, you agree that your contribution is licensed under the [MIT License](LICENSE). diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 3db5274..d194b10 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -7,32 +7,35 @@ Director is one Rust executable, `director.exe`. Started without arguments it op | Part | Where | What it holds | | --- | --- | --- | | Library crate `director` | `src/lib.rs` | Domain models, persistence, the scene and device engines, Windows and TV backends, the CLI | -| Binary | `src/main.rs` and `src/*_ui.rs` | The `DirectorApp` WinUI component (through `windows-reactor` 0.100), pages and dialogs | +| Binary | `src/main.rs` and `src/gui/` | The `DirectorApp` WinUI component (through `windows-reactor` 0.100), its pages and dialogs, and the shared UI vocabulary in `gui/ui.rs` | | Build script | `build.rs`, `packaging/windows_icon.rs` | Renders `assets/director.svg` into the embedded icon and `director.ico`, embeds `packaging/director.manifest`, stages SVG assets beside the executable | -| Installer | `installer/`, `scripts/package-msi.ps1` | WiX MSI plus a `setup.exe` bundle that installs the Windows App Runtime when missing; see [Windows GUI](INSTALL.md) | +| Installer | `installer/`, `scripts/package-msi.ps1` | WiX MSI plus a `setup.exe` bundle that installs the Windows App Runtime when missing; see [Development](DEVELOPMENT.md#installer) | ## Integration policy Director talks to Windows and to TVs directly: Win32 and WinRT APIs, Core Audio, the display-configuration (CCD) API, NVIDIA's driver interface, the RTSS shared interface, and each TV's local network protocol. It does not shell out to helper tools such as NirCmd, display-switching utilities or TV CLIs. Launching apps and opening URIs are user-chosen scene actions, not implementation shortcuts. -## Domain modules +## Library modules -| Area | Modules | Notes | +Each folder groups one area; Windows-specific code sits in the `windows_*` module beside the platform-neutral model it implements. + +| Folder | Modules | Notes | | --- | --- | --- | -| Scenes | `scenes`, `scene_session`, `starter`, `windows_scenes` | A scene references a display preset and a TV by ID and holds its own Sound, FPS and action steps. `windows_scenes` runs the ordered transaction: Before → TV → Displays → Sound → FPS → After, with When leaving steps and an optional Return scene. See [Scenes](SCENES.md). | -| Displays | `displays`, `display_apply`, `display_editor`, `display_capabilities`, `display_detection`, `display_mirroring`, `windows_displays`, `windows_display_apply`, `windows_display_modes`, `windows_display_detection`, `windows_hdr` | Capture and apply layouts through CCD with strict readback and an exact restore. `windows_hdr` defines the HDR requests missing from the `windows` bindings. See [Displays](DISPLAYS.md). | -| Sound | `audio`, `audio_control`, `audio_devices`, `windows_audio` | `audio::apply` is the multi-step transaction a scene's Sound step uses; `audio_control` makes one live change at a time for Now and `director audio`. Both sit on one `AudioBackend` (default roles, volume, mute). `audio_devices` remembers endpoints seen before. See [Sound](SOUND.md). | -| TVs | `tvs`, `tv_setup`, `tv_control`, `tv_network`, `tv_input_guard`, `tv_report`, `windows_tv` | Saved TV definitions, the setup guide's state, a brand-neutral control trait, Wake-on-LAN, input protection and compatibility reports. `windows_tv` dispatches by brand. See [TVs](TVS.md). | -| TV brands | `lg_protocol` + `windows_lg`, `samsung` + `windows_samsung`, `android_tv` + `windows_android_tv` | LG webOS and Samsung Tizen over WinHTTP WebSockets; Android TV Remote v2 over in-process TLS (`rustls`) with a per-TV client certificate. | -| FPS | `fps`, `windows_fps` | Global NVIDIA or RTSS frame-rate limit with snapshot, readback and restore. See [FPS](FPS.md). | -| CLI | `cli`, `cli_list`, `cli_name`, `audio_cli`, `display_cli`, `tv_cli` | Argument parsing and output. CLI names are derived from item names, never stored. | -| App services | `storage`, `preferences`, `backup`, `diagnostics`, `crash`, `notifications`, `windows_close` | Settings files, preferences, backup and restore, logs, crash reports, Windows notifications and close protection. See [Diagnostics](TROUBLESHOOTING.md). | +| `src/scene/` | `scenes`, `scene_session`, `starter`, `windows_scenes` | A scene references a display preset and a TV by ID and holds its own Sound, FPS and action steps. `windows_scenes` runs the ordered transaction: Before → TV → Displays → Sound → FPS → After, with When leaving steps and an optional Return scene. See [Scenes](SCENES.md). | +| `src/display/` | `displays`, `display_apply`, `display_editor`, `display_capabilities`, `display_detection`, `display_mirroring`, `display_cli`, `windows_displays`, `windows_display_apply`, `windows_display_modes`, `windows_display_detection`, `windows_hdr` | Capture and apply layouts through CCD with strict readback and an exact restore. `windows_hdr` defines the HDR requests missing from the `windows` bindings. See [Displays](DISPLAYS.md). | +| `src/audio/` | `mod.rs` (`audio::apply`), `audio_control`, `audio_devices`, `audio_cli`, `windows_audio` | `audio::apply` is the multi-step transaction a scene's Sound step uses; `audio_control` makes one live change at a time for Now and `director audio`. Both sit on one `AudioBackend` (default roles, volume, mute). `audio_devices` remembers endpoints seen before. `windows_audio` also holds the cross-process `OperationLock`. See [Sound](SOUND.md). | +| `src/tv/` | `tvs`, `tv_setup`, `tv_control`, `tv_network`, `tv_input_guard`, `tv_report`, `tv_cli`, `windows_tv`, and per brand `lg_protocol` + `windows_lg`, `samsung` + `windows_samsung`, `android_tv` + `windows_android_tv` | Saved TV definitions, the setup guide's state, a brand-neutral control trait, Wake-on-LAN, input protection and compatibility reports. `windows_tv` dispatches by brand. LG and Samsung run over WinHTTP WebSockets; Android TV Remote v2 over in-process TLS (`rustls`) with a per-TV client certificate. See [TVs](TVS.md). | +| `src/fps/` | `mod.rs`, `windows_fps` | Global NVIDIA or RTSS frame-rate limit with snapshot, readback and restore. See [FPS](FPS.md). | +| `src/cli/` | `mod.rs`, `cli_list`, `cli_name` | Argument parsing, `director list` and CLI names, which are derived from item names and never stored. Each area's commands live in its folder (`audio_cli`, `display_cli`, `tv_cli`). | +| `src/` | `storage`, `preferences`, `backup`, `diagnostics`, `crash`, `notifications`, `windows_close` | Settings files, preferences, backup and restore, logs, crash reports, Windows notifications and close protection. See [Troubleshooting](TROUBLESHOOTING.md). | + +The window lives in `src/gui/`: one module per page or dialog (`scene_ui`, `scene_editor_ui`, `now_ui`, `display_ui`, `tv_ui`, `options_ui` and others), `editor_flow` for the jumps between pages, and `ui` for the shared layout and theme helpers. ## Threading and locking WinUI owns the UI thread. Device, network and file work runs in background jobs started with `work(cx, closure)`; each returns plain Rust data as a `Message` to the component's update loop. COM objects never cross threads, and UI callbacks never block, sleep or wait on a worker. -Every device change and every settings write holds `windows_audio::OperationLock`, a named mutex shared by all Director processes, so the window and a CLI scene can't change devices at the same time. While work is pending, a window subclass (`close_guard`) defers normal closing. Native calls can't be cancelled safely, so cancellation is cooperative and recovery from a forced kill is not attempted. +Every device change and every settings write holds `audio::windows_audio::OperationLock`, a named mutex shared by all Director processes, so the window and a CLI scene can't change devices at the same time. While work is pending, a window subclass (`close_guard`) defers normal closing. Native calls can't be cancelled safely, so cancellation is cooperative and recovery from a forced kill is not attempted. ## Transactions and recovery diff --git a/docs/DESIGN.md b/docs/DESIGN.md index ef4db8a..b56e586 100644 --- a/docs/DESIGN.md +++ b/docs/DESIGN.md @@ -4,7 +4,7 @@ Director uses genuine WinUI 3 controls through Microsoft Windows Reactor and fol ## Design system -Every page is built from `src/ui.rs`, so pages line up and follow the theme: +Every page is built from `src/gui/ui.rs`, so pages line up and follow the theme: - **Type ramp** (Fluent): caption 12, body 14, label 14 semibold, section subtitle 20 semibold, page title 28 semibold. Secondary text uses one opacity (0.72). - **Spacing** 8/12/16/32 and **radii** 4 (inner panels, controls) and 8 (cards). Page padding and pane widths are constants that width calculations reuse. @@ -35,7 +35,7 @@ Scene cards show the scene's main change at the top: the layout miniature when i The scene editor is a vertical flow of fixed-size step cards in run order (Before, Prepare TV, Displays, Sound, FPS limit, After) joined by small arrows, with When leaving and Return set apart below. A card shows an icon, the title and a one-line summary, with a pencil and a bin. The card opens the step's controls in a dialog: Done keeps the changes and Cancel restores the step. Nothing in the flow expands, and the column has a fixed width (720 DIP, less in a narrow window), so the overview never changes size. Empty steps are dashed outlines of the same size with a hint and an Add button. Failure policy and the device wait live in Options, not in the scene. See [Scenes](SCENES.md). -**No tooltips in dialogs.** The pinned Reactor rejects tooltips inside a ContentDialog and closes the window. Controls in dialogs get an automation name instead, and `scene_editor_ui::tests::dialog_content_has_no_tooltips` guards the step dialogs and the shared helpers they use. +**No tooltips in dialogs.** The pinned Reactor rejects tooltips inside a ContentDialog and closes the window. Controls in dialogs get an automation name instead, and `gui::scene_editor_ui::tests::dialog_content_has_no_tooltips` guards the step dialogs and the shared helpers they use. ## Now diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md index ece39e2..fbc6e2a 100644 --- a/docs/DEVELOPMENT.md +++ b/docs/DEVELOPMENT.md @@ -72,14 +72,14 @@ Back up that folder before running the app against your real settings for testin - **Unit tests** use fake backends for audio, displays, FPS and scenes, and cover no-op detection, partial failure and recovery, stale writes, and corrupt or unknown-version files. - **TV transport tests** run against loopback WebSocket and TLS servers in the test process, plus DPAPI tampering checks. They never contact a real TV, so they don't prove compatibility with a particular model. - **Wake-on-LAN tests** send magic packets only to a loopback receiver. -- **Ignored tests** (`cargo test -- --ignored `) open preview fixtures with in-memory data for visual checks: `preset_cards_preview::cards_fixture`, `fps_ui::fps_fixture`, `tv_ui::native_preview::guide_fixture` and `tv_controls_ui::native_preview::controls_fixture`. They save nothing and contact no device. Some write their state to `target\preview\` for inspection. Production builds have no fixture entry point. -- `windows_samsung::samsung_tls_fixture` needs a hand-started local TLS server and is meant for manual runs only. +- **Ignored tests** (`cargo test -- --ignored `) open preview fixtures with in-memory data for visual checks: `gui::preset_cards_preview::cards_fixture`, `gui::fps_ui::fps_fixture`, `gui::tv_ui::native_preview::guide_fixture` and `gui::tv_controls_ui::native_preview::controls_fixture`. They save nothing and contact no device. Some write their state to `target\preview\` for inspection. Production builds have no fixture entry point. +- `tv::windows_samsung::samsung_tls_fixture` needs a hand-started local TLS server and is meant for manual runs only. Real hardware checks (applying layouts, switching audio, waking a TV) can't run in CI. Run them by hand, and keep them separate from what automated tests prove. ## WinUI rules worth knowing -- **No tooltips inside a ContentDialog.** The pinned Reactor rejects them with `StructureUnsupported` and closes the window. Give controls in dialogs an automation name instead. `scene_editor_ui::tests::dialog_content_has_no_tooltips` scans the step dialogs, the FPS controls, the relink button, the crash dialog, the command dialog and a checked list of shared helpers; extend it when a dialog hosts something new. Dialogs use `layout_preview_in_dialog` for the same reason. +- **No tooltips inside a ContentDialog.** The pinned Reactor rejects them with `StructureUnsupported` and closes the window. Give controls in dialogs an automation name instead. `gui::scene_editor_ui::tests::dialog_content_has_no_tooltips` scans the step dialogs, the FPS controls, the relink button, the crash dialog, the command dialog and a checked list of shared helpers; extend it when a dialog hosts something new. Dialogs use `layout_preview_in_dialog` for the same reason. - WinUI controls fire change events when re-rendered with a new value (sliders, combo boxes). Guard handlers so a re-render isn't treated as an edit. - UI automation: query an open ComboBox's own descendants with a name/type condition rather than walking the whole window; an unrestricted `FindAll` against an open dropdown can stall the provider. - For screenshots, bring the window to the front and let a frame render first. An occluded window can capture blank.