From 8cb9bd5f3287deb9e8d33b9b92cddc42a912712a Mon Sep 17 00:00:00 2001 From: jo Date: Fri, 22 Jul 2022 13:01:32 +0200 Subject: [PATCH] chore(playout): update api-client imports --- .../libretime_playout/liquidsoap/entrypoint.py | 4 ++-- .../liquidsoap/liquidsoap_auth.py | 6 +++--- playout/libretime_playout/main.py | 2 +- playout/libretime_playout/notify/main.py | 4 ++-- playout/libretime_playout/player/fetch.py | 8 ++++---- playout/libretime_playout/player/file.py | 4 ++-- playout/libretime_playout/player/push.py | 4 ++-- playout/libretime_playout/player/schedule.py | 2 +- playout/libretime_playout/recorder.py | 15 +++------------ playout/libretime_playout/stats.py | 4 ++-- 10 files changed, 22 insertions(+), 31 deletions(-) diff --git a/playout/libretime_playout/liquidsoap/entrypoint.py b/playout/libretime_playout/liquidsoap/entrypoint.py index c78876e23..df8a87f92 100644 --- a/playout/libretime_playout/liquidsoap/entrypoint.py +++ b/playout/libretime_playout/liquidsoap/entrypoint.py @@ -5,7 +5,7 @@ import traceback from pathlib import Path from typing import Optional -from libretime_api_client.version1 import AirtimeApiClient +from libretime_api_client.v1 import AirtimeApiClient as ApiClient from loguru import logger @@ -50,7 +50,7 @@ def generate_entrypoint(log_filepath: Optional[Path]): while not successful: try: - ac = AirtimeApiClient(logger) + ac = ApiClient(logger) ss = ac.get_stream_setting() generate_liquidsoap_config(ss, log_filepath) successful = True diff --git a/playout/libretime_playout/liquidsoap/liquidsoap_auth.py b/playout/libretime_playout/liquidsoap/liquidsoap_auth.py index 45c1b2cbe..7867b66d8 100644 --- a/playout/libretime_playout/liquidsoap/liquidsoap_auth.py +++ b/playout/libretime_playout/liquidsoap/liquidsoap_auth.py @@ -1,8 +1,8 @@ import sys -from libretime_api_client import version1 as api_client +from libretime_api_client.v1 import AirtimeApiClient as ApiClient -api_clients = api_client.AirtimeApiClient() +api_client = ApiClient() dj_type = sys.argv[1] username = sys.argv[2] @@ -14,7 +14,7 @@ if dj_type == "--master": elif dj_type == "--dj": source_type = "dj" -response = api_clients.check_live_stream_auth(username, password, source_type) +response = api_client.check_live_stream_auth(username, password, source_type) if "msg" in response and response["msg"] == True: print(response["msg"]) diff --git a/playout/libretime_playout/main.py b/playout/libretime_playout/main.py index 90d60c0fc..13e93a86f 100644 --- a/playout/libretime_playout/main.py +++ b/playout/libretime_playout/main.py @@ -13,7 +13,7 @@ from threading import Lock from typing import Optional, Tuple import click -from libretime_api_client.version1 import AirtimeApiClient as ApiClient +from libretime_api_client.v1 import AirtimeApiClient as ApiClient from libretime_shared.cli import cli_config_options, cli_logging_options from libretime_shared.config import DEFAULT_ENV_PREFIX from libretime_shared.logging import level_from_name, setup_logger diff --git a/playout/libretime_playout/notify/main.py b/playout/libretime_playout/notify/main.py index 9addcba4e..b817034d5 100644 --- a/playout/libretime_playout/notify/main.py +++ b/playout/libretime_playout/notify/main.py @@ -16,7 +16,7 @@ from pathlib import Path from typing import Optional import click -from libretime_api_client.version1 import AirtimeApiClient +from libretime_api_client.v1 import AirtimeApiClient as ApiClient from libretime_shared.cli import cli_logging_options from libretime_shared.config import DEFAULT_ENV_PREFIX from libretime_shared.logging import level_from_name, setup_logger @@ -24,7 +24,7 @@ from loguru import logger def api_client(): - return AirtimeApiClient(logger=logger) + return ApiClient(logger=logger) @click.group(context_settings={"auto_envvar_prefix": DEFAULT_ENV_PREFIX}) diff --git a/playout/libretime_playout/player/fetch.py b/playout/libretime_playout/player/fetch.py index af6f1060e..2192371a7 100644 --- a/playout/libretime_playout/player/fetch.py +++ b/playout/libretime_playout/player/fetch.py @@ -12,8 +12,8 @@ from queue import Empty from subprocess import PIPE, Popen from threading import Thread, Timer -from libretime_api_client import version1 as v1_api_client -from libretime_api_client import version2 as api_client +from libretime_api_client.v1 import AirtimeApiClient as ApiClientV1 +from libretime_api_client.v2 import AirtimeApiClient as ApiClientV2 from loguru import logger from ..config import CACHE_DIR, POLL_INTERVAL, Config @@ -44,8 +44,8 @@ class PypoFetch(Thread): # Hacky... PypoFetch.ref = self - self.v1_api_client = v1_api_client.AirtimeApiClient() - self.api_client = api_client.AirtimeApiClient() + self.v1_api_client = ApiClientV1() + self.api_client = ApiClientV2() self.fetch_queue = pypoFetch_q self.push_queue = pypoPush_q self.media_prepare_queue = media_q diff --git a/playout/libretime_playout/player/file.py b/playout/libretime_playout/player/file.py index a42e7dff4..b2438a9ad 100644 --- a/playout/libretime_playout/player/file.py +++ b/playout/libretime_playout/player/file.py @@ -6,7 +6,7 @@ import traceback from queue import Empty from threading import Thread -from libretime_api_client import version2 as api_client +from libretime_api_client.v2 import AirtimeApiClient as ApiClient from loguru import logger from requests.exceptions import ConnectionError, Timeout @@ -16,7 +16,7 @@ class PypoFile(Thread): Thread.__init__(self) self.media_queue = schedule_queue self.media = None - self.api_client = api_client.AirtimeApiClient() + self.api_client = ApiClient() def copy_file(self, media_item): """ diff --git a/playout/libretime_playout/player/push.py b/playout/libretime_playout/player/push.py index cdf1f156d..14306997c 100644 --- a/playout/libretime_playout/player/push.py +++ b/playout/libretime_playout/player/push.py @@ -6,7 +6,7 @@ from datetime import datetime from queue import Queue from threading import Thread -from libretime_api_client import version1 as api_client +from libretime_api_client.v1 import AirtimeApiClient as ApiClient from loguru import logger from ..config import PUSH_INTERVAL, Config @@ -25,7 +25,7 @@ def is_file(media_item): class PypoPush(Thread): def __init__(self, q, telnet_lock, pypo_liquidsoap, config: Config): Thread.__init__(self) - self.api_client = api_client.AirtimeApiClient() + self.api_client = ApiClient() self.queue = q self.telnet_lock = telnet_lock diff --git a/playout/libretime_playout/player/schedule.py b/playout/libretime_playout/player/schedule.py index 37cefa087..5369a7622 100644 --- a/playout/libretime_playout/player/schedule.py +++ b/playout/libretime_playout/player/schedule.py @@ -2,7 +2,7 @@ from datetime import datetime, timedelta from typing import Dict from dateutil.parser import isoparse -from libretime_api_client.version2 import AirtimeApiClient as ApiClient +from libretime_api_client.v2 import AirtimeApiClient as ApiClient from libretime_shared.datetime import ( time_fromisoformat, time_in_milliseconds, diff --git a/playout/libretime_playout/recorder.py b/playout/libretime_playout/recorder.py index 95c40f2dd..6b1dc9b43 100644 --- a/playout/libretime_playout/recorder.py +++ b/playout/libretime_playout/recorder.py @@ -12,20 +12,11 @@ from threading import Thread from zoneinfo import ZoneInfo import mutagen -from libretime_api_client.version1 import AirtimeApiClient as AirtimeApiClientV1 +from libretime_api_client.v1 import AirtimeApiClient as ApiClient from loguru import logger from libretime_playout.config import PUSH_INTERVAL, RECORD_DIR, Config - -def api_client(): - """ - api_client returns the correct instance of AirtimeApiClient. Although there is only one - instance to choose from at the moment. - """ - return AirtimeApiClientV1() - - # TODO : add docstrings everywhere in this module @@ -55,7 +46,7 @@ class ShowRecorder(Thread): config: Config, ): Thread.__init__(self) - self.api_client = api_client() + self.api_client = ApiClient() self.config = config self.filelength = filelength self.start_time = start_time @@ -179,7 +170,7 @@ class ShowRecorder(Thread): class Recorder(Thread): def __init__(self, q, config: Config): Thread.__init__(self) - self.api_client = api_client() + self.api_client = ApiClient() self.config = config self.sr = None self.shows_to_record = {} diff --git a/playout/libretime_playout/stats.py b/playout/libretime_playout/stats.py index 4d9c04e5a..525d7feea 100644 --- a/playout/libretime_playout/stats.py +++ b/playout/libretime_playout/stats.py @@ -7,7 +7,7 @@ from datetime import datetime from threading import Thread import defusedxml.minidom -from libretime_api_client import version1 as api_client +from libretime_api_client.v1 import AirtimeApiClient as ApiClient from loguru import logger from .config import Config @@ -20,7 +20,7 @@ class ListenerStat(Thread): def __init__(self, config: Config): Thread.__init__(self) self.config = config - self.api_client = api_client.AirtimeApiClient() + self.api_client = ApiClient() def get_node_text(self, nodelist): rc = []