andras/vault-link
andras/vault-link
Watch
1
0
Fork
You've already forked vault-link
 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 31

.

Browse source
This commit is contained in:
Andras Schmelczer 2026-09-26 20:22:16 +01:00
commit b07aa589ff
1 changed files with 728 additions and 530 deletions
Download patch file Download diff file Expand all files Collapse all files

18
frontend/sync-client/src/sync-operations/file-manifest.ts
View file

@ -34,7 +34,7 @@ export function resolvePaths(
const ids = Object.keys(proposed).sort(
(a, b) =>
Number(remote[b] === proposed[b]) -
Number(remote[a] === proposed[a]) ||
Number(remote[a] === proposed[a]) ||
(a < b ? -1 : a > b ? 1 : 0)
);
for (const id of ids.filter(
@ -57,12 +57,16 @@ export function mergeFileManifests(
...Object.keys(local),
...Object.keys(remote)
])) {
const path =
local[id] === base[id]
? remote[id]
: remote[id] === base[id]
? local[id]
: remote[id];
let path: string | undefined;
if (local[id] === base[id]) {
path = remote[id];
} else if (remote[id] === base[id]) {
path = local[id];
} else {
path = remote[id];
}
if (path !== undefined) proposed[id] = path;
}
return resolvePaths(proposed, remote);