ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-21 16:39:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename deleted files to .backup rather than unlinking them.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood
2015-10-27 17:14:25 +00:00
committed by Brian Warner
parent a043a31860
commit d6bb49b1a6
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
import sys, os import sys, os
import os.path import os.path
import shutil
from collections import deque from collections import deque
import time import time
@ -481,6 +480,15 @@ class WriteFileMixin(object):
fileutil.rename_no_overwrite(replacement_path_u, conflict_path_u) fileutil.rename_no_overwrite(replacement_path_u, conflict_path_u)
return conflict_path_u return conflict_path_u
def _rename_deleted_file(self, abspath_u):
self._log('renaming deleted file to backup: %s' % (abspath_u,))
try:
fileutil.rename_no_overwrite(abspath_u, abspath_u + u'.backup')
except IOError:
# XXX is this the correct error?
self._log("Already gone: '%s'" % (abspath_u,))
return abspath_u
class Downloader(QueueMixin, WriteFileMixin): class Downloader(QueueMixin, WriteFileMixin):
REMOTE_SCAN_INTERVAL = 3 # facilitates tests REMOTE_SCAN_INTERVAL = 3 # facilitates tests
@ -703,7 +711,7 @@ class Downloader(QueueMixin, WriteFileMixin):
else: else:
d.addCallback(lambda ign: file_node.download_best_version()) d.addCallback(lambda ign: file_node.download_best_version())
if metadata.get('deleted', False): if metadata.get('deleted', False):
d.addCallback(lambda result: self._unlink_deleted_file(abspath_u, result)) d.addCallback(lambda ign: self._rename_deleted_file(abspath_u))
else: else:
d.addCallback(lambda contents: self._write_downloaded_file(abspath_u, contents, d.addCallback(lambda contents: self._write_downloaded_file(abspath_u, contents,
is_conflict=is_conflict)) is_conflict=is_conflict))
@ -719,11 +727,3 @@ class Downloader(QueueMixin, WriteFileMixin):
return None return None
d.addErrback(trap_conflicts) d.addErrback(trap_conflicts)
return d return d
def _unlink_deleted_file(self, abspath_u, result):
try:
self._log('unlinking: %s' % (abspath_u,))
shutil.move(abspath_u, abspath_u + '.backup')
except IOError:
self._log("Already gone: '%s'" % (abspath_u,))
return abspath_u