1 files changed, 59 insertions, 42 deletions

diff --git a/helpers/action.py b/helpers/action.py
index 1a2abe2..218c316 100644
--- a/helpers/action.py
+++ b/helpers/action.py
@@ -51,58 +51,64 @@ class Action:
             return self.mapping.open_files.values()
 
     # Actions
-    def command(self, command = "", **kwargs):
+    def command(self, command="", **kwargs):
         # FIXME: todo
         pass
 
-    def pause(self, music = None, **kwargs):
+    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):
+    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):
+    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_not_stopped():
                     music.stop()
-                music.play(volume = volume, fade_in = fade_in, start_at = start_at, loop = loop)
-            else:
-                if not music.is_not_stopped():
-                    music.play(volume = volume, fade_in = fade_in, start_at = start_at, loop = loop)
-
-    def seek(self, music = None, value = 0, delta = False, **kwargs):
+                music.play(
+                        volume=volume,
+                        fade_in=fade_in,
+                        start_at=start_at,
+                        loop=loop)
+            elif not music.is_not_stopped():
+                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)
+            music.seek(value=value, delta=delta)
 
-    def stop(self, music = None, fade_out = 0, wait = False, **kwargs):
+    def stop(self, music=None, fade_out=0, wait=False, **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.stop(fade_out=fade_out)
                 previous = music
 
         if previous is not None:
-            previous.stop(fade_out = fade_out, wait = wait)
+            previous.stop(fade_out=fade_out, wait=wait)
 
     def stop_all_actions(self, **kwargs):
         self.mapping.stop_all_running()
 
-    def volume(self, music = None, value = 100, delta = False, **kwargs):
+    def volume(self, music=None, value=100, delta=False, **kwargs):
         if music is not None:
-            music.set_volume(value, delta = delta)
+            music.set_volume(value, delta=delta)
         else:
-            self.mapping.set_master_volume(value, delta = delta)
+            self.mapping.set_master_volume(value, delta=delta)
 
-    def wait(self, duration = 0, music = None, **kwargs):
+    def wait(self, duration=0, music=None, **kwargs):
         self.sleep_event = threading.Event()
 
         if music is not None:
@@ -112,23 +118,23 @@ class Action:
         self.sleep_event.wait()
 
     # Action messages
-    def command_print(self, command = "", **kwargs):
+    def command_print(self, command="", **kwargs):
         return "running command {}".format(command)
 
-    def pause_print(self, music = None, **kwargs):
+    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):
+    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):
+    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)
@@ -153,7 +159,7 @@ class Action:
 
         return message
 
-    def stop_print(self, music = None, fade_out = 0, wait = False, **kwargs):
+    def stop_print(self, music=None, fade_out=0, wait=False, **kwargs):
         message = "stopping "
         if music is not None:
             message += "music « {} »".format(music.name)
@@ -170,41 +176,52 @@ class Action:
     def stop_all_actions_print(self, **kwargs):
         return "stopping all actions"
 
-    def seek_print(self, music = None, value = 0, delta = False, **kwargs):
+    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)
+                return "moving music « {} » by {:+d}s" \
+                        .format(music.name, value)
             else:
-                return "moving all musics by {:+d}s".format(value)
+                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)
+                return "moving music « {} » to position {}s" \
+                        .format(music.name, value)
             else:
-                return "moving all musics to position {}s".format(value)
+                return "moving all musics to position {}s" \
+                        .format(value)
 
-    def volume_print(self, music = None, value = 100, delta = False, **kwargs):
+    def volume_print(self, music=None, value=100, delta=False, **kwargs):
         if delta:
             if music is not None:
-                return "{:+d}% to volume of « {} »".format(value, music.name)
+                return "{:+d}% to volume of « {} »" \
+                        .format(value, music.name)
             else:
-                return "{:+d}% to volume".format(value)
+                return "{:+d}% to volume" \
+                        .format(value)
         else:
             if music is not None:
-                return "setting volume of « {} » to {}%".format(music.name, value)
+                return "setting volume of « {} » to {}%" \
+                        .format(music.name, value)
             else:
-                return "setting volume to {}%".format(value)
+                return "setting volume to {}%" \
+                        .format(value)
 
-    def wait_print(self, duration = 0, music = None, **kwargs):
+    def wait_print(self, duration=0, music=None, **kwargs):
         if music is None:
-            return "waiting {}s".format(duration)
+            return "waiting {}s" \
+                    .format(duration)
         elif duration == 0:
-            return "waiting the end of « {} »".format(music.name)
+            return "waiting the end of « {} »" \
+                    .format(music.name)
         else:
-            return "waiting the end of « {} » + {}s".format(music.name, duration)
+            return "waiting the end of « {} » + {}s" \
+                    .format(music.name, duration)
 
 
     # Interruptions
-    def wait_interrupt(self, duration = 0, music = None, **kwargs):
+    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: