feat(copies): matches between this PC and the server, Integrate and merge (owner review 6, v1.2.0) (#74)
CI / Build and test (push) Successful in 13m44s
CI / Windows tests and installer (push) Skipped
CI / YAML check (push) Successful in 16s
Release / Build, test and publish (push) Successful in 26m34s
CI / PostgreSQL 16 integration (push) Failing after 17m36s
CI / PostgreSQL 17 integration (push) Failing after 15m36s
CI / Docker image (push) Successful in 1m12s
Release / Server image (push) Failing after 15s
CI / Build and test (push) Successful in 13m44s
CI / Windows tests and installer (push) Skipped
CI / YAML check (push) Successful in 16s
Release / Build, test and publish (push) Successful in 26m34s
CI / PostgreSQL 16 integration (push) Failing after 17m36s
CI / PostgreSQL 17 integration (push) Failing after 15m36s
CI / Docker image (push) Successful in 1m12s
Release / Server image (push) Failing after 15s
The same time-lapse on a server and on this PC under different ids, or twice on this PC, is recognised, compared and settled as the owner asked in owner review 6. Matches are found after each sync refresh, through the server's new photo lookup, and after the jobs that change photos. The default is to ask every time. Server › Matches offers: - Keep apart, which is remembered; - Link only and Unlink; - the Compare dialog: photos, details line by line, projects and the plan. Integrate completes both sides. Photos default to Union, projects are copied across, and a losing version goes to the trash only after a hash check. Afterwards new photos move by themselves, and deletions wait for the user. A merge of two local sequences verifies every photo before the other sequence goes to its archive's trash. Upload all local skips suspected matches and flags them. Migration 0012 adds the found_copies and copy_probes tables. Jobs 25 (Integrate) and 26 (MergeSequences) are new, and so are the server capabilities photo-lookup and upload-into. Refs #73 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Alberto Balbo <alberto.balbo.96@gmail.com>
This commit was merged in pull request #74.
This commit is contained in:
1 parent
43719bb5c5
commit
f33bcac32e
586 files changed
+41546
-280
No files matched your search
+46
-2
@@ -91,6 +91,50 @@ Label column left of controls: 116 px in panels, 180 px in Settings.
|
||||
Format, Length, Size, Date, State; Preset, Format and Date drop while the player is open). The player is a 420 px
|
||||
pane at the end side: Preview background, the picture or video fitted (a left-to-right island), its title and
|
||||
facts, *Show in folder* and ✕; *Cannot play here* is an EmptyState inside it.
|
||||
- **Matches** (owner review 6, #73; brief §12.7): no new colours or controls, only the kit above.
|
||||
- *Matches list*: a `Matches · n` chip after Conflicts in the Server section (warning colours while a match needs
|
||||
attention); while selected it replaces the sync table with the same row style: Sequence, This side, Other side
|
||||
(counts first, "{archive} · {n} photos"), State as glyph and word (*match found* ▲ Warning, *kept apart* ○ faint,
|
||||
*linked* ● Accent, *integrating · x of y* and *merging* ● Accent with the job's share, *integrated* ● green,
|
||||
*deleted there · n*, *deleted on server* ▲, *kept here* ○), then the state's 26 px row actions, three at most
|
||||
(a linked pair with photos deleted there: *Compare…*, *Unlink*, *Review*). Columns: Sequence `*`, the two sides
|
||||
`1.4*` (180 px at least), State 160 px, Actions `1.4*` (280 px at least); an archive or server name longer than 24 characters is cut
|
||||
in its middle ("ChronosArch…Studio NAS"), the whole text in the tooltip. Attention first.
|
||||
Toolbar *Find matches*; empty state "No matches found." with *Find matches*.
|
||||
- *Compare dialog*: an in-window dialog over the section's scrim, 920 px wide, at most 600 px high, its parts
|
||||
scrolling inside. Header: each side's place, photos, size and time span; a SegmentedControl *Photos · Details ·
|
||||
Projects · Plan*. Photos: the policy ComboBox, a class table of 28 px rows (glyph and class, count here, count
|
||||
there, size, a tooltip per class that follows the policy) and the selected class's virtualised photo list with
|
||||
column headings (*Bring* check box, the *Keep both / This PC's / Server's / Leave* ComboBox, *Drop…*, *To trash…*);
|
||||
the last column's heading reads *Version* while the rows offer a choice, the version Main uses reads *In Main* in
|
||||
Text.Secondary, and a choice not made is read *Not chosen* by a screen reader. The policy ComboBox (here and in
|
||||
Settings › Server) is 240 px and the version ComboBox 185 px, sized by a test over every shipped language; a longer
|
||||
label trims with an ellipsis. The photo and Details lists always show their vertical scroll bar and their headings
|
||||
keep its width, so the headings stay over their columns.
|
||||
Details: one row per setting, both values ellipsed (full in the tooltip, wrapping at 480 px) and a *This PC |
|
||||
Server* SegmentedControl, nothing preselected, each segment's tooltip naming the value it takes ("Take the value of
|
||||
Studio NAS: 33"); *All this PC* / *All server* links above. Projects: *Copy across | Leave them* and two lists with
|
||||
the target name ("→ Vertical (STUDIO-PC)"), rows trimmed with the whole row in the tooltip, the headings over their
|
||||
lists, both lists scrolling together when they do not fit. Plan: two columns of lines in Text, last copies first
|
||||
with the Warning glyph, *Link only* as a secondary row button, each block as a `Status.DialogError` line with at
|
||||
most one action. Two buttons: *Cancel* (safe, Esc) and *Integrate* (primary).
|
||||
- *Merge dialog*: the same dialog titled *Merge sequences*, *Kept* and *Other* in place of this PC and the server
|
||||
(from the first plan, made on opening), the kept-sequence radio rows first in the Plan, the projects choice fixed
|
||||
to *Copy across* (disabled, with its tooltip), primary *Merge*. Its one-sided classes are named by role (*Only in
|
||||
kept*, *Deleted in other*); under *Choose each* a differing photo offers *Keep both / Kept / Other* (no *Leave*).
|
||||
- *Confirmations*: *Replace photos?* (the losing versions under the side that loses them, last copies first) and
|
||||
*Merge sequences?* (the photo count typed without separators; the prompt names the number) as destructive
|
||||
`ConfirmDialog`s; every line of a trash or replace confirmation carries its prefix (*Only copy:*, *Replaced:*,
|
||||
*Held elsewhere:*). Unlink and Keep apart use a toast with *Undo* instead.
|
||||
- *Library card status*: *Also elsewhere* or *Deleted there* as a Warning status glyph with its word, second on the
|
||||
card, in the list too; *Compare…* in the context menu and the row actions. A server card in a match offers
|
||||
*Compare…* alone.
|
||||
- *Two versions…* (a local card's and row's context menu; a merge job's *Open*): an in-window dialog 640 px wide, at
|
||||
most 520 px high, titled with the sequence; a list of 48 px rows, one per version (file name in SemiBold, its
|
||||
detail in Text.Secondary with tabular figures, *In Main* where Main uses it, *Drop…* as the row button); an empty
|
||||
list reads a muted line; *Close* (default and Esc) with the dialog's `Status.DialogError` line beside it.
|
||||
- *Edit picker twin*: a muted *Twin* chip right after the project name of a Workspace row; its tooltip names the
|
||||
other home and project. Only a project whose sibling is at the other home carries it.
|
||||
- **Crop overlay** (preview, Camera step; owner review 1, R5): the box is drawn over the whole view frame (oriented,
|
||||
straightened) and is always locked to the output aspect. States (tiles under the Camera screen in `Editor.html`):
|
||||
- *Shown*: Crop mask on, any step: Scrim (#99000000 dark, #66000000 light) outside, 1 px TextMuted outline.
|
||||
@@ -175,7 +219,7 @@ from the SVG geometry (no raster assets checked in as sources). Badges only at
|
||||
|
||||
| Mockup | Brief | Notes |
|
||||
|---|---|---|
|
||||
| `Main.html` | §12.2 Library | grid/list, year·camera·status filters, selection panel |
|
||||
| `Main.html` | §12.2 Library | grid/list, year·camera·status filters, selection panel; the match statuses and *Two versions…* (owner review 6) have no mockup: built from §4 *Matches*; the statuses are checked against the `library-copies-*` captures, the *Two versions…* dialog has no capture scene yet |
|
||||
| `Editor.html` | §12.3 Edit | three parts, one below the other. Exposure step: step bar, title ▾ (Change sequence), wipe compare (the corrected side carries the look), curves, advisor Auto pills, the Look group (Filter, Strength) at the end of the panel, Previous · n / m · Next. Camera step (`#camera`): the whole view frame with a 9:16 crop being edited (handles), the zoom-keyframe curve under the filmstrip, rows Aspect · Rotation (Rotate left/right and the value) · Mirror · Flip · Straighten · Crop size · Crop X · Crop Y, the keyframes line, then Reset framing on its own line (three buttons do not fit the 292 px panel) above Optimise section · Reset (Reset framing disabled, with `ResetFramingNone`, when nothing is set). Crop overlay states: Shown, Editable, Dragging, Straightening, Locked |
|
||||
| `Export.html` | §12.3 / §11.4 | the Export step (owner review 1, R3, phase 5): step bar with Export current, the header's fixed-width *Render ▾*, the grouped preset table (28 px rows, Recommended chip, batch ticks, a folded group), the Output panel's four collapsible groups (Output open, Encoding and Playback folded with their summaries, File open) and its fixed footer (result line, Render now, Add to queue · Batch (2), Videos (3) · Reveal), Previous · 8 / 8 · Next sequence; under it the Render menu open with *Other presets ›* expanded. Resolution offers the standard boxes and Custom shows the preset's box; the **Output size** row under it shows what is rendered: the chosen proportions fitted in the box (4K at 9:16 = 2160 × 3840; "source" keeps the preset), the preset name unchanged; when the encoder caps it, the value reads "1296 × 2304 (capped)" with `Tooltips.Editor.Export.OutputCapped`. The preview mask is the output's footprint in the view frame |
|
||||
| `Videos.html` | §12.10 | the Videos section (owner review 1, R9): toolbar (search, Kind, Codec, Year, Source, Order, cards/list, Refresh), the sequence chip, the selection bar (Play, Show in folder, Copy to folder, Copy on server, Open in Edit, Delete…), cards with state chips, the player pane open on the right; under it the list view and the Delete… confirmation |
|
||||
@@ -183,7 +227,7 @@ from the SVG geometry (no raster assets checked in as sources). Badges only at
|
||||
| `Import.html` | §12.4 / §13 | card profile, sessions, plan, verification, after-import actions |
|
||||
| `Archive.html` | §12.5 | tree, mass operations, stats, verify/rebuild, maintenance |
|
||||
| `Jobs.html` | §12.6 | filters, queue order, expandable log, retry/open/folder; a `Queue · Scheduled` segmented control first in the toolbar (owner review 2, R10): Scheduled is a table (on switch, name, action, when, next run, last result, Run now · Edit · Reset or Delete), the selected schedule's last runs under it (Show in queue), New schedule at the toolbar's end and the editor as an in-window dialog; jobs a schedule queued carry an Accent `Scheduled` pill after their target |
|
||||
| `Server.html` | §12.7 / §14 | connection with TOFU fingerprint, account and quota, render node, sync table, conflicts |
|
||||
| `Server.html` | §12.7 / §14 | connection with TOFU fingerprint, account and quota, render node, sync table, conflicts; the Matches list and the Compare/merge dialog (owner review 6) have no mockup: built from §4 *Matches* and checked against the `server-copies-*` captures |
|
||||
| `Settings.html` | §12.8 | section list (About last, §12.9), Rendering section, encoder table, self-test |
|
||||
| `Welcome.html` | §12.1 | first run: local archive / adopt folder / connect; Continue; card toast |
|
||||
| `Admin.html` | §14.7 | dashboard; sidebar: pages from the top, Settings docked at its foot above the account, no About (the last group of Settings) |
|
||||
|
||||
Reference in new issue
Block a user