Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-29 00:20:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

core: send sync progress event after merge

Browse Source
This commit is contained in:
Abdullah Atta
2023-09-06 09:58:07 +05:00
parent 77ae71fab1
commit 9b89b328f6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/src/api/sync/index.js
View File

@@ -155,9 +155,6 @@ class Sync {
if (this.connection.state !== signalr.HubConnectionState.Connected)
return;
count += chunk.items.length;
sendSyncProgressEvent(this.db.eventManager, "download", count);
clearTimeout(remoteSyncTimeout);
remoteSyncTimeout = setTimeout(() => {
this.db.eventManager.publish(EVENTS.syncAborted);
@@ -166,6 +163,9 @@ class Sync {
const key = await this.db.user.getEncryptionKey();
const dbLastSynced = await this.db.lastSynced();
await this.processChunk(chunk, key, dbLastSynced, true);
count += chunk.items.length;
sendSyncProgressEvent(this.db.eventManager, "download", count);
});
this.connection.on("PushCompleted", (lastSynced) => {
@@ -252,11 +252,11 @@ class Sync {
if (this.connection.state !== signalr.HubConnectionState.Connected)
return;
await this.processChunk(chunk, key, dbLastSynced);
count += chunk.items.length;
sendSyncProgressEvent(this.db.eventManager, `download`, count);
await this.processChunk(chunk, key, dbLastSynced);
return true;
});
const serverResponse = await this.connection.invoke(