X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=helpers%2Faction.py;h=91456299ee25c6bf072c8cdba1ac796f2c99cbcd;hb=0deb82a57ae3abefd44509dc88c546f6e5a94d1b;hp=69ae96fb8581b5f0bc0006d7841394e37ec87500;hpb=ecaf3148af1d9adff1819f9536f483ebf7c85a95;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/action.py b/helpers/action.py
index 69ae96f..9145629 100644
--- a/helpers/action.py
+++ b/helpers/action.py
@@ -1,4 +1,4 @@
-import pygame
+import threading
 import time
 
 class Action:
@@ -21,6 +21,7 @@ class Action:
 
         self.key = key
         self.arguments = kwargs
+        self.sleep_event = None
 
     def ready(self):
         if 'music' in self.arguments:
@@ -35,7 +36,13 @@ class Action:
     def description(self):
         return getattr(self, self.action + "_print")(**self.arguments)
 
+    def interrupt(self):
+        if getattr(self, self.action + "_interrupt", None):
+            return getattr(self, self.action + "_interrupt")(**self.arguments)
+
+    # Actions
     def command(self, command = "", **kwargs):
+        # FIXME: todo
         pass
 
     def music_list(self, music):
@@ -81,14 +88,15 @@ class Action:
             pass
 
     def wait(self, duration = 0, music = None, **kwargs):
-        # FIXME: Make it stoppable
-        # http://stackoverflow.com/questions/29082268/python-time-sleep-vs-event-wait
-        if music is None:
-            time.sleep(duration)
-        else:
-            # TODO
+        self.sleep_event = threading.Event()
+
+        if music is not None:
             music.wait_end()
 
+        threading.Timer(duration, self.sleep_event.set).start()
+        self.sleep_event.wait()
+
+    # Action messages
     def command_print(self, command = "", **kwargs):
         return "running command {}".format(command)
 
@@ -146,7 +154,19 @@ class Action:
         else:
             return "setting volume to {}%".format(value)
 
-    def wait_print(self, duration, **kwargs):
-        return "waiting {}s".format(duration)
+    def wait_print(self, duration = 0, music = None, **kwargs):
+        if music is None:
+            return "waiting {}s".format(duration)
+        elif duration == 0:
+            return "waiting the end of « {} »".format(music.name)
+        else:
+            return "waiting the end of « {} » + {}s".format(music.name, duration)
 
 
+    # Interruptions
+    def wait_interrupt(self, duration = 0, music = None, **kwargs):
+        if self.sleep_event is not None:
+            self.sleep_event.set()
+        if music is not None:
+            music.wait_event.set()
+