Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

Merge main into reload-lens-data

radialmonster6e37b8ec1a61
diff --cc crates/catalog/src/tests.rs
index 79d9b7d8f,4c2bb33eb..67ba0f791
--- a/crates/catalog/src/tests.rs
+++ b/crates/catalog/src/tests.rs
@@@ -457,21 -457,47 +457,66 @@@ fn random_sort_has_no_date_headers()
assert!(c.date_runs(&ids, SortKey::Random, GroupBy::Day).is_empty());
}
+/// Reload stores the lens data a file carries; the inverse (through the journal's JSON) takes it back.
+#[test]
+fn set_embedded_lens_is_undoable_and_journaled() {
+ let mut c = Catalog::default();
+ let a = c.alloc_photo_id();
+ c.apply(Op::AddPhoto {
+ photo: Box::new(Photo::new(a, Source::File { path: "/x.rw2".into() }, "x.rw2", "RW2", 4000, 3000, "2026-10-06T00:00:00")),
+ })
+ .unwrap();
+ let lens = lightcraft_develop::EmbeddedLens { warp: Some(Default::default()), vignette: None };
+ let op = Op::SetEmbeddedLens { id: a, lens: Some(Box::new(lens)) };
+ let op: Op = serde_json::from_str(&serde_json::to_string(&op).unwrap()).unwrap();
+ let inv = c.apply(op).unwrap();
+ assert_eq!(c.photo(a).unwrap().embedded_lens, Some(lens));
+ let inv: Op = serde_json::from_str(&serde_json::to_string(&inv).unwrap()).unwrap();
+ c.apply(inv).unwrap();
+ assert_eq!(c.photo(a).unwrap().embedded_lens, None);
+}
++
+ #[test]
+ fn undated_photos_group_under_unknown_date_and_sort_together() {
+ let mut c = Catalog::new();
+ let add_photo = |c: &mut Catalog, name: &str, captured: Option<&str>, imported: &str| {
+ let id = c.alloc_photo_id();
+ let mut p = Photo::new(id, Source::Demo { scene: 0 }, name, "JPEG", 100, 100, imported);
+ p.captured = captured.map(str::to_string);
+ c.apply(Op::AddPhoto { photo: Box::new(p) }).unwrap();
+ id
+ };
+ let p_dated1 = add_photo(&mut c, "dated1.jpg", Some("2026-05-10T12:00:00"), "2026-10-01T00:00:00");
+ let p_dated2 = add_photo(&mut c, "dated2.jpg", Some("2026-05-20T12:00:00"), "2026-10-01T00:00:00");
+ let p_undated1 = add_photo(&mut c, "undated1.jpg", None, "2026-10-05T00:00:00");
+ let p_undated2 = add_photo(&mut c, "undated2.jpg", None, "2026-10-02T00:00:00");
+
+ // Descending sort (default, newest first): dated photos first (newest to oldest), undated photos at the end
+ let desc = c.query(&Filter::default(), &Sort { key: SortKey::CaptureDate, ascending: false, ..Default::default() });
+ assert_eq!(desc, vec![p_dated2, p_dated1, p_undated1, p_undated2]);
+
+ // Ascending sort (oldest first): undated photos at the beginning, dated photos from oldest to newest
+ let asc = c.query(&Filter::default(), &Sort { key: SortKey::CaptureDate, ascending: true, ..Default::default() });
+ assert_eq!(asc, vec![p_undated2, p_undated1, p_dated1, p_dated2]);
+
+ // date_runs groups undated photos under Unknown Date
+ let runs = c.date_runs(&desc, SortKey::CaptureDate, GroupBy::Day);
+ assert_eq!(runs.len(), 3);
+ assert_eq!(runs[0].key, "2026-05-20");
+ assert_eq!(runs[1].key, "2026-05-10");
+ assert_eq!(runs[2].key, "");
+ assert_eq!(runs[2].label, "Unknown Date");
+ assert_eq!(runs[2].count, 2);
+
+ // date_groups sidebar tree only counts photos with capture dates
+ let groups = c.date_groups();
+ assert_eq!(groups.len(), 1);
+ assert_eq!(groups[0].year, "2026");
+ assert_eq!(groups[0].count, 2);
+
+ // Filter by capture date prefix does not match undated photos
+ let filter_day = Filter { date: Some("2026-10-05".into()), ..Default::default() };
+ assert_eq!(c.query(&filter_day, &Sort::default()), vec![]);
+ let filter_year = Filter { date: Some("2026".into()), ..Default::default() };
+ assert_eq!(c.query(&filter_year, &Sort { key: SortKey::CaptureDate, ascending: false, ..Default::default() }), vec![p_dated2, p_dated1]);
+ }