enh(tabs): Make merge strategy work with tabs

reset cache upon browser start and change mergable scanner argument for tabs

Signed-off-by: Marcel Klehr <[email protected]>

Author: marcelklehr

src/lib/Account.ts

@@ -208,7 +208,7 @@ export default class Account {
 
       // main sync steps:
       mappings = await this.storage.getMappings()
-      const cacheTree = localResource.constructor.name !== 'LocalTabs' ? await this.storage.getCache() : new Folder({title: '', id: 'tabs', location: ItemLocation.LOCAL})
+      const cacheTree = await this.storage.getCache()
 
       let continuation = await this.storage.getCurrentContinuation()
 
@@ -280,12 +280,10 @@ export default class Account {
       await this.setData({ ...this.getData(), scheduled: false, syncing: 1 })
 
       // update cache
-      if (localResource.constructor.name !== 'LocalTabs') {
-        const cache = (await localResource.getBookmarksTree()).clone(false)
-        this.syncProcess.filterOutUnacceptedBookmarks(cache)
-        this.syncProcess.filterOutUnmappedItems(cache, await mappings.getSnapshot())
-        await this.storage.setCache(cache)
-      }
+      const cache = (await localResource.getBookmarksTree()).clone(false)
+      this.syncProcess.filterOutUnacceptedBookmarks(cache)
+      this.syncProcess.filterOutUnmappedItems(cache, await mappings.getSnapshot())
+      await this.storage.setCache(cache)
 
       if (this.server.onSyncComplete) {
         await this.server.onSyncComplete()

src/lib/browser/BrowserController.js

@@ -167,6 +167,9 @@ export default class BrowserController {
         }
       }
     })
+
+    // Run some things on browser startup
+    browser.runtime.onStartup.addListener(this.onStartup)
   }
 
   async _receiveEvent(data, sendResponse) {
@@ -412,7 +415,7 @@ export default class BrowserController {
     }
   }
 
-  async onLoad() {
+  async onStartup() {
     const accounts = await Account.getAllAccounts()
     await Promise.all(
       accounts.map(async acc => {
@@ -423,9 +426,14 @@ export default class BrowserController {
             scheduled: acc.getData().enabled,
           })
         }
+        if (acc.getData().localRoot === 'tabs') {
+          await acc.init()
+        }
       })
     )
+  }
 
+  async onLoad() {
     browser.storage.local.get('telemetryEnabled').then(async d => {
       if (!d.telemetryEnabled) {
         return

src/lib/strategies/Default.ts

@@ -27,6 +27,7 @@ import { CancelledSyncError, FailsafeError } from '../../errors/Error'
 
 import NextcloudBookmarksAdapter from '../adapters/NextcloudBookmarks'
 import CachingAdapter from '../adapters/Caching'
+import LocalTabs from '../LocalTabs'
 
 const ACTION_CONCURRENCY = 12
 
@@ -424,27 +425,55 @@ export default class SyncProcess {
 
     const newMappings = []
 
-    // if we have the cache available, Diff cache and both trees
-    const localScanner = new Scanner(
-      this.cacheTreeRoot,
-      this.localTreeRoot,
-      (oldItem, newItem) =>
-        (oldItem.type === newItem.type && String(oldItem.id) === String(newItem.id)),
-      this.preserveOrder
-    )
-    const 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
-        }
-        return false
-      },
-      this.preserveOrder
-    )
+    let localScanner, serverScanner
+    if (this.localTree instanceof LocalTabs) {
+      // if we have the cache available, Diff cache and both trees
+      localScanner = new Scanner(
+        this.cacheTreeRoot,
+        this.localTreeRoot,
+        // We also allow canMergeWith for folders here, because Window IDs are not stable
+        (oldItem, newItem) =>
+          (oldItem.type === newItem.type && String(oldItem.id) === String(newItem.id)) || (oldItem.type === 'folder' && oldItem.canMergeWith(newItem)),
+        this.preserveOrder,
+      )
+      serverScanner = new Scanner(
+        this.cacheTreeRoot,
+        this.serverTreeRoot,
+        // We also allow canMergeWith here
+        // (for bookmarks, because e.g. for NextcloudFolders the id of moved bookmarks changes (because their id is "<bookmarkID>;<folderId>")
+        // (for folders because Window IDs are not stable)
+        (oldItem, newItem) => {
+          if ((oldItem.type === newItem.type && Mappings.mappable(mappingsSnapshot, oldItem, newItem)) || (oldItem.canMergeWith(newItem))) {
+            newMappings.push([oldItem, newItem])
+            return true
+          }
+          return false
+        },
+        this.preserveOrder,
+      )
+    } else {
+      // if we have the cache available, Diff cache and both trees
+      localScanner = new Scanner(
+        this.cacheTreeRoot,
+        this.localTreeRoot,
+        (oldItem, newItem) =>
+          (oldItem.type === newItem.type && String(oldItem.id) === String(newItem.id)),
+        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
+          }
+          return false
+        },
+        this.preserveOrder
+      )
+    }
     Logger.log('Calculating diffs for local and server trees relative to cache tree')
     const localScanResult = await localScanner.run()
     const serverScanResult = await serverScanner.run()