LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Merge PR #2304: LR-VIEW-PHOTOGRID: preserve embedded previews through priority changes and Undo
aiongg0c659d55768a
diff --cc crates/ui-egui/src/render.rsindex 101e5f845,eebfae595..745b4c74a--- a/crates/ui-egui/src/render.rs+++ b/crates/ui-egui/src/render.rs@@@ -1200,64 -1242,49 +1294,107 @@@ mod thumbnail_testscrate::panels::grid::request_thumb(app, PhotoId(1), 256, 10);}+ fn relink_destination() -> std::path::PathBuf {+ let path = std::env::temp_dir().join(format!("lc-render-relinked-{}-{}.nef", std::process::id(), lightcraft_preview::next_tick()));+ std::fs::write(&path, b"replacement source").unwrap();+ path+ }++ #[test]+ fn completed_failure_keeps_requested_source_after_relink() {+ let replacement = relink_destination();+ for slot in [Slot::Thumb(PhotoId(1)), Slot::Main, Slot::Before, Slot::Compare(1), Slot::Region] {+ let (mut app, work, ctx) = fixture();+ app.session.media.file_loader = Some(Arc::new(|_, _| Err("simulated decode failure".into())));+ let job = app.session.render_job(PhotoId(1), 64, 64, false, true).unwrap();+ app.renderer.request(slot, job, 100);+ let (submitted, job) = take_job(&work);+ assert_eq!(submitted, slot);+ let result = job.run();+ assert!(result.rendered.is_err(), "the old request has already failed");+ app.session.execute("photo.relink", &serde_json::json!({"id": 1, "path": replacement})).unwrap();+ assert!(+ matches!(&app.session.catalog.photo(PhotoId(1)).unwrap().source, Source::File { path } if path.ends_with(replacement.file_name().unwrap().to_str().unwrap()))+ );+ finish(&mut app, &work, &ctx, slot, result);+ assert_eq!(app.renderer.failure(slot), Some("simulated decode failure"));+ assert!(!app.renderer.is_pending(slot));+ let message = app.renderer.failure_messages.last().expect("the collector emitted a diagnostic");+ assert!(message.contains("audit.jpg"), "{message}");+ assert!(!message.contains("lc-render-relinked-"), "the failed request did not read the replacement: {message}");+ assert!(message.ends_with(": simulated decode failure"), "{message}");+ }+ std::fs::remove_file(replacement).unwrap();+ }++ #[test]+ fn superseded_failure_does_not_take_the_new_requests_source() {+ let replacement = relink_destination();+ let (mut app, work, ctx) = fixture();+ app.session.media.file_loader = Some(Arc::new(|_, _| Err("simulated decode failure".into())));+ let slot = Slot::Main;+ let old_job = app.session.render_job(PhotoId(1), 64, 64, false, true).unwrap();+ app.renderer.request(slot, old_job, 100);+ let (_, old_job) = take_job(&work);+ let old_result = old_job.run();+ app.session.execute("photo.relink", &serde_json::json!({"id": 1, "path": replacement})).unwrap();+ let new_job = app.session.render_job(PhotoId(1), 64, 64, false, true).unwrap();+ app.renderer.request(slot, new_job, 100);+ let (_, new_job) = take_job(&work);+ finish(&mut app, &work, &ctx, slot, old_result);+ assert!(app.renderer.failure_messages.is_empty(), "obsolete failures stay suppressed");+ assert!(app.renderer.is_pending(slot));+ finish(&mut app, &work, &ctx, slot, new_job.run());+ let message = app.renderer.failure_messages.last().expect("new failure is reported");+ assert!(message.contains("lc-render-relinked-"), "{message}");+ assert!(!message.contains("audit.jpg"), "{message}");+ assert!(app.renderer.requests.is_empty(), "completed request identity is released");+ std::fs::remove_file(replacement).unwrap();+ }++ #[test]+ fn grid_queued_standin_changes_priority_without_restarting() {+ let mut s = Session::new();+ s.media.preview_loader = Some(Arc::new(|_, _| Some(lightcraft_raster::Rgba8 { width: 4, height: 4, data: vec![[200, 100, 50, 255]; 16] })));+ let mut raw = (*photo()).clone();+ raw.kind = lightcraft_catalog::MediaKind::Raw;+ raw.develop = Arc::new(raw.camera_defaults());+ let (mut app, work, ctx) = fixture_with(s, raw);+ app.renderer.pool = JobPool::new(0); // deterministic: no quick job starts until run_inline+ let id = PhotoId(1);+ let slot = Slot::ThumbQuick(id);++ crate::panels::grid::request_thumb(&mut app, id, 384, 5);+ let request_id = app.renderer.request_ids[&slot];+ assert_eq!(app.renderer.pending[&slot].1, 6);+ assert_eq!(app.renderer.pool.queued(), 1);+ crate::panels::grid::request_thumb(&mut app, id, 384, 10);+ assert_eq!(app.renderer.pending[&slot].1, 11, "the grid must promote its queued stand-in");+ assert_eq!(app.renderer.request_ids[&slot], request_id);+ assert_eq!(app.renderer.pool.queued(), 1);++ crate::panels::grid::request_thumb(&mut app, id, 384, 5);+ assert_eq!(app.renderer.pending[&slot].1, 6, "the grid must demote its queued stand-in");+ assert_eq!(app.renderer.request_ids[&slot], request_id);+ assert_eq!(app.renderer.pool.queued(), 1);+ let built = app.renderer.thumb_jobs_built;+ app.renderer.pool.run_inline(1);+ crate::panels::grid::request_thumb(&mut app, id, 384, 10);+ assert_eq!(app.renderer.pending[&slot].1, 6, "completed work must not be restarted");+ assert_eq!(app.renderer.request_ids[&slot], request_id);+ assert_eq!(app.renderer.pool.queued(), 0);+ app.renderer.poll(&ctx, &mut app.session);+ assert_eq!(app.renderer.textures[&slot].quick, Some(QuickSource::Embedded));++ crate::panels::grid::request_thumb(&mut app, id, 384, 10);+ crate::panels::grid::request_thumb(&mut app, id, 384, 5);+ assert_eq!(app.renderer.thumb_jobs_built, built);+ assert_eq!(app.renderer.pool.queued(), 0);+ assert!(!app.renderer.is_pending(Slot::Thumb(id)));+ assert!(!app.renderer.textures.contains_key(&Slot::Thumb(id)));+ assert!(work.borrow().jobs.is_empty(), "the final embedded thumbnail needs no real render");+ }+#[test]fn unchanged_ready_and_running_frames_build_no_jobs() {let (mut app, work, ctx) = fixture();