-import pygame
+import threading
import time
class Action:
self.key = key
self.arguments = kwargs
+ self.sleep_event = None
def ready(self):
if 'music' in self.arguments:
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):
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)
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()
+