mirror of
https://github.com/storytold/lightcraft.git
synced 2026-10-25 10:37:11 -06:00
Nathaniel LedfordandClaude Opus 5.5
c98010cffa
A scan went stale on any catalog change anywhere (a background import, a rating elsewhere), and folder.synchronize then scanned again inline: on the UI thread, and acting on results the person never saw. A scan now stays current while the folder's own photos are the same records (Session::take_folder_changes compares them by identity). The dialog asks with `scanned: true`, which refuses a stale scan instead of redoing it; the dialog then stays open and scans again in the background. Agents that just call folder.synchronize still get a fresh scan. The app dropped session.folder_changes every frame no dialog was open, so an agent's folder.scanChanges never reached its folder.synchronize in the running app; it now only lets go of a scan its dialog made. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
62 lines
3.4 KiB
Rust
62 lines
3.4 KiB
Rust
//! Synchronize Folder commands (see [`crate::sync`]).
|
|
|
|
use serde_json::{Value, json};
|
|
|
|
use super::{CommandSpec, always, bad, bool_or, cmd, str_param};
|
|
use crate::sync::{SyncChoice, scan, synchronize};
|
|
use crate::{Result, Session};
|
|
|
|
fn path(p: &Value, c: &str) -> Result<String> {
|
|
str_param(p, "path").filter(|d| !d.trim().is_empty()).map(str::to_string).ok_or_else(|| bad(c, "missing `path`"))
|
|
}
|
|
|
|
pub fn specs() -> Vec<CommandSpec> {
|
|
vec![
|
|
cmd!(
|
|
query "folder.scanChanges",
|
|
"Scan Folder for Changes",
|
|
[],
|
|
None,
|
|
"{path, disk?: bool (a whole disk or share, or a folder holding disks)} — compare a folder of the library (and the folders inside it) with the disk; changes nothing → {path, new: [{path, name, format, …}] files the library doesn't have, duplicates: files whose content it already has, unreadable: [{path, error}], missing: [{id, path}] photos whose file is gone, moved: [{id, from, to}] photos whose file is elsewhere in the folder (same content), metadata: [{id, path}] photos whose XMP sidecar was saved after they came in or were last edited here and says something the library doesn't}",
|
|
always,
|
|
|s, p| {
|
|
const C: &str = "folder.scanChanges";
|
|
let path = path(p, C)?;
|
|
let changes = scan(s, &path, bool_or(p, "disk", false)).map_err(|e| bad(C, e.to_string()))?;
|
|
let v = serde_json::to_value(&changes).unwrap_or_default();
|
|
s.folder_changes = Some(changes);
|
|
Ok(v)
|
|
}
|
|
),
|
|
cmd!(
|
|
"folder.synchronize",
|
|
"Synchronize Folder",
|
|
[],
|
|
None,
|
|
"{path, disk?: bool, scanned?: bool, importNew?: true, relinkMoved?: true, removeMissing?: false, readMetadata?: false} — bring a folder of the library up to date with the disk (see folder.scanChanges): import its new files in place, relink photos whose file was renamed or moved within it, move photos whose file is gone to Recently Deleted, read XMP sidecars saved by other apps (the sidecar wins); acts on the last folder.scanChanges of the folder while it is current (the folder's photos unchanged), else scans again — or, with `scanned: true`, refuses; one undo step, no file is touched → {imported, relinked, removed, read, failed: [[path, error]]}",
|
|
always,
|
|
sync
|
|
),
|
|
]
|
|
}
|
|
|
|
fn sync(s: &mut Session, p: &Value) -> Result<Value> {
|
|
const C: &str = "folder.synchronize";
|
|
let path = path(p, C)?;
|
|
let d = SyncChoice::default();
|
|
let choice = SyncChoice {
|
|
import_new: bool_or(p, "importNew", d.import_new),
|
|
relink_moved: bool_or(p, "relinkMoved", d.relink_moved),
|
|
remove_missing: bool_or(p, "removeMissing", d.remove_missing),
|
|
read_metadata: bool_or(p, "readMetadata", d.read_metadata),
|
|
};
|
|
let changes = match s.take_folder_changes(&path) {
|
|
Some(c) => c,
|
|
// the person agreed to what a scan showed: never act on something else
|
|
None if bool_or(p, "scanned", false) => return Err(bad(C, format!("{path} changed since it was scanned: scan again"))),
|
|
None => scan(s, &path, bool_or(p, "disk", false)).map_err(|e| bad(C, e.to_string()))?,
|
|
};
|
|
let r = synchronize(s, changes, choice)?;
|
|
Ok(json!({"imported": r.imported, "relinked": r.relinked, "removed": r.removed, "read": r.read, "failed": r.failed}))
|
|
}
|