fix(SyncProcess): Fix URL collisions on NC Bookmarks

Signed-off-by: Marcel Klehr <[email protected]>
floccusaddon · Dec 24, 2024 · d244f6d · d244f6d
1 parent e3e6b93
commit d244f6d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 7 deletions.
diff --git a/src/lib/strategies/Default.ts b/src/lib/strategies/Default.ts
@@ -487,18 +487,47 @@ export default class SyncProcess {
       localScanner = new Scanner(
         this.cacheTreeRoot,
         this.localTreeRoot,
-        (oldItem, newItem) =>
-          (oldItem.type === newItem.type && String(oldItem.id) === String(newItem.id)),
+        (oldItem, newItem) => {
+          if (oldItem.type !== newItem.type) {
+            return false
+          }
+          if (oldItem.type === 'folder') {
+            if (String(oldItem.id) === String(newItem.id)) {
+              return true
+            }
+          }
+          if (oldItem.type === 'bookmark' && newItem.type === 'bookmark') {
+            if (String(oldItem.id) === String(newItem.id) && oldItem.url === newItem.url) {
+              return true
+            }
+          }
+          return false
+        },
         this.preserveOrder
       )
       serverScanner = new Scanner(
         this.cacheTreeRoot,
         this.serverTreeRoot,
         // We also allow canMergeWith here, because e.g. for NextcloudFolders the id of moved bookmarks changes (because their id is "<bookmarkID>;<folderId>")
         (oldItem, newItem) => {
-          if ((oldItem.type === newItem.type && Mappings.mappable(mappingsSnapshot, oldItem, newItem)) || (oldItem.type === 'bookmark' && oldItem.canMergeWith(newItem))) {
-            newMappings.push([oldItem, newItem])
-            return true
+          if (oldItem.type !== newItem.type) {
+            return false
+          }
+          if (oldItem.type === 'folder') {
+            if (Mappings.mappable(mappingsSnapshot, oldItem, newItem)) {
+              newMappings.push([oldItem, newItem])
+              return true
+            }
+          }
+          if (oldItem.type === 'bookmark' && newItem.type === 'bookmark') {
+            if (Mappings.mappable(mappingsSnapshot, oldItem, newItem) && oldItem.url === newItem.url) {
+              newMappings.push([oldItem, newItem])
+              return true
+            }
+            if (oldItem.canMergeWith(newItem)) {
+              newMappings.push([oldItem, newItem])
+              return true
+            }
           }
           return false
         },
@@ -882,7 +911,6 @@ export default class SyncProcess {
     }
 
     if (action.payload instanceof Folder && action.payload.children.length && action.oldItem instanceof Folder) {
-
       // Fix for Unidirectional reverted REMOVEs, for all other strategies this should be a noop
       action.payload.children.forEach((item) => {
         item.parentId = id

diff --git a/src/test/test.js b/src/test/test.js
@@ -5284,8 +5284,8 @@ describe('Floccus', function() {
                   new Folder({
                     title: 'Window 0',
                     children: [
-                      new Bookmark({ title: 'Example Domain', url: 'https://example.org/#test3' }),
                       new Bookmark({ title: 'Example Domain', url: 'https://example.org/#test2' }),
+                      new Bookmark({ title: 'Example Domain', url: 'https://example.org/#test3' }),
                       new Bookmark({ title: 'Example Domain', url: 'https://example.org/#test4' }),
                     ]
                   })