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

WIP

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-07-20 17:27:57 +01:00
parent 2bd93d2e02
commit ad4b4843c2
1 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ from twisted.application import service
from allmydata.interfaces import IDirectoryNode from allmydata.interfaces import IDirectoryNode
from allmydata.util import log from allmydata.util import log
from allmydata.util.fileutil import abspath_expanduser_unicode, precondition_abspath from allmydata.util.fileutil import abspath_expanduser_unicode, precondition_abspath
from allmydata.util.assertutil import precondition
from allmydata.util.encodingutil import listdir_unicode, to_filepath, \ from allmydata.util.encodingutil import listdir_unicode, to_filepath, \
unicode_from_filepath, quote_local_unicode_path, FilenameEncodingError unicode_from_filepath, quote_local_unicode_path, FilenameEncodingError
from allmydata.immutable.upload import FileName, Data from allmydata.immutable.upload import FileName, Data
@ -114,13 +115,13 @@ 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 _should_download(self, path, remote_version): def _should_download(self, relpath_u, remote_version):
""" """
_should_download returns a bool indicating whether or not a remote object should be downloaded. _should_download returns a bool indicating whether or not a remote object should be downloaded.
We check the remote metadata version against our magic-folder db version number; We check the remote metadata version against our magic-folder db version number;
latest version wins. latest version wins.
""" """
v = self._db.get_local_file_version(path) v = self._db.get_local_file_version(relpath_u)
return (v is None or v < remote_version) return (v is None or v < remote_version)
def _get_collective_latest_file(self, filename): def _get_collective_latest_file(self, filename):
@ -132,6 +133,7 @@ class MagicFolder(service.MultiService):
upload_readonly_dircap = self._upload_dirnode.get_readonly_uri() upload_readonly_dircap = self._upload_dirnode.get_readonly_uri()
collective_dirmap_d = self._collective_dirnode.list() collective_dirmap_d = self._collective_dirnode.list()
def do_filter(result): def do_filter(result):
print result
others = [x for x in result.keys() if result[x][0].get_readonly_uri() != upload_readonly_dircap] others = [x for x in result.keys() if result[x][0].get_readonly_uri() != upload_readonly_dircap]
return result, others return result, others
collective_dirmap_d.addCallback(do_filter) collective_dirmap_d.addCallback(do_filter)
@ -365,75 +367,76 @@ class MagicFolder(service.MultiService):
path_u = unicode_from_filepath(path) path_u = unicode_from_filepath(path)
self._append_to_upload_deque(path_u) self._append_to_upload_deque(path_u)
def _process(self, path): def _process(self, path_u):
precondition(isinstance(path_u, unicode), path_u)
d = defer.succeed(None) d = defer.succeed(None)
def _add_file(name, version): def _add_file(encoded_name_u, version):
u = FileName(path, self._convergence) uploadable = FileName(path_u, self._convergence)
return self._upload_dirnode.add_file(name, u, metadata={"version":version}, overwrite=True) return self._upload_dirnode.add_file(encoded_name_u, uploadable, metadata={"version":version}, overwrite=True)
def _add_dir(name): def _add_dir(encoded_name_u):
self._notifier.watch(to_filepath(path), mask=self.mask, callbacks=[self._notify], recursive=True) self._notifier.watch(to_filepath(path_u), mask=self.mask, callbacks=[self._notify], recursive=True)
u = Data("", self._convergence) uploadable = Data("", self._convergence)
name += "@_" encoded_name_u += u"@_"
upload_d = self._upload_dirnode.add_file(name, u, metadata={"version":0}, overwrite=True) upload_d = self._upload_dirnode.add_file(encoded_name_u, uploadable, metadata={"version":0}, overwrite=True)
def _succeeded(ign): def _succeeded(ign):
self._log("created subdirectory %r" % (path,)) self._log("created subdirectory %r" % (path_u,))
self._stats_provider.count('magic_folder.directories_created', 1) self._stats_provider.count('magic_folder.directories_created', 1)
def _failed(f): def _failed(f):
self._log("failed to create subdirectory %r" % (path,)) self._log("failed to create subdirectory %r" % (path_u,))
return f return f
upload_d.addCallbacks(_succeeded, _failed) upload_d.addCallbacks(_succeeded, _failed)
upload_d.addCallback(lambda ign: self._scan(path)) upload_d.addCallback(lambda ign: self._scan(path_u))
return upload_d return upload_d
def _maybe_upload(val): def _maybe_upload(val):
self._upload_pending.remove(path) self._upload_pending.remove(path_u) # FIXME make _upload_pending hold relative paths
relpath = os.path.relpath(path, self._local_dir) relpath_u = os.path.relpath(path_u, self._local_dir)
name = magicpath.path2magic(relpath) encoded_name_u = magicpath.path2magic(relpath_u)
def get_metadata(result): def get_metadata(result):
try: try:
metadata_d = self._upload_dirnode.get_metadata_for(name) metadata_d = self._upload_dirnode.get_metadata_for(encoded_name_u)
except KeyError: except KeyError:
return Failure() return Failure()
return metadata_d return metadata_d
if not os.path.exists(path): if not os.path.exists(path_u):
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_u,))
self._stats_provider.count('magic_folder.objects_disappeared', 1) self._stats_provider.count('magic_folder.objects_disappeared', 1)
d2 = defer.succeed(None) d2 = defer.succeed(None)
if self._db.check_file_db_exists(path): if self._db.check_file_db_exists(path_u): #FIXME relpath_u?
d2.addCallback(get_metadata) d2.addCallback(get_metadata)
def set_deleted(metadata): def set_deleted(metadata):
current_version = self._db.get_local_file_version(path) + 1 current_version = self._db.get_local_file_version(path_u) + 1 #FIXME relpath_u?
metadata['version'] = current_version metadata['version'] = current_version
metadata['deleted'] = True metadata['deleted'] = True
emptyUploadable = Data("", self._convergence) emptyUploadable = Data("", self._convergence)
return self._upload_dirnode.add_file(name, emptyUploadable, overwrite=True, metadata=metadata) return self._upload_dirnode.add_file(encoded_name_u, emptyUploadable, overwrite=True, metadata=metadata)
d2.addCallback(set_deleted) d2.addCallback(set_deleted)
d2.addCallback(lambda x: Exception("file does not exist")) d2.addCallback(lambda x: Exception("file does not exist"))
return d2 return d2
elif os.path.islink(path): elif os.path.islink(path_u):
raise Exception("symlink not being processed") raise Exception("symlink not being processed")
if os.path.isdir(path): if os.path.isdir(path_u):
return _add_dir(name) return _add_dir(encoded_name_u)
elif os.path.isfile(path): elif os.path.isfile(path_u):
version = self._db.get_local_file_version(path) version = self._db.get_local_file_version(path_u) #FIXME relpath_u?
if version is None: if version is None:
version = 0 version = 0
else: else:
version += 1 version += 1
print "NEW VERSION ", version print "NEW VERSION ", version
d2 = _add_file(name, version) d2 = _add_file(encoded_name_u, version)
def add_db_entry(filenode): def add_db_entry(filenode):
filecap = filenode.get_uri() filecap = filenode.get_uri()
s = os.stat(path) s = os.stat(path_u)
size = s[stat.ST_SIZE] size = s[stat.ST_SIZE]
ctime = s[stat.ST_CTIME] ctime = s[stat.ST_CTIME]
mtime = s[stat.ST_MTIME] mtime = s[stat.ST_MTIME]
self._db.did_upload_file(filecap, path, version, mtime, ctime, size) self._db.did_upload_file(filecap, path_u, version, mtime, ctime, size) #FIXME relpath_u?
self._stats_provider.count('magic_folder.files_uploaded', 1) self._stats_provider.count('magic_folder.files_uploaded', 1)
d2.addCallback(add_db_entry) d2.addCallback(add_db_entry)
return d2 return d2
@ -449,7 +452,7 @@ class MagicFolder(service.MultiService):
def _failed(f): def _failed(f):
self._stats_provider.count('magic_folder.objects_queued', -1) self._stats_provider.count('magic_folder.objects_queued', -1)
self._stats_provider.count('magic_folder.objects_failed', 1) self._stats_provider.count('magic_folder.objects_failed', 1)
self._log("%r while processing %r" % (f, path)) self._log("%r while processing %r" % (f, path_u))
return f return f
d.addCallbacks(_succeeded, _failed) d.addCallbacks(_succeeded, _failed)
d.addBoth(self._do_processed_callback) d.addBoth(self._do_processed_callback)