Commit Graph
3 Commits
Author SHA1 Message Date
Claude 991742462b fix(sync): let a photo's hash decide which frames hold it
Telling copies of a photo apart counted a frame not hashed yet with the
same size and capture time as a hashed photo's copy, although it may be
another photo (a RAW of constant size in a burst without sub-second
times). Positions then shifted between copies: an exclusion waited forever
as a pending frame, or landed on the other photo. A hashed photo is now the
frames holding its hash; size and capture time count only when no frame
holds it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC
2026-10-12 19:59:54 +00:00
Claude f2ce806d56 fix(sync): keep the copies of a photo apart when positions cross copies
A server folder adopted with the same photo twice ('IMG_0001.JPG' and
'IMG_0001 (1).JPG') holds two frames where the PC keeps one. Translation
by photo sent every position of that photo to its first copy, so the
server's exclusion of the duplicate excluded the PC's only copy, a push
gave the server back one exclusion instead of two, and keyframes of both
copies piled on one frame.

FramePhotos now lists every frame holding a photo and tells them apart by
their order (Occurrence). A position on the n-th copy goes to the n-th
copy of the receiving copy, or waits as a pending frame with its
occurrence when that copy holds fewer; occurrence 0 is not written, so
older projects read the same.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC
2026-10-12 19:13:38 +00:00
Claude ea6e1a69e0 fix(sync): keep project positions on their photos when settings cross copies
Settings synced between a PC and its server sequence were stored as they
came, in the other copy's frame order. When the inserted photos arrived
later (a download, an upload), the index moved those already-correct
positions a second time, so exclusions, the hero and camera keyframes
landed on other photos (V-21, CD-2).

- Settings are translated by photo (SHA-256, else size and capture time)
  to the frames of the copy they go to: the server's before they are
  compared or applied here, this PC's to the server's frames as its
  manifest lists them before a push (SyncPositions).
- A position on a photo the receiving copy lacks waits in project.json as
  a pending frame and takes its place when the photo arrives, on an
  insertion or an append in step with the index; the Library's hero
  frame follows. A hero chosen meanwhile wins, and advice does not fill
  a hero while one waits. Old projects without the member are unchanged.
- Pushes send expectedFramesVersion; PATCH /api/v1/sequences/{id} answers
  409 frames_conflict when the frames changed since, and the next
  comparison translates again.
- A pulled payload equal to the local copy is settled without the
  archive: an offline or read-only archive no longer fails the
  comparison (V-10).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC
2026-10-12 16:20:11 +00:00