Add last uploaded timestamp comparison for remote conflict detection

diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py
index 54f37faa2500597b4be38e1668ba77da68a41722..4c9741fb2d8501ba1205fbfc0ba43291c01b2133 100644 (file)
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -704,10 +704,12 @@ class Downloader(QueueMixin, WriteFileMixin):
                     if dmd_last_downloaded_uri != local_last_downloaded_uri:
                         is_conflict = True
                         self._count('objects_conflicted')
-
-                #dmd_last_uploaded_uri = metadata.get('last_uploaded_uri', None)
-                #local_last_uploaded_uri = ...
-
+                    else:
+                        dmd_last_uploaded_uri = metadata.get('last_uploaded_uri', None)
+                        local_last_uploaded_uri = self._db.get_last_uploaded_uri(relpath_u)
+                        if dmd_last_uploaded_uri != local_last_uploaded_uri:
+                            is_conflict = True
+                            self._count('objects_conflicted')
             if relpath_u.endswith(u"/"):
                 if metadata.get('deleted', False):
                     self._log("rmdir(%r) ignored" % (abspath_u,))

diff --git a/src/allmydata/magicfolderdb.py b/src/allmydata/magicfolderdb.py
index 0c76a7b012a6cbc3ffd38c32d93032010599bf4b..e3649d4edea3e6db91df162400a454467acc0f95 100644 (file)
--- a/src/allmydata/magicfolderdb.py
+++ b/src/allmydata/magicfolderdb.py
@@ -91,6 +91,22 @@ class MagicFolderDB(object):
         else:
             return row[0]
 
+    def get_last_uploaded_uri(self, relpath_u):
+        """
+        Return the last downloaded uri recorded in the magic folder db.
+        If none are found then return None.
+        """
+        c = self.cursor
+        c.execute("SELECT last_uploaded_uri"
+                  " FROM local_files"
+                  " WHERE path=?",
+                  (relpath_u,))
+        row = self.cursor.fetchone()
+        if not row:
+            return None
+        else:
+            return row[0]
+
     def get_local_file_version(self, relpath_u):
         """
         Return the version of a local file tracked by our magic folder db.