diff --git a/apps/lightcraft/src/main.rs b/apps/lightcraft/src/main.rs --- a/apps/lightcraft/src/main.rs +++ b/apps/lightcraft/src/main.rs @@ -130,6 +130,21 @@ fn window_files(in_memory: bool) -> window_gpu::Files { window_gpu::Files::new(config_dir().filter(|_| !in_memory && std::env::var_os("LIGHTCRAFT_NO_PREFS").is_none())) } +/// Import files passed on the command line once the library is open. The app's saved startup view +/// is already sanitized before this runs; preserve an explicit Detail choice and keep the grid +/// behavior for Grid and Last. +fn start_launch_files(app: &mut LightcraftApp, files: Vec) { + if files.is_empty() { + return; + } + if let Err(e) = lightcraft_ui_egui::import::start_paths(app, files) { + log::warn!("import at launch: {e}"); + } + if app.ui.settings.startup_view != lightcraft_ui_egui::state::StartupView::Detail { + app.ui.view = lightcraft_ui_egui::state::ViewMode::PhotoGrid; + } +} + /// Written while the GPU compute device is created, removed once that returned /// (`lightcraft_gpu::backend::set_init_marker`). Not with `LIGHTCRAFT_NO_PREFS` (tests, scripts). fn gpu_marker_path() -> Option { @@ -1061,10 +1076,7 @@ fn main() -> eframe::Result { // listed and read on the import worker once the window shows (issue #374: never // here, before the first frame, where a large folder kept the window from // appearing) - if let Err(e) = lightcraft_ui_egui::import::start_paths(&mut app, files) { - log::warn!("import at launch: {e}"); - } - app.ui.view = lightcraft_ui_egui::state::ViewMode::PhotoGrid; + start_launch_files(&mut app, files); } // native menu bar generated from the command registry (macOS; elsewhere the menus are // drawn in the window's top bar). LIGHTCRAFT_NO_NATIVE_MENU=1 keeps the in-window menus. @@ -1176,6 +1188,126 @@ mod tests { d } + fn startup_headless( + tag: &str, + startup_view: lightcraft_ui_egui::state::StartupView, + seed_demo: bool, + ) -> (std::path::PathBuf, lightcraft_ui_egui::headless::Headless) { + let root = dir(tag); + let mut session = Session::new().with_fs(); + session.open_library(root.join("library"), seed_demo).unwrap(); + let mut app = LightcraftApp::new(session, Services::default()); + let mut ui = UiState::default(); + ui.settings.startup_view = startup_view; + app.ui = ui.sanitized(); + (root, lightcraft_ui_egui::headless::Headless::new(app, [1000.0, 700.0], 1.0)) + } + + fn startup_png(path: &std::path::Path, seed: u8) -> Vec { + let image = lightcraft_raster::Rgba8 { width: 8, height: 8, data: vec![[seed, 40, 90, 255]; 64] }; + let bytes = lightcraft_codecs::encode_png(&lightcraft_codecs::EncodeImage::rgba8(&image), &lightcraft_codecs::EncodeMeta::default()).unwrap(); + std::fs::write(path, &bytes).unwrap(); + bytes + } + + fn start_launch_photo(h: &mut lightcraft_ui_egui::headless::Headless, path: &std::path::Path) { + start_launch_files(&mut h.app, vec![path.to_string_lossy().into_owned()]); + assert!(h.settle(std::time::Duration::from_secs(30)), "launch import did not settle"); + assert!(h.app.import.is_none(), "launch import completed"); + } + + fn assert_launch_photo(h: &lightcraft_ui_egui::headless::Headless, name: &str) -> u64 { + let id = h.app.session.selection.active.expect("launch import selects a photo"); + let photo = h.app.session.catalog.photo(id).expect("selected photo is in the catalog"); + assert_eq!(photo.file_name, name); + id.0 + } + + #[test] + fn startup_view_detail_with_new_file() { + use lightcraft_ui_egui::state::{StartupView, ViewMode}; + let (root, mut h) = startup_headless("startup-detail-new", StartupView::Detail, false); + let file = root.join("new.png"); + let original = startup_png(&file, 25); + + start_launch_photo(&mut h, &file); + + assert_eq!(h.app.ui.view, ViewMode::Detail); + assert_eq!(h.app.session.catalog.photos().count(), 1); + assert_launch_photo(&h, "new.png"); + assert_eq!(std::fs::read(&file).unwrap(), original); + drop(h); + let _ = std::fs::remove_dir_all(root); + } + + #[test] + fn startup_view_detail_with_existing_file() { + use lightcraft_ui_egui::state::{StartupView, ViewMode}; + let (root, mut h) = startup_headless("startup-detail-existing", StartupView::Grid, false); + let file = root.join("existing.png"); + let original = startup_png(&file, 75); + start_launch_photo(&mut h, &file); + let original_id = assert_launch_photo(&h, "existing.png"); + + let mut ui = h.app.ui.clone(); + ui.settings.startup_view = StartupView::Detail; + h.app.ui = ui.sanitized(); + start_launch_photo(&mut h, &file); + + assert_eq!(h.app.ui.view, ViewMode::Detail); + assert_eq!(h.app.session.catalog.photos().count(), 1, "an existing launch argument is not duplicated"); + assert_eq!(assert_launch_photo(&h, "existing.png"), original_id); + assert_eq!(std::fs::read(&file).unwrap(), original); + drop(h); + let _ = std::fs::remove_dir_all(root); + } + + #[test] + fn startup_view_grid_with_file() { + use lightcraft_ui_egui::state::{StartupView, ViewMode}; + let (root, mut h) = startup_headless("startup-grid-file", StartupView::Grid, false); + let file = root.join("grid.png"); + let original = startup_png(&file, 120); + + start_launch_photo(&mut h, &file); + + assert_eq!(h.app.ui.view, ViewMode::PhotoGrid); + assert_eq!(h.app.session.catalog.photos().count(), 1); + assert_launch_photo(&h, "grid.png"); + assert_eq!(std::fs::read(&file).unwrap(), original); + drop(h); + let _ = std::fs::remove_dir_all(root); + } + + #[test] + fn startup_view_without_files_preserves_preferences() { + use lightcraft_ui_egui::state::{StartupView, ViewMode}; + let (root, mut h) = startup_headless("startup-no-files", StartupView::Detail, true); + assert!(h.app.session.catalog.photos().count() > 0, "the launch library is populated"); + start_launch_files(&mut h.app, Vec::new()); + assert!(h.app.import.is_none()); + assert_eq!(h.app.ui.view, ViewMode::Detail); + drop(h); + let _ = std::fs::remove_dir_all(root); + } + + #[test] + fn startup_view_last_with_files_preserves_current_policy() { + use lightcraft_ui_egui::state::{StartupView, ViewMode}; + let (root, mut h) = startup_headless("startup-last-file", StartupView::Last, false); + let file = root.join("last.png"); + let original = startup_png(&file, 170); + + start_launch_photo(&mut h, &file); + + assert_eq!(h.app.ui.view, ViewMode::PhotoGrid); + assert_eq!(h.app.session.catalog.photos().count(), 1); + assert_launch_photo(&h, "last.png"); + assert_eq!(std::fs::read(&file).unwrap(), original); + drop(h); + let _ = std::fs::remove_dir_all(root); + } + /// Issue #374: launch arguments that would walk a whole drive or home folder are reported, /// not imported; empty ones are ignored; the rest are imported as absolute paths. #[test] diff --git a/apps/lightcraft/src/native_menu.rs b/apps/lightcraft/src/native_menu.rs --- a/apps/lightcraft/src/native_menu.rs +++ b/apps/lightcraft/src/native_menu.rs @@ -489,9 +489,7 @@ impl NativeMenu { // events never reach `shortcuts::handle`, so this is the one guard for AppKit's // accelerators and clicks: while the blocking library window or a quit/settings notice // owns input, a queued command is dropped (Quit stays for the existing confirmation). - let (cmd, params) = if key == QUIT { - (key, serde_json::json!({})) - } else if key == "app.about" || key == SETTINGS { + let (cmd, params) = if key == QUIT || key == "app.about" || key == SETTINGS { (key, serde_json::json!({})) } else if let Some(it) = self.items.get(&key) { (it.cmd.clone(), it.params.clone()) diff --git a/crates/ui-egui/src/panels/compare.rs b/crates/ui-egui/src/panels/compare.rs --- a/crates/ui-egui/src/panels/compare.rs +++ b/crates/ui-egui/src/panels/compare.rs @@ -601,7 +601,7 @@ pub fn show_reference(app: &mut LightcraftApp, ui: &mut egui::Ui) { let canvas = area_and_filmstrip(app, ui); let reference = app.ui.reference.map(PhotoId).filter(|r| live(app, *r)); let (Some(r), Some(active)) = (reference, app.session.active()) else { - super::empty_message(ui, canvas, "No reference photo", "Right-click a photo ▸ Set as Reference Photo, then View → Reference View (Shift+R)"); + super::empty_message(ui, canvas, "No reference photo", "Right-click a photo → Set as Reference Photo, then View → Reference View (Shift+R)"); return; }; let area = canvas.shrink(18.0); diff --git a/docs/gaps.md b/docs/gaps.md --- a/docs/gaps.md +++ b/docs/gaps.md @@ -1,6 +1,6 @@ # Gaps: where LightCraft falls short of Lightroom -> **Last reviewed:** 2026-10-11 · **Last updated:** 2026-10-24 · **Change:** minor (gap 30: the Info panel shows the selected photos' shared metadata and marks mixed fields; gap 28: ⌘⌥⇧C / ⌘⌥⇧V copy and paste metadata; gap 13: before a Lightroom catalog import the app asks merge or new library, #2672; gap 28: F8 shows / hides the right panel; import review album hierarchy, #2362; gap 20: Minolta MRW decodes; gap 10: 551 models verified; gap 15: Print Page Options — page numbers, page info, crop marks; gap 28: `\` shows / hides the Filter Bar in the grids; gap 21: Indonesian interface shipped, every message but What's New; gap 27: the Windows x64 installer verified on Windows 11; the Settings → Apps uninstall confirmation remains; gap 28: ⌘L Enable Filters switches the filter off and on; gap 15: Japanese photo and postcard paper sizes in the Print page setup and PDF) +> **Last reviewed:** 2026-10-11 · **Last updated:** 2026-10-26 · **Change:** patch (#3028: an image opened at launch honors an explicit Detail startup view; no ranked gap or readiness estimate changes; earlier: gap 30: the Info panel shows the selected photos' shared metadata and marks mixed fields; gap 28: ⌘⌥⇧C / ⌘⌥⇧V copy and paste metadata; gap 13: before a Lightroom catalog import the app asks merge or new library, #2672; gap 28: F8 shows / hides the right panel; import review album hierarchy, #2362; gap 20: Minolta MRW decodes; gap 10: 551 models verified; gap 15: Print Page Options — page numbers, page info, crop marks; gap 28: `\` shows / hides the Filter Bar in the grids; gap 21: Indonesian interface shipped, every message but What's New; gap 27: the Windows x64 installer verified on Windows 11; the Settings → Apps uninstall confirmation remains; gap 28: ⌘L Enable Filters switches the filter off and on; gap 15: Japanese photo and postcard paper sizes in the Print page setup and PDF) Every known shortfall, one entry each, ranked by user impact (how many Lightroom users hit it, and how hard it blocks them), then by effort. **Agents pick work from the top** (the first entry nobody is @@ -84,6 +84,7 @@ Beta-blocking gaps (B) total **~230–430 h**; with the stability and platform w | Date | Change | Summary | |---|---|---| +| 2026-10-26 | patch | #3028: command-line image launches honor an explicit Detail startup view; Grid / Last behavior, no-file launches and readiness estimates unchanged | | 2026-10-24 | minor | Gap 28: ⌘⌥⇧C / ⌘⌥⇧V (Ctrl+Alt+Shift+C / V on Windows and Linux) copy and paste metadata; no key leaves the entry; hours unchanged | | 2026-10-24 | minor | Gap 30 shrinks: the Info panel's Show Metadata For (Target Photo / Selected Photos, `view.infoSelectedPhotos`) shows the selected photos' shared values and marks fields that differ as Mixed; the All Metadata dialog remains; 1–3 h (was 4–8) | | 2026-10-23 | minor | Gap 13: before a Lightroom catalog import the app asks whether it merges into the open library or goes into a new one (opt-out in Settings, #2672); hours unchanged | diff --git a/docs/parity-checklist.md b/docs/parity-checklist.md --- a/docs/parity-checklist.md +++ b/docs/parity-checklist.md @@ -1,6 +1,6 @@ # Lightroom parity checklist -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-25 · **Change:** minor (LR-BEHAV-TITLEBAR: a double-click follows the system setting, and a panel over the bar keeps the window still; KEYC-METADATA, LRC-LIB-KEYWORDS: ⌥0 / ⌥⇧0 go to the next / previous keyword set; LRC-DEV-HISTOGRAM-DRAG: the histogram's five tonal zones — hover for the value, drag to adjust the Basic control the press locked, double-click to reset; LR-VIEW-HISTOGRAM note updated; MENU-BAR: on macOS a menu item that yields its key to a focused text field or to shortcut recording really lets it go; LR-MERGE-HDR / LR-MERGE-PANO: Lanczos-3 warps; LR-IMP-LOCAL: browsing from the sidebar records the folder; LR-VIEW-ZOOM: only a full-size drag within 20 ms clears a slow-drag verdict; LR-IMP-ADD-DIALOG: hierarchical import album destination reconciled with main, #2362; KEY-SLIDER-NUDGE: vertical wheel nudges need a click or drag in the row; leaving it disarms them; LR-EDIT-OPTICS-PROFILE: Fujifilm nine-knot lens tables read at the plain radius; LR-VIEW-ZOOM: only a full-size drag within 20 ms clears a slow-drag verdict; LRC-LIB-LIBFOLDERS, LR-BEHAV-BG-TASKS: Synchronize Folder's scan shows its folder listing and stops it on ✕; LRC-LIB-LIBFOLDERS: Synchronize Folder says a folder is up to date; LR-LIB-STACK: filmstrip stack badge click; LRC-LIB-REFVIEW / CATALOG-SWITCH: Escape preserves edits; catalog-local pins; deleted and malformed references refused; LRC-LIB-COMPARE: the Info panel labels the active photo while culling, #2398; KEYC-RATING: `\` shows / hides the Filter Bar in the grids; LR-VIEW-PHOTOGRID: the grid reads only the photos an import batch or an edit touched, not the whole list; earlier: LRC-PRINT-PAGE: Print Page Options; LR-META-XMP: fewer false unimported-XMP warnings; KEYC-METADATA: ⌘K / Ctrl+K Add Keywords; LRC-DEV-HISTOGRAM-DRAG: the histogram's five tonal zones — hover for the value, drag to adjust the Basic control the press locked, double-click to reset; LR-VIEW-HISTOGRAM note updated; MENU-BAR: on macOS a menu item that yields its key to a focused text field or to shortcut recording really lets it go; LR-MERGE-HDR / LR-MERGE-PANO: Lanczos-3 warps; LR-IMP-LOCAL: browsing from the sidebar records the folder; LR-VIEW-ZOOM: only a full-size drag within 20 ms clears a slow-drag verdict; LR-IMP-ADD-DIALOG: hierarchical import album destination reconciled with main, #2362; KEY-SLIDER-NUDGE: vertical wheel nudges need a click or drag in the row; leaving it disarms them; LR-EDIT-OPTICS-PROFILE: Fujifilm nine-knot lens tables read at the plain radius; LR-VIEW-ZOOM: only a full-size drag within 20 ms clears a slow-drag verdict; LRC-LIB-LIBFOLDERS, LR-BEHAV-BG-TASKS: Synchronize Folder's scan shows its folder listing and stops it on ✕; LRC-LIB-LIBFOLDERS: Synchronize Folder says a folder is up to date; LR-LIB-STACK: filmstrip stack badge click; LRC-LIB-REFVIEW / CATALOG-SWITCH: Escape preserves edits; catalog-local pins; deleted and malformed references refused; LRC-LIB-COMPARE: the Info panel labels the active photo while culling, #2398; KEYC-RATING: `\` shows / hides the Filter Bar in the grids; LR-VIEW-PHOTOGRID: the grid reads only the photos an import batch or an edit touched, not the whole list; earlier: LRC-PRINT-PAGE: Print Page Options; LR-META-XMP: fewer false unimported-XMP warnings) · **Target:** Adobe Lightroom Classic 15.5 / Lightroom 9.6 +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-26 · **Change:** patch (LR-PREF-GENERAL: opening an image at launch honors an explicit Detail startup view; Grid / Last launch behavior and feature counts unchanged; earlier: LR-BEHAV-TITLEBAR: a double-click follows the system setting, and a panel over the bar keeps the window still; KEYC-METADATA, LRC-LIB-KEYWORDS: ⌥0 / ⌥⇧0 go to the next / previous keyword set; LRC-DEV-HISTOGRAM-DRAG: the histogram's five tonal zones — hover for the value, drag to adjust the Basic control the press locked, double-click to reset; LR-VIEW-HISTOGRAM note updated; MENU-BAR: on macOS a menu item that yields its key to a focused text field or to shortcut recording really lets it go; LR-MERGE-HDR / LR-MERGE-PANO: Lanczos-3 warps; LR-IMP-LOCAL: browsing from the sidebar records the folder; LR-VIEW-ZOOM: only a full-size drag within 20 ms clears a slow-drag verdict; LR-IMP-ADD-DIALOG: hierarchical import album destination reconciled with main, #2362; KEY-SLIDER-NUDGE: vertical wheel nudges need a click or drag in the row; leaving it disarms them; LR-EDIT-OPTICS-PROFILE: Fujifilm nine-knot lens tables read at the plain radius; LR-VIEW-ZOOM: only a full-size drag within 20 ms clears a slow-drag verdict; LRC-LIB-LIBFOLDERS, LR-BEHAV-BG-TASKS: Synchronize Folder's scan shows its folder listing and stops it on ✕; LRC-LIB-LIBFOLDERS: Synchronize Folder says a folder is up to date; LR-LIB-STACK: filmstrip stack badge click; LRC-LIB-REFVIEW / CATALOG-SWITCH: Escape preserves edits; catalog-local pins; deleted and malformed references refused; LRC-LIB-COMPARE: the Info panel labels the active photo while culling, #2398; KEYC-RATING: `\` shows / hides the Filter Bar in the grids; LR-VIEW-PHOTOGRID: the grid reads only the photos an import batch or an edit touched, not the whole list; earlier: LRC-PRINT-PAGE: Print Page Options; LR-META-XMP: fewer false unimported-XMP warnings; KEYC-METADATA: ⌘K / Ctrl+K Add Keywords; LRC-DEV-HISTOGRAM-DRAG: the histogram's five tonal zones — hover for the value, drag to adjust the Basic control the press locked, double-click to reset; LR-VIEW-HISTOGRAM note updated; MENU-BAR: on macOS a menu item that yields its key to a focused text field or to shortcut recording really lets it go; LR-MERGE-HDR / LR-MERGE-PANO: Lanczos-3 warps; LR-IMP-LOCAL: browsing from the sidebar records the folder; LR-VIEW-ZOOM: only a full-size drag within 20 ms clears a slow-drag verdict; LR-IMP-ADD-DIALOG: hierarchical import album destination reconciled with main, #2362; KEY-SLIDER-NUDGE: vertical wheel nudges need a click or drag in the row; leaving it disarms them; LR-EDIT-OPTICS-PROFILE: Fujifilm nine-knot lens tables read at the plain radius; LR-VIEW-ZOOM: only a full-size drag within 20 ms clears a slow-drag verdict; LRC-LIB-LIBFOLDERS, LR-BEHAV-BG-TASKS: Synchronize Folder's scan shows its folder listing and stops it on ✕; LRC-LIB-LIBFOLDERS: Synchronize Folder says a folder is up to date; LR-LIB-STACK: filmstrip stack badge click; LRC-LIB-REFVIEW / CATALOG-SWITCH: Escape preserves edits; catalog-local pins; deleted and malformed references refused; LRC-LIB-COMPARE: the Info panel labels the active photo while culling, #2398; KEYC-RATING: `\` shows / hides the Filter Bar in the grids; LR-VIEW-PHOTOGRID: the grid reads only the photos an import batch or an edit touched, not the whole list; earlier: LRC-PRINT-PAGE: Print Page Options; LR-META-XMP: fewer false unimported-XMP warnings) · **Target:** Adobe Lightroom Classic 15.5 / Lightroom 9.6 The measured, row-by-row checklist: one row per Lightroom feature, menu item and shortcut, what we have and what is missing. It answers *does the feature exist?* (feature breadth). Whether it is good @@ -429,7 +429,7 @@ differences and missing bindings are in [ui-parity.md](ui-parity.md#shortcuts). | Id | Feature | Tier | Status | Evidence | Missing / notes | |---|---|---|---|---|---| -| LR-PREF-GENERAL | General settings | P0 | ✅ | `cmd:app.settings`, `cmd:app.openLibrary`, `crates/ui-egui/src/panels/settings.rs`, `crates/ui-egui/src/panels/notices.rs` | General / Import / Performance / Display / Interface tabs; app settings in ui.json (written atomically, saved when the library changes and every few seconds), library settings in prefs.json; At launch: open the last library or ask (see LRC-LIB-CATALOG-SWITCH); a damaged settings file is kept as `.corrupt-