Positions crossing copies could still land on other photos in three
windows:
- A push translated a row snapshot's settings against local frames
listed later, after a manifest round trip: an import of earlier photos
meanwhile moved the row's positions, and the server stored shifted
exclusions, hero and keyframes. SyncPositions now reads this copy's
row with its frames as one state (frames listed between two reads of
the row at the same frames version) and translates that row's
settings, at the settings version being pushed. The conflict
comparison and ApplyLocallyAsync compare against that same row. When
the copy was edited since, or its frames keep changing, nothing is
sent or applied and the next comparison translates again (Keep mine
reports a changed conflict; PushAll sends an edit saved meanwhile).
- The manifest read the sequence row, then paged its frames: an upload
committed in between paired settings of one frames version with
frames of the next. The server now lists them again while the frames
version moved during the listing, then inside a transaction holding
the row (on SQLite, on that transaction's connection, so no second
pooled connection waits behind the write lock). The client also
refuses to translate against a manifest whose frames are not each
listed once at 0..n-1.
- Server capture times were fetched only when something was unhashed,
so the same parked photo was written with or without capturedAt. They
are now fetched whenever the two frame lists differ; an equal project
then compares equal, and an entry can be placed on a photo that
arrives unhashed.
CompareOriginals counted unhashed server frames one-to-one against this
PC's photos, so two copies of one photo in a folder the server adopted
left Download on offer forever while the download fetched nothing. A
photo on either side is now there when any photo of the other side
matches it, as downloads and uploads find them. Paged frame listings
keep each frame once (an insertion between pages lists one again).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC