Reset locks

frontend/sync-client/src/sync-operations/document-locks.ts

@@ -47,4 +47,9 @@ export class DocumentLocks {
 			this.locked.delete(relativePath);
 		}
 	}
+
+	public reset(): void {
+		this.locked.clear();
+		this.waiters.clear();
+	}
 }

frontend/sync-client/src/sync-operations/syncer.ts

@@ -157,6 +157,7 @@ export class Syncer {
 		this.remainingOperationsListeners.forEach((listener) => {
 			listener(0);
 		});
+		this.internalSyncer.reset();
 	}
 
 	private async syncRemotelyUpdatedFile(
@@ -214,7 +215,7 @@ export class Syncer {
 							);
 
 						this.logger.debug(
-							`Document ${relativePath} was not found under its current path in the database but was found under a different path ${originalFile[0]}, scheduling sync to move it`
+							`Document '${originalFile[0]}' was not found under its current path in the database but was found under a different path (${relativePath}), scheduling sync to move it`
 						);
 						return this.internalSyncer.unrestrictedSyncLocallyUpdatedFile(
 							{

frontend/sync-client/src/sync-operations/unrestricted-syncer.ts

@@ -527,7 +527,11 @@ export class UnrestrictedSyncer {
 		}
 	}
 
-	public async tryIncrementVaultUpdateId(
+	public reset(): void {
+		this.locks.reset();
+	}
+
+	private async tryIncrementVaultUpdateId(
 		responseVaultUpdateId: number
 	): Promise<void> {
 		if (this.database.getLastSeenUpdateId() === responseVaultUpdateId - 1) {