ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-05 10:39:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix and simplify conflict/overwrite detection.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-11-04 15:11:34 +00:00
parent 118a89e418
commit e2a3b5ff63
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/allmydata/frontends/magic_folder.py
View File

@ -717,21 +717,20 @@ class Downloader(QueueMixin, WriteFileMixin):
raise ConflictError("download failed: already conflicted: %r" % (relpath_u,)) raise ConflictError("download failed: already conflicted: %r" % (relpath_u,))
d.addCallback(fail) d.addCallback(fail)
else: else:
is_conflict = False pathinfo = get_pathinfo(abspath_u)
db_entry = self._db.get_db_entry(relpath_u) db_entry = self._db.get_db_entry(relpath_u)
dmd_last_downloaded_uri = metadata.get('last_downloaded_uri', None) dmd_last_downloaded_uri = metadata.get('last_downloaded_uri', None)
dmd_last_uploaded_uri = metadata.get('last_uploaded_uri', None)
if db_entry: # See <docs/proposed/magic-folder/remote-to-local-sync.rst#conflictoverwrite-decision-algorithm>.
if dmd_last_downloaded_uri is not None and db_entry.last_downloaded_uri is not None: is_conflict = ( not pathinfo.exists # 2a
if dmd_last_downloaded_uri != db_entry.last_downloaded_uri: or self._is_upload_pending(relpath_u) # 2c.i.
is_conflict = True or (db_entry is None or is_new_file(pathinfo, db_entry)) # 2c.ii.
self._count('objects_conflicted') or (dmd_last_downloaded_uri is None or db_entry.last_uploaded_uri is None
elif dmd_last_uploaded_uri is not None and dmd_last_uploaded_uri != db_entry.last_uploaded_uri: or dmd_last_downloaded_uri != db_entry.last_uploaded_uri) # 2c.iii.
is_conflict = True )
self._count('objects_conflicted') if is_conflict:
elif self._is_upload_pending(relpath_u): self._count('objects_conflicted')
is_conflict = True
self._count('objects_conflicted')
if relpath_u.endswith(u"/"): if relpath_u.endswith(u"/"):
if metadata.get('deleted', False): if metadata.get('deleted', False):