From 1c50b285005d752f825712d75074a67d5c9c404d Mon Sep 17 00:00:00 2001 From: jo Date: Tue, 18 Jan 2022 21:10:17 +0100 Subject: [PATCH] refactor(playout): move constants in config --- playout/libretime_playout/config.py | 3 +++ playout/libretime_playout/pypofetch.py | 4 +--- playout/libretime_playout/pypopush.py | 4 +--- playout/libretime_playout/recorder.py | 5 +---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/playout/libretime_playout/config.py b/playout/libretime_playout/config.py index a5dd2d00d..66a49d116 100644 --- a/playout/libretime_playout/config.py +++ b/playout/libretime_playout/config.py @@ -7,6 +7,9 @@ from typing_extensions import Literal CACHE_DIR = Path.cwd() / "scheduler" RECORD_DIR = Path.cwd() / "recorder" +PUSH_INTERVAL = 2 +POLL_INTERVAL = 400 + class PlayoutConfig(BaseModel): liquidsoap_host: str = "localhost" diff --git a/playout/libretime_playout/pypofetch.py b/playout/libretime_playout/pypofetch.py index 2cc608388..daee6c82f 100644 --- a/playout/libretime_playout/pypofetch.py +++ b/playout/libretime_playout/pypofetch.py @@ -18,7 +18,7 @@ from libretime_api_client import version2 as api_client from loguru import logger from . import pure -from .config import CACHE_DIR, Config +from .config import CACHE_DIR, POLL_INTERVAL, Config from .timeout import ls_timeout @@ -29,8 +29,6 @@ def keyboardInterruptHandler(signum, frame): signal.signal(signal.SIGINT, keyboardInterruptHandler) -POLL_INTERVAL = 400 - class PypoFetch(Thread): def __init__( diff --git a/playout/libretime_playout/pypopush.py b/playout/libretime_playout/pypopush.py index 1b0cbaa02..d5d4b6f29 100644 --- a/playout/libretime_playout/pypopush.py +++ b/playout/libretime_playout/pypopush.py @@ -12,13 +12,11 @@ from threading import Thread from libretime_api_client import version1 as api_client from loguru import logger -from .config import Config +from .config import PUSH_INTERVAL, Config from .pypofetch import PypoFetch from .pypoliqqueue import PypoLiqQueue from .timeout import ls_timeout -PUSH_INTERVAL = 2 - def is_stream(media_item): return media_item["type"] == "stream_output_start" diff --git a/playout/libretime_playout/recorder.py b/playout/libretime_playout/recorder.py index 9bfb50908..de63f98dd 100644 --- a/playout/libretime_playout/recorder.py +++ b/playout/libretime_playout/recorder.py @@ -15,7 +15,7 @@ import pytz from libretime_api_client.version1 import AirtimeApiClient as AirtimeApiClientV1 from loguru import logger -from libretime_playout.config import RECORD_DIR, Config +from libretime_playout.config import PUSH_INTERVAL, RECORD_DIR, Config def api_client(): @@ -45,9 +45,6 @@ def getDateTimeObj(time): ) -PUSH_INTERVAL = 2 - - class ShowRecorder(Thread): def __init__( self,