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

convert _real_notify

Browse Source
This commit is contained in:
Jean-Paul Calderone 2019-02-25 16:26:37 -05:00
parent c3e50a4536
commit 03f480e5be
1 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,9 @@ from allmydata.util import (
yamlutil, yamlutil,
eliotutil, eliotutil,
) )
from allmydata.util.fake_inotify import (
humanReadableMask,
)
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 ( from allmydata.util.fileutil import (
@ -692,6 +695,27 @@ NOTIFIED = ActionType(
u"Magic-Folder received a notification of a local filesystem change for a certain path.", u"Magic-Folder received a notification of a local filesystem change for a certain path.",
) )
_EVENTS = Field.for_types(
u"events",
[int, long],
u"Details about a filesystem event generating a notification event.",
humanReadableMask,
)
_NON_DIR_CREATED = Field.for_types(
u"non_dir_created",
[bool],
u"A creation event was for a non-directory and requires no further inspection.",
)
REACT_TO_INOTIFY = ActionType(
u"magic-folder:reactor-to-inotify",
[_EVENTS],
[_IGNORED, _NON_DIR_CREATED, _ALREADY_PENDING],
u"Magic-Folder is processing a notification from inotify(7) (or a clone) about a filesystem event.",
)
class QueueMixin(HookMixin): class QueueMixin(HookMixin):
""" """
A parent class for Uploader and Downloader that handles putting A parent class for Uploader and Downloader that handles putting
@ -1093,7 +1117,16 @@ class Uploader(QueueMixin):
write_traceback() write_traceback()
def _real_notify(self, opaque, path, events_mask): def _real_notify(self, opaque, path, events_mask):
self._log("inotify event %r, %r, %r\n" % (opaque, path, ', '.join(self._inotify.humanReadableMask(events_mask)))) action = REACT_TO_INOTIFY(
# We could think about logging opaque here but ... it's opaque.
# All can do is id() or repr() it and neither of those actually
# produces very illuminating results. We drop opaque on the
# floor, anyway.
events=events_mask,
)
success_fields = dict(non_dir_created=False, already_pending=False, ignored=False)
with action:
relpath_u = self._get_relpath(path) relpath_u = self._get_relpath(path)
# We filter out IN_CREATE events not associated with a directory. # We filter out IN_CREATE events not associated with a directory.
@ -1105,17 +1138,15 @@ class Uploader(QueueMixin):
if ((events_mask & self._inotify.IN_CREATE) != 0 and if ((events_mask & self._inotify.IN_CREATE) != 0 and
(events_mask & self._inotify.IN_ISDIR) == 0): (events_mask & self._inotify.IN_ISDIR) == 0):
self._log("ignoring event for %r (creation of non-directory)\n" % (relpath_u,)) success_fields[u"non_dir_created"] = True
return elif relpath_u in self._pending:
if relpath_u in self._pending: success_fields[u"already_pending"] = True
self._log("not queueing %r because it is already pending" % (relpath_u,)) elif magicpath.should_ignore_file(relpath_u):
return success_fields[u"ignored"] = True
if magicpath.should_ignore_file(relpath_u): else:
self._log("ignoring event for %r (ignorable path)" % (relpath_u,))
return
self._add_pending(relpath_u) self._add_pending(relpath_u)
self._call_hook(path, 'inotify') self._call_hook(path, 'inotify')
action.add_success_fields(**success_fields)
def _process(self, item): def _process(self, item):
""" """