core: only delete attachment file (not the metadata) on sync conflict

nusiloot · May 4, 2024 · 523da4e · 523da4e
1 parent de6c815
commit 523da4e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/core/src/api/sync/merger.ts b/packages/core/src/api/sync/merger.ts
@@ -93,14 +93,18 @@ class Merger {
       isDeleted(localItem) ||
       isDeleted(remoteItem) ||
       !localItem.dateUploaded ||
-      !remoteItem.dateUploaded
+      !remoteItem.dateUploaded ||
+      localItem.dateUploaded === remoteItem.dateUploaded
     ) {
       return this.mergeItem(remoteItem, localItem);
     }
 
     if (localItem.dateUploaded > remoteItem.dateUploaded) return;
 
-    const isRemoved = await this.db.attachments.remove(localItem.hash, true);
+    logger.debug("Removing local attachment file due to conflict", {
+      hash: localItem.hash
+    });
+    const isRemoved = await this.db.fs().deleteFile(localItem.hash, true);
     if (!isRemoved)
       throw new Error(
         "Conflict could not be resolved in one of the attachments."