chore(playout): restructure modules (#1971)

playout/libretime_playout/main.py

@@ -21,13 +21,13 @@ from loguru import logger
 
 from .config import CACHE_DIR, RECORD_DIR, Config
 from .liquidsoap.version import LIQUIDSOAP_MIN_VERSION, parse_liquidsoap_version
-from .listenerstat import ListenerStat
+from .message_handler import PypoMessageHandler
-from .pypofetch import PypoFetch
+from .player.fetch import PypoFetch
-from .pypofile import PypoFile
+from .player.file import PypoFile
-from .pypoliquidsoap import PypoLiquidsoap
+from .player.liquidsoap import PypoLiquidsoap
-from .pypomessagehandler import PypoMessageHandler
+from .player.push import PypoPush
-from .pypopush import PypoPush
 from .recorder import Recorder
+from .stats import ListenerStat
 from .timeout import ls_timeout
 
 

playout/libretime_playout/player/fetch.py

@@ -16,9 +16,9 @@ from libretime_api_client import version1 as v1_api_client
 from libretime_api_client import version2 as api_client
 from loguru import logger
 
-from .config import CACHE_DIR, POLL_INTERVAL, Config
+from ..config import CACHE_DIR, POLL_INTERVAL, Config
+from ..timeout import ls_timeout
 from .schedule import get_schedule
-from .timeout import ls_timeout
 
 
 def keyboardInterruptHandler(signum, frame):

playout/libretime_playout/player/liquidsoap.py

@@ -3,9 +3,9 @@ from datetime import datetime, timedelta
 
 from loguru import logger
 
+from ..utils import seconds_between
 from .events import EventKind
-from .telnetliquidsoap import TelnetLiquidsoap
+from .liquidsoap_gateway import TelnetLiquidsoap
-from .utils import seconds_between
 
 
 class PypoLiquidsoap:

playout/libretime_playout/player/liquidsoap_gateway.py

@@ -3,7 +3,7 @@ import traceback
 
 from loguru import logger
 
-from .timeout import ls_timeout
+from ..timeout import ls_timeout
 
 
 def create_liquidsoap_annotation(media):

playout/libretime_playout/player/push.py

@@ -9,9 +9,9 @@ from threading import Thread
 from libretime_api_client import version1 as api_client
 from loguru import logger
 
-from .config import PUSH_INTERVAL, Config
+from ..config import PUSH_INTERVAL, Config
-from .pypoliqqueue import PypoLiqQueue
+from ..timeout import ls_timeout
-from .timeout import ls_timeout
+from .queue import PypoLiqQueue
 
 
 def is_stream(media_item):

playout/libretime_playout/player/queue.py

@@ -8,7 +8,7 @@ from threading import Thread
 
 from loguru import logger
 
-from .utils import seconds_between
+from ..utils import seconds_between
 
 
 def keyboardInterruptHandler(signum, frame):

playout/libretime_playout/testpypoliqqueue.py

@@ -7,8 +7,8 @@ from threading import Lock
 from libretime_shared.logging import TRACE, setup_logger
 from loguru import logger
 
-from .pypoliqqueue import PypoLiqQueue
+from .player.liquidsoap_gateway import TelnetLiquidsoap
-from .telnetliquidsoap import TelnetLiquidsoap
+from .player.queue import PypoLiqQueue
 
 
 def keyboardInterruptHandler(signum, frame):

playout/libretime_playout/timeout.py

@@ -1,6 +1,6 @@
 import threading
 
-from . import pypofetch
+from .player import fetch
 
 
 def __timeout(func, timeout_duration, default, args, kwargs):
@@ -26,7 +26,7 @@ def __timeout(func, timeout_duration, default, args, kwargs):
             # fails again then there is something critically wrong...
             if first_attempt:
                 # restart liquidsoap
-                pypofetch.PypoFetch.ref.restart_liquidsoap()
+                fetch.PypoFetch.ref.restart_liquidsoap()
             else:
                 raise Exception("Thread did not terminate")
         else:

playout/tests/player/schedule_test.py

@@ -1,4 +1,4 @@
-from libretime_playout.schedule import get_schedule
+from libretime_playout.player.schedule import get_schedule
 
 
 class ApiClientServicesMock: