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

fix: ignore newly synced items

Browse Source
This commit is contained in:
thecodrr
2022-03-28 13:31:18 +05:00
parent e81be52386
commit 91ae3bc581
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/core/api/sync/index.js
View File

@@ -77,9 +77,13 @@ export default class Sync {
await this._connection.stop(); await this._connection.stop();
}); });
this._connection.on("SyncItem", async (type, item, current, total) => { let ignoredIds = {};
this._connection.on("SyncItem", async (type, itemJSON, current, total) => {
const item = JSON.parse(itemJSON);
ignoredIds[item.id] = true;
this.stopAutoSync(); this.stopAutoSync();
await this._realtimeMerger.mergeItem(type, JSON.parse(item)); await this._realtimeMerger.mergeItem(type, item);
EV.publish(EVENTS.appRefreshRequested); EV.publish(EVENTS.appRefreshRequested);
console.log("sync item", type, item, current, total); console.log("sync item", type, item, current, total);
sendSyncProgressEvent("download", total, current); sendSyncProgressEvent("download", total, current);
@@ -87,7 +91,8 @@ export default class Sync {
}); });
this._connection.on("RemoteSyncCompleted", async () => { this._connection.on("RemoteSyncCompleted", async () => {
await this._realTimeSync(false, false); await this._realTimeSync(false, false, ignoredIds);
ignoredIds = {};
}); });
} }
@@ -136,7 +141,7 @@ export default class Sync {
await this.startAutoSync(); await this.startAutoSync();
} }
async _realTimeSync(full, force) { async _realTimeSync(full, force, ignoredIds) {
console.log("STARTING REALTIME SYNC"); console.log("STARTING REALTIME SYNC");
if (this._connection.state !== signalr.HubConnectionState.Connected) if (this._connection.state !== signalr.HubConnectionState.Connected)
await this._connection.start(); await this._connection.start();
@@ -179,6 +184,8 @@ export default class Sync {
const total = itemIds.length; const total = itemIds.length;
for (let i = 0; i < total; ++i) { for (let i = 0; i < total; ++i) {
const id = itemIds[i]; const id = itemIds[i];
if (ignoredIds && ignoredIds[id]) continue;
const [arrayKey, itemId] = id.split(":"); const [arrayKey, itemId] = id.split(":");
const array = data[arrayKey] || []; const array = data[arrayKey] || [];