✨ for new api

Author: userElaina

src/badapple/audio.py

@@ -1,14 +1,11 @@
 import os
-from multiprocessing import Process
-from typing import Tuple
 
 from .util import get_info
-from .players import realias, playa
-from .players import is_player, is_available, get_players, get_availables
+from .players import get_names, get_availables, get_available_player, Player
 
 
 def help_audio() -> None:
-    players = get_players()
+    players = get_names()
     availables = get_availables()
     s = 'usage: badapple --audio_player AUDIO_PLAYER [options] ... \n\n'
     s += get_info() + '\n\navailable AUDIO_PLAYER:\n'
@@ -21,33 +18,20 @@ def help_audio() -> None:
     print(s, end='', flush=True)
 
 
-def preplaya(
+def get_player(
     audio: str,
     player: str,
     video: str = None,
     check_player: bool = True
-) -> Tuple[str, str]:
+) -> None | Player:
     if not audio:
         if not player:
-            return '', ''
+            return None
         if video is None:
             raise FileNotFoundError(audio)
         audio = video
 
     audio = os.path.abspath(audio)
     open(audio, 'rb').close()
 
-    if not is_player(player):
-        raise ValueError('%s is not a player' % player)
-    player = realias(player)
-    if check_player:
-        if not is_available(player):
-            raise ValueError('Player %s is not available' % player)
-
-    return audio, player
-
-
-def p_playa(audio: str, player: str) -> Process:
-    p = Process(target=playa, args=(audio, player))
-    p.start()
-    return p
+    return get_available_player(player, audio, err=True)

src/badapple/play.py

@@ -4,7 +4,7 @@
 from multiprocessing import Process
 
 from .util import get_func, Timer, Font
-from .audio import preplaya, p_playa
+from .audio import get_player
 from .replay import replay
 
 
@@ -57,9 +57,7 @@ def play(
 
     video = os.path.abspath(video)
     open(video, 'rb').close()
-    audio, player = preplaya(audio, player, video, check_player=check_player)
-    if debug:
-        print(audio, player)
+    p = get_player(audio, player, video, check_player=check_player)
 
     x = int(x)
     y = int(y)
@@ -109,9 +107,9 @@ def play(
         timer = Timer(clk)
         print('BEGINNING...', flush=True)
         timer.slp()
-        if audio:
-            p = p_playa(audio, player)
+        if p:
             p_list.append(p)
+            p.start()
             timer.slp(0.1)
         if debug:
             timer.slp(5)

src/badapple/replay.py

@@ -2,7 +2,7 @@
 from multiprocessing import Process
 
 from .util import get_func, Timer
-from .audio import p_playa, preplaya
+from .audio import get_player
 
 
 def replay(
@@ -13,9 +13,7 @@ def replay(
 ) -> None:
     video = os.path.abspath(video)
     open(video, 'r').close()
-    audio, player = preplaya(audio, player, check_player=check_player)
-    if debug:
-        print(audio, player)
+    p = get_player(audio, player, check_player=check_player)
 
     s = open(video, 'r').read().split('\n\n')
     x, y, clk = s[0].split()
@@ -30,9 +28,9 @@ def replay(
     timer = Timer(clk)
     print('BEGINNING...', flush=True)
     timer.slp()
-    if audio:
-        p = p_playa(audio, player)
+    if p:
         p_list.append(p)
+        p.start()
         timer.slp(0.01)
     if debug:
         timer.slp(5)