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

handle local file deletion events

Browse Source
This commit is contained in:
David Stainton 2015-06-10 14:43:13 -07:00 committed by Daira Hopwood
parent e68b09b081
commit 8b20399796
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,8 +98,9 @@ class MagicFolder(service.MultiService):
self._notifier.watch(self._local_path, mask=self.mask, callbacks=[self._notify], self._notifier.watch(self._local_path, mask=self.mask, callbacks=[self._notify],
recursive=True) recursive=True)
def _check_db_file(self, childpath): def _db_file_is_uploaded(self, childpath):
# returns True if the file must be uploaded. """_db_file_is_uploaded returns true if the file was previously uploaded
"""
assert self._db != None assert self._db != None
r = self._db.check_file(childpath) r = self._db.check_file(childpath)
filecap = r.was_uploaded() filecap = r.was_uploaded()
@ -134,8 +135,8 @@ class MagicFolder(service.MultiService):
# recurse on the child directory # recurse on the child directory
self._scan(childpath) self._scan(childpath)
elif isfile: elif isfile:
must_upload = self._check_db_file(childpath) is_uploaded = self._db_file_is_uploaded(childpath)
if must_upload: if not is_uploaded:
self._append_to_deque(childpath) self._append_to_deque(childpath)
else: else:
self.warn("WARNING: cannot backup special file %s" % quote_local_unicode_path(childpath)) self.warn("WARNING: cannot backup special file %s" % quote_local_unicode_path(childpath))
@ -214,10 +215,26 @@ class MagicFolder(service.MultiService):
self._log("drop-upload: notified object %r disappeared " self._log("drop-upload: notified object %r disappeared "
"(this is normal for temporary objects)" % (path,)) "(this is normal for temporary objects)" % (path,))
self._stats_provider.count('magic_folder.objects_disappeared', 1) self._stats_provider.count('magic_folder.objects_disappeared', 1)
return None
# XXX todo: check if file exists in magic folder db
# ...
if not self._db_file_is_uploaded(path):
return NoSuchChildError("not uploading non-existent file")
else:
# XXX ...
u = Data("", self._convergence)
d2 = self._parent.add_file(name, u, overwrite=True)
def get_metadata(d):
return self._parent.get_metadata_for(name)
def set_deleted(metadata):
metadata['version'] += 1
metadata['deleted'] = True
return self._parent.set_metadata_for(name, metadata)
d2.addCallback(get_metadata)
d2.addCallback(set_deleted)
return NoSuchChildError("not uploading non-existent file")
elif os.path.islink(path): elif os.path.islink(path):
raise Exception("symlink not being processed") raise Exception("symlink not being processed")
if os.path.isdir(path): if os.path.isdir(path):
return _add_dir(name) return _add_dir(name)
elif os.path.isfile(path): elif os.path.isfile(path):