ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-08 03:14:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

re-use log_call_deferred where it is easy to do so

Browse Source
This commit is contained in:
Jean-Paul Calderone 2019-03-01 16:11:32 -05:00
parent 807568e09f
commit 29e3390fb9
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1965,17 +1965,15 @@ class Downloader(QueueMixin, WriteFileMixin):
if item.metadata.get('deleted', False):
d.addCallback(lambda ign: self._rename_deleted_file(abspath_u))
else:
@eliotutil.inline_callbacks
@eliotutil.log_call_deferred(DOWNLOAD_BEST_VERSION.action_type)
def download_best_version(ignored):
with DOWNLOAD_BEST_VERSION():
contents = yield item.file_node.download_best_version(progress=item.progress)
defer.returnValue(
self._write_downloaded_file(
self._local_path_u, abspath_u, contents,
is_conflict=is_conflict,
mtime=item.metadata.get('user_mtime', item.metadata.get('tahoe', {}).get('linkmotime')),
)
)
d = DeferredContext(item.file_node.download_best_version(progress=item.progress))
d.addCallback(lambda contents: self._write_downloaded_file(
self._local_path_u, abspath_u, contents,
is_conflict=is_conflict,
mtime=item.metadata.get('user_mtime', item.metadata.get('tahoe', {}).get('linkmotime')),
))
return d.result
d.addCallback(download_best_version)