ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-20 21:43:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix path handling in Downloader._process.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-08-31 17:54:08 +01:00
parent 754f99486b
commit 8462a03ed0
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -519,17 +519,21 @@ class Downloader(QueueMixin):
(name, file_node, metadata) = item
d = file_node.download_best_version()
def succeeded(res):
def do_update_db(result):
d2 = defer.succeed(res)
absname = abspath_expanduser_unicode(name, base=self._local_path_u)
d2.addCallback(lambda result: self._write_downloaded_file(absname, result, is_conflict=False))
def do_update_db(full_path):
filecap = file_node.get_uri()
s = os.stat(name)
try:
s = os.stat(full_path)
except:
raise(Exception("wtf downloaded file %s disappeared" % full_path))
size = s[stat.ST_SIZE]
ctime = s[stat.ST_CTIME]
mtime = s[stat.ST_MTIME]
self._db.did_upload_file(filecap, name, metadata['version'], mtime, ctime, size)
d2 = defer.succeed(res)
absname = abspath_expanduser_unicode(name)
d2.addCallback(lambda result: self._write_downloaded_file(absname, result))
d2.addCallback(do_update_db)
# XXX handle failure here with addErrback...
self._count('objects_downloaded')
return d2
def failed(f):