feat: single setup, mass-pass progress, per-server homes, Desktop shares its library (owner review 5, v1.1.0) (#68)
CI / Build and test (push) Successful in 11m36s
CI / Windows tests and installer (push) Skipped
CI / YAML check (push) Successful in 12s
Release / Build, test and publish (push) Successful in 14m56s
CI / PostgreSQL 16 integration (push) Successful in 10m11s
CI / PostgreSQL 17 integration (push) Successful in 10m15s
CI / Docker image (push) Successful in 45s
Release / Server image (push) Successful in 4m55s
CI / Build and test (push) Successful in 11m36s
CI / Windows tests and installer (push) Skipped
CI / YAML check (push) Successful in 12s
Release / Build, test and publish (push) Successful in 14m56s
CI / PostgreSQL 16 integration (push) Successful in 10m11s
CI / PostgreSQL 17 integration (push) Successful in 10m15s
CI / Docker image (push) Successful in 45s
Release / Server image (push) Successful in 4m55s
Co-authored-by: Alberto Balbo <alberto.balbo.96@gmail.com>
This commit was merged in pull request #68.
This commit is contained in:
1 parent
988068ee8e
commit
20d64af4a4
793 files changed
+23882
-2096
No files matched your search
@@ -43,6 +43,53 @@ internal sealed class SyncLinkStore(ChronosDatabase db)
|
||||
public Task DeleteAsync(string server, Guid remoteId, CancellationToken cancellationToken) =>
|
||||
_db.ExecuteAsync("DELETE FROM sync_links WHERE server = $1 AND remote_id = $2", [server, remoteId], cancellationToken);
|
||||
|
||||
/// <summary>
|
||||
/// Moves every link of <paramref name="from"/> to <paramref name="to"/> in one transaction (owner review 5, #66: an address
|
||||
/// key becomes the server's id key). Where <paramref name="to"/> already links the same server sequence, or the same local
|
||||
/// copy, the row compared last (<see cref="SyncLink.SyncedAt"/>, never compared counting oldest) is kept and the other
|
||||
/// deleted: link rows are recomputed by the next comparison, so nothing is lost.
|
||||
/// </summary>
|
||||
public async Task<(int Moved, int Dropped)> RekeyAsync(string from, string to, CancellationToken cancellationToken)
|
||||
{
|
||||
ArgumentException.ThrowIfNullOrWhiteSpace(from);
|
||||
ArgumentException.ThrowIfNullOrWhiteSpace(to);
|
||||
if (string.Equals(from, to, StringComparison.Ordinal)) return (0, 0);
|
||||
return await _db.InTransactionAsync(async session =>
|
||||
{
|
||||
var inner = new DbAccess(session);
|
||||
var old = await inner.ListAsync($"SELECT {Columns} FROM sync_links WHERE server = $1 ORDER BY remote_id", [from], Map, cancellationToken)
|
||||
.ConfigureAwait(false);
|
||||
if (old.Count == 0) return (0, 0);
|
||||
var current = (await inner.ListAsync($"SELECT {Columns} FROM sync_links WHERE server = $1 ORDER BY remote_id", [to], Map, cancellationToken)
|
||||
.ConfigureAwait(false)).ToList();
|
||||
var (moved, dropped) = (0, 0);
|
||||
foreach (var link in old)
|
||||
{
|
||||
var clashes = current.Where(c => c.RemoteId == link.RemoteId || (link.LocalId is { } local && c.LocalId == local)).ToList();
|
||||
if (clashes.Any(c => Newer(c, link)))
|
||||
{
|
||||
await inner.ExecuteAsync("DELETE FROM sync_links WHERE server = $1 AND remote_id = $2", [from, link.RemoteId], cancellationToken).ConfigureAwait(false);
|
||||
dropped++;
|
||||
continue;
|
||||
}
|
||||
foreach (var clash in clashes)
|
||||
{
|
||||
await inner.ExecuteAsync("DELETE FROM sync_links WHERE server = $1 AND remote_id = $2", [to, clash.RemoteId], cancellationToken).ConfigureAwait(false);
|
||||
current.Remove(clash);
|
||||
dropped++;
|
||||
}
|
||||
await inner.ExecuteAsync("UPDATE sync_links SET server = $3 WHERE server = $1 AND remote_id = $2", [from, link.RemoteId, to], cancellationToken)
|
||||
.ConfigureAwait(false);
|
||||
current.Add(link with { Server = to });
|
||||
moved++;
|
||||
}
|
||||
return (moved, dropped);
|
||||
}, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
// The row already under the new key stays on a tie: it is the one the signed-in session works with.
|
||||
static bool Newer(SyncLink kept, SyncLink other) => (kept.SyncedAt ?? DateTimeOffset.MinValue) >= (other.SyncedAt ?? DateTimeOffset.MinValue);
|
||||
}
|
||||
|
||||
/// <summary>Records where a local sequence stands for the Library; touches neither its versions nor its update time.</summary>
|
||||
public Task SetLocalStateAsync(Guid localId, SyncState state, CancellationToken cancellationToken) =>
|
||||
_db.ExecuteAsync("UPDATE sequences SET sync_state = $2 WHERE id = $1 AND sync_state <> $2", [localId, (int)state], cancellationToken);
|
||||
|
||||
Reference in new issue
Block a user