fix(sync): resolve conflicts against the versions shown, isolate failures, renders on request
- Conflicts are settled against the versions the user was shown; a later change on
either side refuses the choice and compares again. Title, tags, rating and notes
changed differently on both sides are a conflict too (no silent tag union).
- Links are written under the engine's gate and forgotten only after a 404; linked
local copies are read by id; unlinked copies with the same originals are linked
by content.
- A failure on one sequence is recorded on its link; the others are still compared.
- Downloads hash unverified local copies first and restore originals missing here.
- Background proxy downloads give way to the user's requests; "Keep proxies offline"
refreshes the caches of sequences opened with proxies, checks free space and backs
off after a failure.
- Renders travel on request: Send exports (chunked, hash-verified upload keeping the
render id; new POST /sequences/{id}/renders endpoints) and Get exports.
- Server screen: stable row buttons, mockup column grid, Tab through rows, conflict
rows first on the card colour, localised conflict detail, Save both confirmation,
Pause metered uploads, culture switch, Library one-word sync glyphs.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC
This commit is contained in:
48 files changed
+2498
-465
No files matched your search
@@ -12,7 +12,7 @@ namespace Titano.App.Sections;
|
||||
/// <summary>
|
||||
/// Server (BRIEF §12.7, Server.html): address with LAN-discovered servers, connect with trust-on-first-use and login,
|
||||
/// status (name, version, latency, certificate), account and quota, sign out, the options of this PC (render node,
|
||||
/// proxies kept offline, automatic project sync) and the sync table (<see cref="Sync"/>).
|
||||
/// proxies kept offline, automatic project sync, uploads paused on metered networks) and the sync table (<see cref="Sync"/>).
|
||||
/// </summary>
|
||||
public sealed class ServerViewModel : SectionViewModel
|
||||
{
|
||||
@@ -138,7 +138,7 @@ public sealed class ServerViewModel : SectionViewModel
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Keep the proxies of every server sequence without local originals on this PC.</summary>
|
||||
/// <summary>Keep the proxy caches of server sequences opened with proxies up to date on this PC.</summary>
|
||||
public bool KeepProxiesOffline
|
||||
{
|
||||
get => Shell.Services.Settings.KeepProxiesOffline;
|
||||
@@ -152,6 +152,20 @@ public sealed class ServerViewModel : SectionViewModel
|
||||
set => SetSyncOption(value, Shell.Services.Settings.SyncSettingsAutomatically, v => Shell.Services.Settings.SyncSettingsAutomatically = v);
|
||||
}
|
||||
|
||||
/// <summary>Pause uploads while the connection is metered.</summary>
|
||||
public bool PauseUploadsOnMetered
|
||||
{
|
||||
get => Shell.Services.Settings.PauseUploadsOnMetered;
|
||||
set
|
||||
{
|
||||
if (Shell.Services.Settings.PauseUploadsOnMetered == value) return;
|
||||
Shell.Services.Settings.PauseUploadsOnMetered = value;
|
||||
Shell.Services.SaveSettings();
|
||||
Shell.Services.Sync.Uploads.Request();
|
||||
OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Re-reads values another screen changed (Settings › Server).</summary>
|
||||
public void Refresh() => OnPropertyChanged(nameof(RenderNodeOptIn));
|
||||
|
||||
|
||||
Reference in new issue
Block a user