From 473e770e8a0fbfbf2aff3e2dfd2c592501663dff Mon Sep 17 00:00:00 2001 From: jo Date: Fri, 22 Jul 2022 13:27:16 +0200 Subject: [PATCH] feat: rename AirtimeApiClient to ApiClient --- api-client/libretime_api_client/v1.py | 2 +- api-client/libretime_api_client/v2.py | 2 +- api-client/tests/v2_test.py | 4 ++-- playout/libretime_playout/liquidsoap/entrypoint.py | 2 +- playout/libretime_playout/liquidsoap/liquidsoap_auth.py | 2 +- playout/libretime_playout/main.py | 2 +- playout/libretime_playout/notify/main.py | 2 +- playout/libretime_playout/player/fetch.py | 4 ++-- playout/libretime_playout/player/file.py | 2 +- playout/libretime_playout/player/push.py | 2 +- playout/libretime_playout/player/schedule.py | 2 +- playout/libretime_playout/recorder.py | 2 +- playout/libretime_playout/stats.py | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/api-client/libretime_api_client/v1.py b/api-client/libretime_api_client/v1.py index 1f7cf00f6..b1488efea 100644 --- a/api-client/libretime_api_client/v1.py +++ b/api-client/libretime_api_client/v1.py @@ -120,7 +120,7 @@ api_endpoints[ ################################################################################ # Airtime API Version 1 Client ################################################################################ -class AirtimeApiClient: +class ApiClient: API_BASE = "/api" UPLOAD_RETRIES = 3 UPLOAD_WAIT = 60 diff --git a/api-client/libretime_api_client/v2.py b/api-client/libretime_api_client/v2.py index b70a1ca68..c6f33c6b0 100644 --- a/api-client/libretime_api_client/v2.py +++ b/api-client/libretime_api_client/v2.py @@ -25,7 +25,7 @@ api_endpoints["file_url"] = "files/{id}/" api_endpoints["file_download_url"] = "files/{id}/download/" -class AirtimeApiClient: +class ApiClient: API_BASE = "/api/v2" def __init__(self, logger=None, config_path="/etc/libretime/config.yml"): diff --git a/api-client/tests/v2_test.py b/api-client/tests/v2_test.py index d2e109a3d..903fc1730 100644 --- a/api-client/tests/v2_test.py +++ b/api-client/tests/v2_test.py @@ -2,7 +2,7 @@ from pathlib import Path import pytest -from libretime_api_client.v2 import AirtimeApiClient +from libretime_api_client.v2 import ApiClient @pytest.fixture() @@ -19,7 +19,7 @@ general: def test_api_client(config_filepath): - client = AirtimeApiClient(config_path=config_filepath) + client = ApiClient(config_path=config_filepath) assert callable(client.services.version_url) assert callable(client.services.schedule_url) assert callable(client.services.webstream_url) diff --git a/playout/libretime_playout/liquidsoap/entrypoint.py b/playout/libretime_playout/liquidsoap/entrypoint.py index df8a87f92..cbe89b5be 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.v1 import AirtimeApiClient as ApiClient +from libretime_api_client.v1 import ApiClient from loguru import logger diff --git a/playout/libretime_playout/liquidsoap/liquidsoap_auth.py b/playout/libretime_playout/liquidsoap/liquidsoap_auth.py index 7867b66d8..c885f056c 100644 --- a/playout/libretime_playout/liquidsoap/liquidsoap_auth.py +++ b/playout/libretime_playout/liquidsoap/liquidsoap_auth.py @@ -1,6 +1,6 @@ import sys -from libretime_api_client.v1 import AirtimeApiClient as ApiClient +from libretime_api_client.v1 import ApiClient api_client = ApiClient() diff --git a/playout/libretime_playout/main.py b/playout/libretime_playout/main.py index 13e93a86f..e457e1922 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.v1 import AirtimeApiClient as ApiClient +from libretime_api_client.v1 import 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 b817034d5..857e2ec3a 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.v1 import AirtimeApiClient as ApiClient +from libretime_api_client.v1 import 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 diff --git a/playout/libretime_playout/player/fetch.py b/playout/libretime_playout/player/fetch.py index 2192371a7..4a984f340 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.v1 import AirtimeApiClient as ApiClientV1 -from libretime_api_client.v2 import AirtimeApiClient as ApiClientV2 +from libretime_api_client.v1 import ApiClientV1 +from libretime_api_client.v2 import ApiClientV2 from loguru import logger from ..config import CACHE_DIR, POLL_INTERVAL, Config diff --git a/playout/libretime_playout/player/file.py b/playout/libretime_playout/player/file.py index b2438a9ad..32dd71b17 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.v2 import AirtimeApiClient as ApiClient +from libretime_api_client.v2 import ApiClient from loguru import logger from requests.exceptions import ConnectionError, Timeout diff --git a/playout/libretime_playout/player/push.py b/playout/libretime_playout/player/push.py index 14306997c..9a33ca02e 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.v1 import AirtimeApiClient as ApiClient +from libretime_api_client.v1 import ApiClient from loguru import logger from ..config import PUSH_INTERVAL, Config diff --git a/playout/libretime_playout/player/schedule.py b/playout/libretime_playout/player/schedule.py index 5369a7622..01d3bd328 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.v2 import AirtimeApiClient as ApiClient +from libretime_api_client.v2 import 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 6b1dc9b43..545bb2450 100644 --- a/playout/libretime_playout/recorder.py +++ b/playout/libretime_playout/recorder.py @@ -12,7 +12,7 @@ from threading import Thread from zoneinfo import ZoneInfo import mutagen -from libretime_api_client.v1 import AirtimeApiClient as ApiClient +from libretime_api_client.v1 import ApiClient from loguru import logger from libretime_playout.config import PUSH_INTERVAL, RECORD_DIR, Config diff --git a/playout/libretime_playout/stats.py b/playout/libretime_playout/stats.py index 525d7feea..ade6cce59 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.v1 import AirtimeApiClient as ApiClient +from libretime_api_client.v1 import ApiClient from loguru import logger from .config import Config