From: Daira Hopwood Date: Tue, 15 Sep 2015 17:42:55 +0000 (+0100) Subject: Fix path handling in Downloader._process. X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=ef5ce70c285366ba84ed64c3baf77560273b9c96;p=tahoe-lafs%2Ftahoe-lafs.git Fix path handling in Downloader._process. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index c654bca5..c6a00511 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -519,11 +519,11 @@ class Downloader(QueueMixin): (name, file_node, metadata) = item d = file_node.download_best_version() def succeeded(res): - def do_update_db(result, is_conflicted=False): + 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() - full_path = fileutil.abspath_expanduser_unicode(name, base=self._local_path_u) - if is_conflicted: - full_path = full_path + u".conflict" # XXX do we want to mark the conflicted in the db??? try: s = os.stat(full_path) except: @@ -532,8 +532,6 @@ class Downloader(QueueMixin): 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) - d2.addCallback(lambda result: self._write_downloaded_file(name, result, self._local_path_u)) d2.addCallback(do_update_db) # XXX handle failure here with addErrback... self._count('objects_downloaded')