feat: owner review 2 phase 5c: originals, local render, clean-up and the workspace settings (#18)
CI / Build and test (push) Successful in 9m26s
CI / Windows tests and installer (push) Skipped
CI / YAML check (push) Successful in 8s
Release / Build, test and publish (push) Successful in 14m31s
CI / PostgreSQL 16 integration (push) Successful in 9m53s
CI / PostgreSQL 17 integration (push) Successful in 9m22s
CI / Docker image (push) Successful in 44s
Release / Server image (push) Successful in 1m36s
CI / Build and test (push) Successful in 9m26s
CI / Windows tests and installer (push) Skipped
CI / YAML check (push) Successful in 8s
Release / Build, test and publish (push) Successful in 14m31s
CI / PostgreSQL 16 integration (push) Successful in 9m53s
CI / PostgreSQL 17 integration (push) Successful in 9m22s
CI / Docker image (push) Successful in 44s
Release / Server image (push) Successful in 1m36s
Originals in the workspace, local render and send home with provenance, the workspace clean-up, size limit and trash, moving the workspace folder, and the complete Settings › Workspace page (owner review 2, R8, phase 5c). One adversarial review round (35 findings, 32 fixed), a copy-cancel race fixed, 184 strings in all 38 languages. 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 #18.
This commit is contained in:
1 parent
81c303f484
commit
db389a54f2
364 files changed
+17417
-595
No files matched your search
@@ -17,6 +17,13 @@ namespace Chronos.Data.Workspaces;
|
||||
/// What the file is when a server sent it (phase 5b): <c>proxy</c>, or <c>thumb</c>, a thumbnail standing in while the server
|
||||
/// had no proxy of the frame, which a later copy replaces once it has one; null for a proxy (copies from this PC's archive).
|
||||
/// </param>
|
||||
/// <param name="Original">
|
||||
/// The frame's original the workspace holds, relative to the media folder (<see cref="WorkspaceProject.OriginalName"/>:
|
||||
/// "originals/<frame id>-<sha8><ext>", phase 5c), in media of kind <see cref="BundleMedia.Originals"/>; null
|
||||
/// when it holds none (proxies only, or the home had no original of the frame: the proxy stands in for editing).
|
||||
/// </param>
|
||||
/// <param name="OriginalSha256">The original's SHA-256 as copied and checked (lower case); null with <paramref name="Original"/>.</param>
|
||||
/// <param name="OriginalBytes">The original's size as copied; 0 with no original.</param>
|
||||
public sealed record WorkspaceFrame(
|
||||
Guid Id,
|
||||
int Index,
|
||||
@@ -46,7 +53,10 @@ public sealed record WorkspaceFrame(
|
||||
string? File,
|
||||
string? FileSha256,
|
||||
long FileBytes,
|
||||
string? FileKind = null)
|
||||
string? FileKind = null,
|
||||
string? Original = null,
|
||||
string? OriginalSha256 = null,
|
||||
long OriginalBytes = 0)
|
||||
{
|
||||
/// <summary>The record of a home's frame, with the file the workspace holds for it (<paramref name="fileKind"/>: what a server sent).</summary>
|
||||
public static WorkspaceFrame Of(Frame frame, string? file, string? fileSha256, long fileBytes, string? fileKind = null)
|
||||
@@ -62,6 +72,24 @@ public sealed record WorkspaceFrame(
|
||||
[JsonIgnore]
|
||||
public bool IsStandIn => FileKind == Sync.ProxyCache.Thumb;
|
||||
|
||||
/// <summary>The workspace holds the frame's original (media of kind <see cref="BundleMedia.Originals"/>).</summary>
|
||||
[JsonIgnore]
|
||||
public bool HasOriginal => Original is not null;
|
||||
|
||||
/// <summary>
|
||||
/// The frame as a render from the workspace's originals reads it (phase 5c): its file is <see cref="Original"/>, and
|
||||
/// it is flagged missing while the workspace holds no original for it (a render refuses such media first).
|
||||
/// </summary>
|
||||
public Frame ToOriginalFrame(Guid sequenceId)
|
||||
{
|
||||
var frame = ToFrame(sequenceId);
|
||||
return frame with
|
||||
{
|
||||
RelativePath = Original ?? FileName,
|
||||
Flags = Original is null ? Flags | FrameFlags.Missing : Flags,
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>The frame as the processing engine reads it; flagged missing while the workspace holds no file for it.</summary>
|
||||
public Frame ToFrame(Guid sequenceId) => new()
|
||||
{
|
||||
@@ -97,16 +125,34 @@ public sealed record WorkspaceFrame(
|
||||
|
||||
/// <summary>
|
||||
/// What a workspace project holds of its sequence's photos (<c>media/media.json</c>, owner review 2, R8): the kind
|
||||
/// (<see cref="BundleMedia.Proxies"/>; originals in phase 5c), the sequence and its frames version at the home when they
|
||||
/// were copied, and every frame in index order. Written last by a copy, so a copy cut short leaves the previous index.
|
||||
/// (<see cref="BundleMedia.Proxies"/>, or from phase 5c <see cref="BundleMedia.Originals"/>: the proxies plus each frame's
|
||||
/// original, <see cref="WorkspaceFrame.Original"/>), the sequence and its frames version at the home when they were
|
||||
/// copied, and every frame in index order. Written last by a copy, so a copy cut short leaves the previous index. An index
|
||||
/// of phase 5b has no original fields: it reads as proxies only. One that holds originals or was cleaned is written as
|
||||
/// format 2 (<see cref="WrittenFormatVersion"/>), which a Chronos before phase 5c refuses as newer and reads as media
|
||||
/// removed (copied again) rather than as proxies whose files are all missing; proxies alone stay format 1, which it reads.
|
||||
/// </summary>
|
||||
/// <param name="Aliases">The encodings of the sequence's photos a conversion joined at the home (R7, its tombstones of reason
|
||||
/// "replaced") when the media were copied: a version parked on a photo before its file was converted still finds its frame.</param>
|
||||
/// <param name="Cleaned">
|
||||
/// When the workspace's clean-up removed the files of these media (phase 5c, <see cref="WorkspaceCleaner"/>): the frames stay,
|
||||
/// none names a file, and the project reads as <see cref="WorkspaceState.MediaRemoved"/> until a copy brings them again (a
|
||||
/// copy writes a new index, without it). Null for media a copy wrote.
|
||||
/// </param>
|
||||
public sealed record WorkspaceMedia(string Format, int FormatVersion, string Kind, Guid SequenceId, int FramesVersion, IReadOnlyList<WorkspaceFrame> Frames,
|
||||
DateTimeOffset Copied, string? AnalysisSha256 = null, IReadOnlyList<PhotoAlias>? Aliases = null)
|
||||
DateTimeOffset Copied, string? AnalysisSha256 = null, IReadOnlyList<PhotoAlias>? Aliases = null, DateTimeOffset? Cleaned = null)
|
||||
{
|
||||
public const string FormatName = "chronos-workspace-media";
|
||||
public const int CurrentFormatVersion = 1;
|
||||
|
||||
/// <summary>The newest format this Chronos reads (2: media with originals, or cleaned).</summary>
|
||||
public const int CurrentFormatVersion = 2;
|
||||
|
||||
/// <summary>The format of media of proxies only that a copy wrote, which a Chronos before phase 5c reads too.</summary>
|
||||
public const int ProxiesFormatVersion = 1;
|
||||
|
||||
/// <summary>The format these media are written in: 2 when they hold originals (or name one) or were cleaned, else 1.</summary>
|
||||
[JsonIgnore]
|
||||
public int WrittenFormatVersion => HoldsOriginals || IsCleaned || Frames.Any(f => f.HasOriginal) ? CurrentFormatVersion : ProxiesFormatVersion;
|
||||
|
||||
/// <summary>The frames' photos in index order, as project positions name them, with the encodings conversions joined.</summary>
|
||||
[JsonIgnore]
|
||||
@@ -115,6 +161,17 @@ public sealed record WorkspaceMedia(string Format, int FormatVersion, string Kin
|
||||
/// <summary>The frames held, as the processing engine reads them.</summary>
|
||||
public IReadOnlyList<Frame> ToFrames() => [.. Frames.Select(f => f.ToFrame(SequenceId))];
|
||||
|
||||
/// <summary>The frames over the originals the workspace holds (<see cref="WorkspaceFrame.ToOriginalFrame"/>), as a local render reads them.</summary>
|
||||
public IReadOnlyList<Frame> ToOriginalFrames() => [.. Frames.Select(f => f.ToOriginalFrame(SequenceId))];
|
||||
|
||||
/// <summary>The clean-up removed the files of these media (<see cref="Cleaned"/>): nothing to edit until they are copied again.</summary>
|
||||
[JsonIgnore]
|
||||
public bool IsCleaned => Cleaned is not null;
|
||||
|
||||
/// <summary>Media of kind <see cref="BundleMedia.Originals"/>: the proxies plus the originals the frames name.</summary>
|
||||
[JsonIgnore]
|
||||
public bool HoldsOriginals => Kind == BundleMedia.Originals;
|
||||
|
||||
/// <summary>
|
||||
/// These media with their photos named as <paramref name="home"/> names them now (owner review 2, R8): a frame copied
|
||||
/// before the home hashed its photo (a folder adopted, verified since) takes the SHA-256 the home's frame of that id has
|
||||
|
||||
Reference in new issue
Block a user