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

Merge pull request #489 from exarkun/magic-folder-cleanups

Browse Source 
Make some trivial magic-folder-related code/doc improvements.
This commit is contained in:
Jean-Paul Calderone 2018-04-20 17:50:44 -04:00 committed by GitHub
commit 933d74c1bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/proposed/magic-folder/filesystem-integration.rst
View File

@ -62,13 +62,15 @@ to the target folder cease for a sufficiently long period of time.
*Detecting filesystem changes* *Detecting filesystem changes*
For the Linux implementation, we will use the inotify Linux kernel For the Linux implementation, we will use the `inotify`_ Linux kernel
subsystem to gather events on the local Magic Folder directory tree. This subsystem to gather events on the local Magic Folder directory tree. This
implementation was already present in Tahoe-LAFS 1.9.0, but needs to be implementation was already present in Tahoe-LAFS 1.9.0, but needs to be
changed to gather directory creation and move events, in addition to the changed to gather directory creation and move events, in addition to the
events indicating that a file has been written that are gathered by the events indicating that a file has been written that are gathered by the
current code. current code.
.. _`inotify`: https://en.wikipedia.org/wiki/Inotify
For the Windows implementation, we will use the ``ReadDirectoryChangesW`` For the Windows implementation, we will use the ``ReadDirectoryChangesW``
Win32 API. The prototype implementation simulates a Python interface to Win32 API. The prototype implementation simulates a Python interface to
the inotify API in terms of ``ReadDirectoryChangesW``, allowing most of the inotify API in terms of ``ReadDirectoryChangesW``, allowing most of

4
src/allmydata/client.py
View File

@ -602,8 +602,8 @@ class _Client(node.Node, pollmixin.PollMixin):
s = magic_folder.MagicFolder( s = magic_folder.MagicFolder(
client=self, client=self,
upload_dircap=mf_config["upload_dircap"].encode('ascii'), upload_dircap=mf_config["upload_dircap"],
collective_dircap=mf_config["collective_dircap"].encode('ascii'), collective_dircap=mf_config["collective_dircap"],
local_path_u=abspath_expanduser_unicode(local_dir_config, base=self.basedir), local_path_u=abspath_expanduser_unicode(local_dir_config, base=self.basedir),
dbfile=abspath_expanduser_unicode(db_filename), dbfile=abspath_expanduser_unicode(db_filename),
umask=self.get_config("magic_folder", "download.umask", 0077), umask=self.get_config("magic_folder", "download.umask", 0077),