From: David Stainton <dstainton415@gmail.com>
Date: Wed, 4 Nov 2015 11:27:31 +0000 (+0100)
Subject: Simply conflict detection by removing nested if statements
X-Git-Url: https://git.rkrishnan.org/%5B/frontends/%22file:/running.html?a=commitdiff_plain;h=e05afdf800b7f4fb464027fd24ee81dd09bdd246;p=tahoe-lafs%2Ftahoe-lafs.git

Simply conflict detection by removing nested if statements
---

diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py
index 063f4ddb..c0c4f051 100644
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -708,25 +708,19 @@ class Downloader(QueueMixin, WriteFileMixin):
         else:
             is_conflict = False
             db_entry = self._db.get_db_entry(relpath_u)
+            dmd_last_downloaded_uri = metadata.get('last_downloaded_uri', None)
+            dmd_last_uploaded_uri = metadata.get('last_uploaded_uri', None)
             if db_entry:
-                dmd_last_downloaded_uri = metadata.get('last_downloaded_uri', None)
-                print "metadata %r" % (metadata,)
-                print "<<<<--- if %r != %r" % (dmd_last_downloaded_uri, db_entry.last_downloaded_uri)
                 if dmd_last_downloaded_uri is not None and db_entry.last_downloaded_uri is not None:
                     if dmd_last_downloaded_uri != db_entry.last_downloaded_uri:
                         is_conflict = True
                         self._count('objects_conflicted')
-                else:
-                    dmd_last_uploaded_uri = metadata.get('last_uploaded_uri', None)
-                    print ">>>>  if %r != %r" % (dmd_last_uploaded_uri, db_entry.last_uploaded_uri)
-                    if dmd_last_uploaded_uri is not None and dmd_last_uploaded_uri != db_entry.last_uploaded_uri:
-                        is_conflict = True
-                        self._count('objects_conflicted')
-                    else:
-                        # XXX todo: mark as conflict if file is in pending upload set
-                        if self._is_upload_pending(relpath_u):
-                            is_conflict = True
-                            self._count('objects_conflicted')
+                elif dmd_last_uploaded_uri is not None and dmd_last_uploaded_uri != db_entry.last_uploaded_uri:
+                    is_conflict = True
+                    self._count('objects_conflicted')
+                elif self._is_upload_pending(relpath_u):
+                    is_conflict = True
+                    self._count('objects_conflicted')
 
             if relpath_u.endswith(u"/"):
                 if metadata.get('deleted', False):