From c4f4f2a1d330d8e09021619bbb8dcaac4df0a602 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Tue, 26 Jul 2016 16:27:51 +0200 Subject: [PATCH] Move actions to separate files --- helpers/action.py | 251 ++-------------------------- helpers/actions/__init__.py | 10 ++ helpers/actions/command.py | 6 + helpers/actions/interrupt_wait.py | 5 + helpers/actions/pause.py | 10 ++ helpers/actions/play.py | 44 +++++ helpers/actions/seek.py | 19 +++ helpers/actions/stop.py | 42 +++++ helpers/actions/stop_all_actions.py | 5 + helpers/actions/unpause.py | 10 ++ helpers/actions/volume.py | 28 ++++ helpers/actions/wait.py | 38 +++++ 12 files changed, 228 insertions(+), 240 deletions(-) create mode 100644 helpers/actions/__init__.py create mode 100644 helpers/actions/command.py create mode 100644 helpers/actions/interrupt_wait.py create mode 100644 helpers/actions/pause.py create mode 100644 helpers/actions/play.py create mode 100644 helpers/actions/seek.py create mode 100644 helpers/actions/stop.py create mode 100644 helpers/actions/stop_all_actions.py create mode 100644 helpers/actions/unpause.py create mode 100644 helpers/actions/volume.py create mode 100644 helpers/actions/wait.py diff --git a/helpers/action.py b/helpers/action.py index 010a6ca..1f374ec 100644 --- a/helpers/action.py +++ b/helpers/action.py @@ -1,23 +1,8 @@ -import threading -import time - from transitions.extensions import HierarchicalMachine as Machine from . import debug_print, error_print +from . import actions class Action: - ACTION_TYPES = [ - 'command', - 'interrupt_wait', - 'pause', - 'play', - 'seek', - 'stop', - 'stop_all_actions', - 'unpause', - 'volume', - 'wait', - ] - STATES = [ 'initial', 'loading', @@ -85,7 +70,7 @@ class Action: # Machine states / events def on_enter_loading(self): - if self.action in self.ACTION_TYPES: + if hasattr(actions, self.action): if 'music' in self.arguments: self.arguments['music'].subscribe_loaded(self.callback_music_loaded) else: @@ -96,7 +81,8 @@ class Action: def on_enter_loaded_running(self): debug_print(self.description()) - getattr(self, self.action)(**self.arguments) + if hasattr(actions, self.action): + getattr(actions, self.action).run(self, **self.arguments) def poll_loaded(self): self.key.callback_action_ready(self, @@ -105,8 +91,10 @@ class Action: # This one cannot be in the Machine state since it would be queued to run # *after* the wait is ended... def interrupt(self): - if getattr(self, self.action + "_interrupt", None): - return getattr(self, self.action + "_interrupt")(**self.arguments) + if getattr(actions, self.action, None) and\ + hasattr(getattr(actions, self.action), 'interrupt'): + return getattr(getattr(actions, self.action), 'interrupt')( + self, **self.arguments) # Helpers def music_list(self, music): @@ -116,225 +104,8 @@ class Action: return self.mapping.open_files.values() def description(self): - if getattr(self, self.action + "_print", None): - return getattr(self, self.action + "_print")(**self.arguments) + if hasattr(actions, self.action): + return getattr(actions, self.action)\ + .description(self, **self.arguments) else: return "unknown action {}".format(self.action) - - # Actions - def command(self, command="", **kwargs): - # FIXME: todo - pass - - def pause(self, music=None, **kwargs): - for music in self.music_list(music): - if music.is_loaded_playing(): - music.pause() - - def unpause(self, music=None, **kwargs): - for music in self.music_list(music): - if music.is_loaded_paused(): - music.unpause() - - def play(self, music=None, fade_in=0, start_at=0, - restart_if_running=False, volume=100, - loop=0, **kwargs): - for music in self.music_list(music): - if restart_if_running: - if music.is_in_use(): - music.stop() - music.play( - volume=volume, - fade_in=fade_in, - start_at=start_at, - loop=loop) - elif not music.is_in_use(): - music.play( - volume=volume, - fade_in=fade_in, - start_at=start_at, - loop=loop) - - def seek(self, music=None, value=0, delta=False, **kwargs): - for music in self.music_list(music): - music.seek(value=value, delta=delta) - - def interrupt_wait(self, wait_id=None): - self.mapping.interrupt_wait(wait_id) - - def stop(self, music=None, fade_out=0, wait=False, - set_wait_id=None, **kwargs): - previous = None - for music in self.music_list(music): - if music.is_loaded_paused() or music.is_loaded_playing(): - if previous is not None: - previous.stop(fade_out=fade_out) - previous = music - else: - music.stop(fade_out=fade_out) - - if previous is not None: - self.waiting_music = previous - previous.stop( - fade_out=fade_out, - wait=wait, - set_wait_id=set_wait_id) - - def stop_all_actions(self, **kwargs): - self.mapping.stop_all_running() - - def volume(self, music=None, value=100, fade=0, delta=False, **kwargs): - if music is not None: - music.set_volume(value, delta=delta, fade=fade) - else: - self.mapping.set_master_volume(value, delta=delta, fade=fade) - - def wait(self, duration=0, music=None, set_wait_id=None, **kwargs): - if set_wait_id is not None: - self.mapping.add_wait_id(set_wait_id, self) - - self.sleep_event = threading.Event() - self.sleep_event_timer = threading.Timer(duration, self.sleep_event.set) - - if music is not None: - music.wait_end() - - self.sleep_event_timer.start() - self.sleep_event.wait() - - # Action messages - def command_print(self, command="", **kwargs): - return "running command {}".format(command) - - def interrupt_wait_print(self, wait_id=None, **kwargs): - return "interrupt wait with id {}".format(wait_id) - - def pause_print(self, music=None, **kwargs): - if music is not None: - return "pausing « {} »".format(music.name) - else: - return "pausing all musics" - - def unpause_print(self, music=None, **kwargs): - if music is not None: - return "unpausing « {} »".format(music.name) - else: - return "unpausing all musics" - - def play_print(self, music=None, fade_in=0, start_at=0, - restart_if_running=False, volume=100, loop=0, **kwargs): - message = "starting " - if music is not None: - message += "« {} »".format(music.name) - else: - message += "all musics" - - if start_at != 0: - message += " at {}s".format(start_at) - - if fade_in != 0: - message += " with {}s fade_in".format(fade_in) - - message += " at volume {}%".format(volume) - - if loop > 0: - message += " {} times".format(loop + 1) - elif loop < 0: - message += " in loop" - - if restart_if_running: - message += " (restarting if already running)" - - return message - - def stop_print(self, music=None, fade_out=0, wait=False, - set_wait_id=None, **kwargs): - - message = "stopping " - if music is not None: - message += "music « {} »".format(music.name) - else: - message += "all musics" - - if fade_out > 0: - message += " with {}s fadeout".format(fade_out) - if wait: - if set_wait_id is not None: - message += " (waiting the end of fadeout, with id {})"\ - .format(set_wait_id) - else: - message += " (waiting the end of fadeout)" - - return message - - def stop_all_actions_print(self, **kwargs): - return "stopping all actions" - - def seek_print(self, music=None, value=0, delta=False, **kwargs): - if delta: - if music is not None: - return "moving music « {} » by {:+d}s" \ - .format(music.name, value) - else: - return "moving all musics by {:+d}s" \ - .format(value) - else: - if music is not None: - return "moving music « {} » to position {}s" \ - .format(music.name, value) - else: - return "moving all musics to position {}s" \ - .format(value) - - def volume_print(self, music=None, - value=100, delta=False, fade=0, **kwargs): - message = "" - if delta: - if music is not None: - message += "{:+d}% to volume of « {} »" \ - .format(value, music.name) - else: - message += "{:+d}% to volume" \ - .format(value) - else: - if music is not None: - message += "setting volume of « {} » to {}%" \ - .format(music.name, value) - else: - message += "setting volume to {}%" \ - .format(value) - - if fade > 0: - message += " with {}s fade".format(fade) - - return message - - def wait_print(self, duration=0, music=None, set_wait_id=None, **kwargs): - message = "" - if music is None: - message += "waiting {}s" \ - .format(duration) - elif duration == 0: - message += "waiting the end of « {} »" \ - .format(music.name) - else: - message += "waiting the end of « {} » + {}s" \ - .format(music.name, duration) - - if set_wait_id is not None: - message += " (setting id = {})".format(set_wait_id) - - return message - - # Interruptions (only for non-"atomic" actions) - def wait_interrupt(self, duration=0, music=None, **kwargs): - if self.sleep_event is not None: - self.sleep_event.set() - self.sleep_event_timer.cancel() - if music is not None: - music.wait_event.set() - - def stop_interrupt(self, music=None, fade_out=0, wait=False, - set_wait_id=None, **kwargs): - if self.waiting_music is not None: - self.waiting_music.wait_event.set() diff --git a/helpers/actions/__init__.py b/helpers/actions/__init__.py new file mode 100644 index 0000000..ea1e800 --- /dev/null +++ b/helpers/actions/__init__.py @@ -0,0 +1,10 @@ +from . import command +from . import interrupt_wait +from . import pause +from . import play +from . import seek +from . import stop +from . import stop_all_actions +from . import unpause +from . import volume +from . import wait diff --git a/helpers/actions/command.py b/helpers/actions/command.py new file mode 100644 index 0000000..96f72fe --- /dev/null +++ b/helpers/actions/command.py @@ -0,0 +1,6 @@ +def run(action, command="", **kwargs): + # FIXME: todo + pass + +def description(action, command="", **kwargs): + return "running command {}".format(command) diff --git a/helpers/actions/interrupt_wait.py b/helpers/actions/interrupt_wait.py new file mode 100644 index 0000000..36766a2 --- /dev/null +++ b/helpers/actions/interrupt_wait.py @@ -0,0 +1,5 @@ +def run(action, wait_id=None): + action.mapping.interrupt_wait(wait_id) + +def description(action, wait_id=None, **kwargs): + return "interrupt wait with id {}".format(wait_id) diff --git a/helpers/actions/pause.py b/helpers/actions/pause.py new file mode 100644 index 0000000..bb27734 --- /dev/null +++ b/helpers/actions/pause.py @@ -0,0 +1,10 @@ +def run(action, music=None, **kwargs): + for music in action.music_list(music): + if music.is_loaded_playing(): + music.pause() + +def description(action, music=None, **kwargs): + if music is not None: + return "pausing « {} »".format(music.name) + else: + return "pausing all musics" diff --git a/helpers/actions/play.py b/helpers/actions/play.py new file mode 100644 index 0000000..fdba95b --- /dev/null +++ b/helpers/actions/play.py @@ -0,0 +1,44 @@ +def run(action, music=None, fade_in=0, start_at=0, + restart_if_running=False, volume=100, + loop=0, **kwargs): + for music in action.music_list(music): + if restart_if_running: + if music.is_in_use(): + music.stop() + music.play( + volume=volume, + fade_in=fade_in, + start_at=start_at, + loop=loop) + elif not music.is_in_use(): + music.play( + volume=volume, + fade_in=fade_in, + start_at=start_at, + loop=loop) + +def description(action, music=None, fade_in=0, start_at=0, + restart_if_running=False, volume=100, loop=0, **kwargs): + message = "starting " + if music is not None: + message += "« {} »".format(music.name) + else: + message += "all musics" + + if start_at != 0: + message += " at {}s".format(start_at) + + if fade_in != 0: + message += " with {}s fade_in".format(fade_in) + + message += " at volume {}%".format(volume) + + if loop > 0: + message += " {} times".format(loop + 1) + elif loop < 0: + message += " in loop" + + if restart_if_running: + message += " (restarting if already running)" + + return message diff --git a/helpers/actions/seek.py b/helpers/actions/seek.py new file mode 100644 index 0000000..467af7d --- /dev/null +++ b/helpers/actions/seek.py @@ -0,0 +1,19 @@ +def run(action, music=None, value=0, delta=False, **kwargs): + for music in action.music_list(music): + music.seek(value=value, delta=delta) + +def description(action, music=None, value=0, delta=False, **kwargs): + if delta: + if music is not None: + return "moving music « {} » by {:+d}s" \ + .format(music.name, value) + else: + return "moving all musics by {:+d}s" \ + .format(value) + else: + if music is not None: + return "moving music « {} » to position {}s" \ + .format(music.name, value) + else: + return "moving all musics to position {}s" \ + .format(value) diff --git a/helpers/actions/stop.py b/helpers/actions/stop.py new file mode 100644 index 0000000..88cc66d --- /dev/null +++ b/helpers/actions/stop.py @@ -0,0 +1,42 @@ +def run(action, music=None, fade_out=0, wait=False, + set_wait_id=None, **kwargs): + previous = None + for music in action.music_list(music): + if music.is_loaded_paused() or music.is_loaded_playing(): + if previous is not None: + previous.stop(fade_out=fade_out) + previous = music + else: + music.stop(fade_out=fade_out) + + if previous is not None: + action.waiting_music = previous + previous.stop( + fade_out=fade_out, + wait=wait, + set_wait_id=set_wait_id) + +def description(action, music=None, fade_out=0, wait=False, + set_wait_id=None, **kwargs): + + message = "stopping " + if music is not None: + message += "music « {} »".format(music.name) + else: + message += "all musics" + + if fade_out > 0: + message += " with {}s fadeout".format(fade_out) + if wait: + if set_wait_id is not None: + message += " (waiting the end of fadeout, with id {})"\ + .format(set_wait_id) + else: + message += " (waiting the end of fadeout)" + + return message + +def interrupt(action, music=None, fade_out=0, wait=False, + set_wait_id=None, **kwargs): + if action.waiting_music is not None: + action.waiting_music.wait_event.set() diff --git a/helpers/actions/stop_all_actions.py b/helpers/actions/stop_all_actions.py new file mode 100644 index 0000000..f3fc5fb --- /dev/null +++ b/helpers/actions/stop_all_actions.py @@ -0,0 +1,5 @@ +def run(action, **kwargs): + action.mapping.stop_all_running() + +def description(action, **kwargs): + return "stopping all actions" diff --git a/helpers/actions/unpause.py b/helpers/actions/unpause.py new file mode 100644 index 0000000..5fa88c3 --- /dev/null +++ b/helpers/actions/unpause.py @@ -0,0 +1,10 @@ +def run(action, music=None, **kwargs): + for music in action.music_list(music): + if music.is_loaded_paused(): + music.unpause() + +def description(action, music=None, **kwargs): + if music is not None: + return "unpausing « {} »".format(music.name) + else: + return "unpausing all musics" diff --git a/helpers/actions/volume.py b/helpers/actions/volume.py new file mode 100644 index 0000000..7dda3c1 --- /dev/null +++ b/helpers/actions/volume.py @@ -0,0 +1,28 @@ +def run(action, music=None, value=100, fade=0, delta=False, **kwargs): + if music is not None: + music.set_volume(value, delta=delta, fade=fade) + else: + action.mapping.set_master_volume(value, delta=delta, fade=fade) + +def description(action, music=None, + value=100, delta=False, fade=0, **kwargs): + message = "" + if delta: + if music is not None: + message += "{:+d}% to volume of « {} »" \ + .format(value, music.name) + else: + message += "{:+d}% to volume" \ + .format(value) + else: + if music is not None: + message += "setting volume of « {} » to {}%" \ + .format(music.name, value) + else: + message += "setting volume to {}%" \ + .format(value) + + if fade > 0: + message += " with {}s fade".format(fade) + + return message diff --git a/helpers/actions/wait.py b/helpers/actions/wait.py new file mode 100644 index 0000000..f7d2a78 --- /dev/null +++ b/helpers/actions/wait.py @@ -0,0 +1,38 @@ +import threading + +def run(action, duration=0, music=None, set_wait_id=None, **kwargs): + if set_wait_id is not None: + action.mapping.add_wait_id(set_wait_id, action) + + action.sleep_event = threading.Event() + action.sleep_event_timer = threading.Timer(duration, action.sleep_event.set) + + if music is not None: + music.wait_end() + + action.sleep_event_timer.start() + action.sleep_event.wait() + +def description(action, duration=0, music=None, set_wait_id=None, **kwargs): + message = "" + if music is None: + message += "waiting {}s" \ + .format(duration) + elif duration == 0: + message += "waiting the end of « {} »" \ + .format(music.name) + else: + message += "waiting the end of « {} » + {}s" \ + .format(music.name, duration) + + if set_wait_id is not None: + message += " (setting id = {})".format(set_wait_id) + + return message + +def interrupt(action, duration=0, music=None, **kwargs): + if action.sleep_event is not None: + action.sleep_event.set() + action.sleep_event_timer.cancel() + if music is not None: + music.wait_event.set() -- 2.41.0