fixing trigger

[photosort.git] / src / dirtrigger.py

diff --git a/src/dirtrigger.py b/src/dirtrigger.py
index 7978df3555dd663d10efe4aabaf3f61a82567ba2..0ca4a4d03c13fd51496baae0c02b7b2dc20db86b 100644 (file)
--- a/src/dirtrigger.py
+++ b/src/dirtrigger.py
@@ -1,16 +1,16 @@
 import threading
 import time
 import threading
 import time

-from watchdog.events import FileSystemEventHandler
+from watchdog.events import DirDeletedEvent, FileDeletedEvent, FileSystemEventHandler

 from watchdog.observers import Observer
 
 class DirTrigger(FileSystemEventHandler):
 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._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)
         self._lock = threading.Lock()
         self._observer = Observer()
         self._observer.schedule(self, path=dir_path, recursive=True)


@@ -24,17 +24,25 @@ class DirTrigger(FileSystemEventHandler):
     def is_triggering(self):
         self._lock.acquire()
         try:
     def is_triggering(self):
         self._lock.acquire()
         try:

+            now = time.time()

             return ( self._got_event and
             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):
         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):
 
     def on_any_event(self, event):

+        if event.event_type == FileDeletedEvent or event.event_type == DirDeletedEvent:
+            return
+

         self._lock.acquire()
         try:
             self._got_event = True
         self._lock.acquire()
         try:
             self._got_event = True