ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-30 01:38:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor uploader by inlining _add_file into _process._maybe_upload.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-08-11 15:09:56 +01:00
parent 4850c06c4a
commit 846d61b894
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,10 +287,6 @@ class Uploader(QueueMixin):
precondition(isinstance(path_u, unicode), path_u)
d = defer.succeed(None)
def _add_file(encoded_name_u, version):
uploadable = FileName(path_u, self._client.convergence)
return self._upload_dirnode.add_file(encoded_name_u, uploadable, metadata={"version":version}, overwrite=True)
def _add_dir(encoded_name_u):
self._notifier.watch(to_filepath(path_u), mask=self.mask, callbacks=[self._notify], recursive=True)
uploadable = Data("", self._client.convergence)
@ -362,7 +358,9 @@ class Uploader(QueueMixin):
version = 0
else:
version += 1
d2 = _add_file(encoded_name_u, version)
uploadable = FileName(path_u, self._client.convergence)
d2 = self._upload_dirnode.add_file(encoded_name_u, uploadable, metadata={"version":version}, overwrite=True)
def add_db_entry(filenode):
filecap = filenode.get_uri()
s = os.stat(path_u)