From 313a89ce4909b9e058f80c1a0c132af48f1dd79f Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Thu, 3 Sep 2015 20:16:58 +0100 Subject: [PATCH] Add 'started' hook to Magic Folder uploader. Signed-off-by: Daira Hopwood --- src/allmydata/frontends/magic_folder.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index ecd3117c..6689947a 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -95,7 +95,8 @@ class QueueMixin(HookMixin): self._local_path = to_filepath(local_path_u) self._db = db self._name = name - self._hooks = {'processed': None} + self._hooks = {'processed': None, 'started': None} + self.started_d = self.set_hook('started') if not self._local_path.exists(): raise AssertionError("The '[magic_folder] local.directory' parameter was %s " @@ -180,8 +181,11 @@ class Uploader(QueueMixin): recursive=True) def start_monitoring(self): - d = self._notifier.startReading() - self._count('dirs_monitored') + print "start_monitoring" + d = defer.succeed(None) + d.addCallback(lambda ign: self._notifier.startReading()) + d.addCallback(lambda ign: self._count('dirs_monitored')) + d.addBoth(self._call_hook, 'started') return d def stop(self): -- 2.45.2