mirror of
https://github.com/storytold/lightcraft.git
synced 2026-10-26 02:59:17 -06:00
Nathaniel LedfordandClaude Opus 5.5
5c7b655fe6
A file only browsed in Local was counted as already in the library and silently dropped; it is now new, and synchronizing brings it into the library, as an import does. A photo whose file was renamed or moved within the folder showed as missing while its file counted as a skipped duplicate, so "Remove missing" sent the photo and its edits to Recently Deleted and imported nothing. The scan now matches a missing photo's content hash among the folder's files and lists it as moved; synchronizing relinks it (on by default, "Relink photos whose file was renamed or moved"), in the same undo step. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
60 lines
3.1 KiB
Rust
60 lines
3.1 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, 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 nothing changed in the library since (else scans again); 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,
|
|
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}))
|
|
}
|