From 52f27dfdc6cefc44cf98bc0af219a31f5989949d Mon Sep 17 00:00:00 2001 From: David Stainton Date: Wed, 4 Nov 2015 12:27:31 +0100 Subject: [PATCH] Simply conflict detection by removing nested if statements --- src/allmydata/frontends/magic_folder.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index 063f4ddb76..c0c4f051f4 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -708,25 +708,19 @@ def fail(res): 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):