feat: rename AirtimeApiClient to ApiClient

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

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"):

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)

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
 
 

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()
 

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

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

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.v1 import ApiClientV1
-from libretime_api_client.v2 import AirtimeApiClient as ApiClientV2
+from libretime_api_client.v2 import ApiClientV2
 from loguru import logger
 
 from ..config import CACHE_DIR, POLL_INTERVAL, Config

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
 

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

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,

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

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