dtourolle/DarkRoom
1
0
Fork 0
Code Issues 39 Pull Requests Actions Packages Projects Releases 20 Wiki Activity

Keep colour labels in the sidecar so they survive and travel

Browse Source 
A rating and a flag are written to DarkRoom's sidecar as well as the
catalog, because the catalog is a disposable index and the sidecar is
how a judgement reaches the photographer's other devices. A label had no
place there, so once labels could be set, one would have lived only in
the catalog of the device it was set on and gone with it.

The sidecar version now carries `label` (0 none, 1-5 as the catalog
codes it), written only when set. It merges under the rating's rule, so a
device that never labelled a frame cannot clear another device's label,
and a code this build does not know reads as none rather than as some
other colour. A judgement write carries the catalog's label with the
stars, and the scan takes a sidecar's label into the catalog when it has
one. An older build keeps the line as an unknown key and writes it back.
This commit is contained in:
dtourolle
2026-09-24 21:52:23 -04:00
parent 89859d39d1
commit d748527a4c
4 changed files with 129 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/dr-ui/src/library/scan.rs
+49 -15
View File
@@ -380,7 +380,14 @@ pub(super) async fn pull_sidecars(
continue;
};
match apply_judgement(conn, root_id, path, version.rating, version.flag) {
match apply_judgement(
conn,
root_id,
path,
version.rating,
version.flag,
version.label,
) {
Ok(n) => {
applied += n;
record_sidecar_read(conn, root_id, path, &entry.validator);
@@ -464,6 +471,7 @@ pub(super) fn apply_judgement(
sidecar: &str,
rating: u8,
flag: u8,
label: u8,
) -> Result<usize, String> {
let stem = sidecar
.rsplit_once('.')
@@ -513,14 +521,25 @@ pub(super) fn apply_judgement(
// of caution, as `dr_pipeline::sidecar::merge_judgement`. The cost is
// the one that rule always carries — clearing a rating does not
// propagate.
//
// TRACES: FR-CAT-5
// The label under the same rule: a sidecar with none leaves this
// device's label alone.
let changed = conn
.execute(
"UPDATE versions
SET rating = CASE WHEN ?2 > 0 THEN ?2 ELSE rating END,
flag = CASE WHEN ?3 > 0 THEN ?3 ELSE flag END
flag = CASE WHEN ?3 > 0 THEN ?3 ELSE flag END,
label = CASE WHEN ?4 > 0 THEN ?4 ELSE label END
WHERE id = ?1
AND ((?2 > 0 AND rating <> ?2) OR (?3 > 0 AND flag <> ?3))",
rusqlite::params![version, rating.min(5) as i64, flag.min(2) as i64],
AND ((?2 > 0 AND rating <> ?2) OR (?3 > 0 AND flag <> ?3)
OR (?4 > 0 AND label IS NOT ?4))",
rusqlite::params![
version,
rating.min(5) as i64,
flag.min(2) as i64,
if label <= 5 { label as i64 } else { 0 }
],
)
.map_err(|e| e.to_string())?;
applied += changed;
@@ -891,12 +910,27 @@ mod tests {
v
}
#[test]
fn a_label_from_another_device_reaches_the_catalog_and_none_clears_nothing() {
// TRACES: FR-CAT-5
let cat = library(&["2026/a.CR2"]);
assert_eq!(apply_judgement(cat.connection(), 1, "2026/a.drsc", 0, 0, 4).unwrap(), 1);
let label = |cat: &Catalog| -> Option<i64> {
cat.connection()
.query_row("SELECT label FROM versions WHERE is_default = 1", [], |r| r.get(0))
.unwrap()
};
assert_eq!(label(&cat), Some(4));
apply_judgement(cat.connection(), 1, "2026/a.drsc", 3, 0, 0).unwrap();
assert_eq!(label(&cat), Some(4), "a sidecar with no label left it alone");
}
/// The regression, in one line: a rating in a sidecar reaches the grid.
/// Before this there was no path by which it could.
#[test]
fn a_rating_from_another_device_reaches_the_catalog() {
let cat = library(&["2026/a.CR2"]);
let n = apply_judgement(cat.connection(), 1, "2026/a.drsc", 4, 1).unwrap();
let n = apply_judgement(cat.connection(), 1, "2026/a.drsc", 4, 1, 0).unwrap();
assert_eq!(n, 1);
assert_eq!(judgements(&cat), vec![("2026/a.CR2".to_string(), 4, 1)]);
@@ -908,7 +942,7 @@ mod tests {
#[test]
fn both_halves_of_a_raw_and_jpeg_pair_are_judged() {
let cat = library(&["2026/a.CR2", "2026/a.jpg"]);
let n = apply_judgement(cat.connection(), 1, "2026/a.drsc", 3, 0).unwrap();
let n = apply_judgement(cat.connection(), 1, "2026/a.drsc", 3, 0, 0).unwrap();
assert_eq!(n, 2);
assert_eq!(
@@ -926,8 +960,8 @@ mod tests {
#[test]
fn a_lowered_rating_travels() {
let cat = library(&["2026/a.CR2"]);
apply_judgement(cat.connection(), 1, "2026/a.drsc", 4, 0).unwrap();
apply_judgement(cat.connection(), 1, "2026/a.drsc", 1, 0).unwrap();
apply_judgement(cat.connection(), 1, "2026/a.drsc", 4, 0, 0).unwrap();
apply_judgement(cat.connection(), 1, "2026/a.drsc", 1, 0, 0).unwrap();
assert_eq!(judgements(&cat)[0].1, 1);
}
@@ -937,10 +971,10 @@ mod tests {
#[test]
fn an_unjudged_sidecar_does_not_erase_a_local_rating() {
let cat = library(&["2026/a.CR2"]);
apply_judgement(cat.connection(), 1, "2026/a.drsc", 5, 2).unwrap();
apply_judgement(cat.connection(), 1, "2026/a.drsc", 5, 2, 0).unwrap();
assert_eq!(
apply_judgement(cat.connection(), 1, "2026/a.drsc", 0, 0).unwrap(),
apply_judgement(cat.connection(), 1, "2026/a.drsc", 0, 0, 0).unwrap(),
0
);
assert_eq!(judgements(&cat), vec![("2026/a.CR2".to_string(), 5, 2)]);
@@ -953,11 +987,11 @@ mod tests {
fn applying_the_same_judgement_twice_changes_nothing() {
let cat = library(&["2026/a.CR2"]);
assert_eq!(
apply_judgement(cat.connection(), 1, "2026/a.drsc", 4, 1).unwrap(),
apply_judgement(cat.connection(), 1, "2026/a.drsc", 4, 1, 0).unwrap(),
1
);
assert_eq!(
apply_judgement(cat.connection(), 1, "2026/a.drsc", 4, 1).unwrap(),
apply_judgement(cat.connection(), 1, "2026/a.drsc", 4, 1, 0).unwrap(),
0
);
}
@@ -970,7 +1004,7 @@ mod tests {
// `_` is LIKE's single-character wildcard, so an unescaped `a_b` stem
// would also match `axb`.
let cat = library(&["2026/a_b.CR2", "2026/axb.CR2"]);
apply_judgement(cat.connection(), 1, "2026/a_b.drsc", 5, 0).unwrap();
apply_judgement(cat.connection(), 1, "2026/a_b.drsc", 5, 0, 0).unwrap();
assert_eq!(
judgements(&cat),
@@ -986,7 +1020,7 @@ mod tests {
#[test]
fn a_shared_prefix_is_not_a_shared_sidecar() {
let cat = library(&["2026/a.CR2", "2026/ab.CR2"]);
apply_judgement(cat.connection(), 1, "2026/a.drsc", 5, 0).unwrap();
apply_judgement(cat.connection(), 1, "2026/a.drsc", 5, 0, 0).unwrap();
assert_eq!(
judgements(&cat),
@@ -1004,7 +1038,7 @@ mod tests {
fn a_sidecar_with_no_photograph_here_is_not_a_failure() {
let cat = library(&["2026/a.CR2"]);
assert_eq!(
apply_judgement(cat.connection(), 1, "2026/elsewhere.drsc", 5, 0).unwrap(),
apply_judgement(cat.connection(), 1, "2026/elsewhere.drsc", 5, 0, 0).unwrap(),
0
);
}