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

fix: expect merge conflicts in notebooks

Browse Source
This commit is contained in:
thecodrr
2022-07-13 12:21:00 +05:00
parent 333ffe6ebb
commit 4e34f33f1d
3 changed files with 60 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/core/api/sync/merger.js
View File

@@ -20,10 +20,13 @@ class Merger {
set: (item) => this._db.notes.merge(item),
},
notebook: {
threshold: 1000,
get: (id) => this._db.notebooks.notebook(id),
set: (item) => this._db.notebooks.merge(item),
conflict: (_local, remote) => this._db.notebooks.merge(remote),
},
content: {
threshold: process.env.NODE_ENV === "test" ? 6 * 1000 : 60 * 1000,
get: (id) => this._db.content.raw(id),
set: (item) => this._db.content.add(item),
conflict: async (local, remote) => {
@@ -138,7 +141,13 @@ class Merger {
}
}
async _mergeItemWithConflicts(remoteItem, get, add, markAsConflicted) {
async _mergeItemWithConflicts(
remoteItem,
get,
add,
markAsConflicted,
threshold
) {
remoteItem = await this._deserialize(remoteItem);
let localItem = await get(remoteItem.id);
@@ -149,15 +158,13 @@ class Merger {
const isModified = localItem.dateModified > this._lastSynced;
if (isModified && !isResolved) {
// If time difference between local item's edits & remote item's edits
// is less than 1 minute, we shouldn't trigger a merge conflict; instead
// is less than threshold, we shouldn't trigger a merge conflict; instead
// we will keep the most recently changed item.
const timeDiff =
Math.max(remoteItem.dateModified, localItem.dateModified) -
Math.min(remoteItem.dateModified, localItem.dateModified);
const ONE_MINUTE =
process.env.NODE_ENV === "test" ? 6 * 1000 : 60 * 1000;
if (timeDiff < ONE_MINUTE) {
if (timeDiff < threshold) {
if (remoteItem.dateModified > localItem.dateModified) {
await add(remoteItem);
}
@@ -188,7 +195,8 @@ class Merger {
item,
definition.get,
definition.set,
definition.conflict
definition.conflict,
definition.threshold
);
} else if (definition.get && definition.set) {
await this._mergeItem(item, definition.get, definition.set);