refactoring

[photosort.git] / src / dirtrigger.py

diff --git a/src/dirtrigger.py b/src/dirtrigger.py
index 2ea981ccd6afd66cd678d84df9c8dd91f038eb61..0ca4a4d03c13fd51496baae0c02b7b2dc20db86b 100644 (file)
--- a/src/dirtrigger.py
+++ b/src/dirtrigger.py
@@ -4,13 +4,13 @@ from watchdog.events import DirDeletedEvent, FileDeletedEvent, FileSystemEventHa
 from watchdog.observers import Observer
 
 class DirTrigger(FileSystemEventHandler):
-    COOL_TIME = 10
-    MAX_TIME = 86400
 
-    def __init__(self, dir_path):
+    def __init__(self, dir_path, cool_time, max_time):
         self._got_event = False
         self._last_event_time = 0.0
         self._last_reset_time = 0.0
+        self._cool_time = cool_time
+        self._max_time = max_time
         self._lock = threading.Lock()
         self._observer = Observer()
         self._observer.schedule(self, path=dir_path, recursive=True)
@@ -24,15 +24,20 @@ class DirTrigger(FileSystemEventHandler):
     def is_triggering(self):
         self._lock.acquire()
         try:
+            now = time.time()
             return ( self._got_event and
-                     (time.time() - self._last_event_time > DirTrigger.COOL_TIME) ) or \
-                     time.time() - self._last_reset_time > DirTrigger.MAX_TIME
+                     (now - self._last_event_time > self._cool_time) ) or \
+                     now - self._last_reset_time > self._max_time
         finally:
             self._lock.release()
 
     def reset(self):
-        self._got_event = False
-        self._last_reset_time = time.time()
+        self._lock.acquire()
+        try:
+            self._got_event = False
+            self._last_reset_time = time.time()
+        finally:
+            self._lock.release()
 
     def on_any_event(self, event):
         if event.event_type == FileDeletedEvent or event.event_type == DirDeletedEvent: