andras/vault-link
1
0
Fork 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 1

more fixes

Browse source
This commit is contained in:
Andras Schmelczer 2026-04-25 20:42:34 +01:00
parent 8ce33541a3
commit 7a8c497462
6 changed files with 94 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

13
frontend/sync-client/src/sync-operations/syncer.ts
View file

@ -45,7 +45,6 @@ export class Syncer {
private readonly queue: SyncEventQueue;
private _isFirstSyncStarted = false;
private runningScheduleSyncForOfflineChanges: Promise<void> | undefined;
private drainPromise: Promise<void> | undefined;
private isScanning = false;
@ -75,10 +74,6 @@ export class Syncer {
);
}
public get isFirstSyncStarted(): boolean {
return this._isFirstSyncStarted;
}
public syncLocallyCreatedFile(relativePath: RelativePath): void {
void this.queue.enqueue({
type: SyncEventType.LocalCreate,
@ -121,8 +116,6 @@ export class Syncer {
});
this.ensureDraining();
this._isFirstSyncStarted = true;
}
public async scheduleSyncForOfflineChanges(): Promise<void> {
@ -160,7 +153,6 @@ export class Syncer {
}
public reset(): void {
this._isFirstSyncStarted = false;
this.queue.clearPending();
const current = this.runningScheduleSyncForOfflineChanges;
if (current !== undefined) {
@ -184,6 +176,10 @@ export class Syncer {
private async internalScheduleSyncForOfflineChanges(): Promise<void> {
this.isScanning = true;
// Surface stranded conflict files (e.g. ones we displaced in a prior
// session and never resynced) as regular creates during the scan; the
// queue re-enables conflict filtering when we're done.
this.queue.setIgnoreConflictPaths(false);
try {
while (this.drainPromise !== undefined) {
await this.drainPromise;
@ -203,6 +199,7 @@ export class Syncer {
}
);
} finally {
this.queue.setIgnoreConflictPaths(true);
this.isScanning = false;
}