ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-20 17:52:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch meejah/2814.concurrent-magicfolder-writes.0

Browse Source
This commit is contained in:
Brian Warner 2016-08-30 18:50:37 -07:00
commit 0670144d2c
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -785,13 +785,13 @@ class Downloader(QueueMixin, WriteFileMixin):
d.addCallback(lambda ign: self._processing)
return d
def _should_download(self, relpath_u, remote_version):
def _should_download(self, relpath_u, remote_version, remote_uri):
"""
_should_download returns a bool indicating whether or not a remote object should be downloaded.
We check the remote metadata version against our magic-folder db version number;
latest version wins.
"""
self._log("_should_download(%r, %r)" % (relpath_u, remote_version))
self._log("_should_download(%r, %r, %r)" % (relpath_u, remote_version, remote_uri))
if magicpath.should_ignore_file(relpath_u):
self._log("nope")
return False
@ -800,18 +800,21 @@ class Downloader(QueueMixin, WriteFileMixin):
if db_entry is None:
return True
self._log("version %r" % (db_entry.version,))
return (db_entry.version < remote_version)
if db_entry.version < remote_version:
return True
if db_entry.last_downloaded_uri != remote_uri:
return True
return False
def _get_local_latest(self, relpath_u):
"""
_get_local_latest takes a unicode path string checks to see if this file object
exists in our magic-folder db; if not then return None
else check for an entry in our magic-folder db and return the version number.
else check for an entry in our magic-folder db and return it.
"""
if not self._get_filepath(relpath_u).exists():
return None
db_entry = self._db.get_db_entry(relpath_u)
return None if db_entry is None else db_entry.version
return self._db.get_db_entry(relpath_u)
def _get_collective_latest_file(self, filename):
"""
@ -853,11 +856,19 @@ class Downloader(QueueMixin, WriteFileMixin):
self._log("found %r" % (relpath_u,))
file_node, metadata = listing_map[encoded_relpath_u]
local_version = self._get_local_latest(relpath_u)
remote_version = metadata.get('version', None)
self._log("%r has local version %r, remote version %r" % (relpath_u, local_version, remote_version))
local_dbentry = self._get_local_latest(relpath_u)
if local_version is None or remote_version is None or local_version < remote_version:
# XXX FIXME this is *awefully* similar to
# _should_download code in function etc -- can we
# share?
remote_version = metadata.get('version', None)
remote_uri = file_node.get_readonly_uri()
self._log("%r has local dbentry %r, remote version %r, remote uri %r"
% (relpath_u, local_dbentry, remote_version, remote_uri))
if (local_dbentry is None or remote_version is None or
local_dbentry.version < remote_version or
(local_dbentry.version == remote_version and local_dbentry.last_downloaded_uri != remote_uri)):
self._log("%r added to download queue" % (relpath_u,))
if scan_batch.has_key(relpath_u):
scan_batch[relpath_u] += [(file_node, metadata)]
@ -897,7 +908,7 @@ class Downloader(QueueMixin, WriteFileMixin):
for relpath_u in scan_batch.keys():
file_node, metadata = max(scan_batch[relpath_u], key=lambda x: x[1]['version'])
if self._should_download(relpath_u, metadata['version']):
if self._should_download(relpath_u, metadata['version'], file_node.get_readonly_uri()):
to_dl = DownloadItem(
relpath_u,
PercentProgress(file_node.get_size()),