diff --git a/lib/streaming_providers/base/managers/recordings.py b/lib/streaming_providers/base/managers/recordings.py index 7597c4b..0c038c9 100644 --- a/lib/streaming_providers/base/managers/recordings.py +++ b/lib/streaming_providers/base/managers/recordings.py @@ -72,7 +72,7 @@ class RecordingsManager(ABC): Providers that need a recording's manifest should implement the routing in their provider's get_manifest, not by adding a - get_manifest method here. See providers/simplitv/provider.py for + get_manifest method here. See providers/simpli/provider.py for the pattern. """ diff --git a/lib/streaming_providers/providers/_template/recordings_manager.py b/lib/streaming_providers/providers/_template/recordings_manager.py index b820d17..cd9d979 100644 --- a/lib/streaming_providers/providers/_template/recordings_manager.py +++ b/lib/streaming_providers/providers/_template/recordings_manager.py @@ -12,7 +12,7 @@ See ../_template/README.md for the contract. Reference implementation ------------------------ simpliTV's SimpliTVRecordingsManager -(providers/simplitv/recordings_manager.py) is the first example: it +(providers/simpli/recordings_manager.py) is the first example: it returns recordings as SimpliTVChannel objects, carries recording_id on the subclass, and paginates through /v2/Pvr/GetRecordings. @@ -51,7 +51,7 @@ class YourRecordingsManager(RecordingsManager): Do not add a get_manifest method here. Route it in the provider's get_manifest instead. See - providers/simplitv/provider.py for the pattern. + providers/simpli/provider.py for the pattern. Recording identity ------------------ diff --git a/lib/streaming_providers/providers/simplitv/__init__.py b/lib/streaming_providers/providers/simpli/__init__.py similarity index 81% rename from lib/streaming_providers/providers/simplitv/__init__.py rename to lib/streaming_providers/providers/simpli/__init__.py index 0d01ef8..cceee3b 100644 --- a/lib/streaming_providers/providers/simplitv/__init__.py +++ b/lib/streaming_providers/providers/simpli/__init__.py @@ -1,4 +1,4 @@ -# streaming_providers/providers/simplitv/__init__.py +# streaming_providers/providers/simpli/__init__.py """ simpliTV streaming provider. diff --git a/lib/streaming_providers/providers/simplitv/auth.py b/lib/streaming_providers/providers/simpli/auth.py similarity index 99% rename from lib/streaming_providers/providers/simplitv/auth.py rename to lib/streaming_providers/providers/simpli/auth.py index 1c337f6..129c2d9 100644 --- a/lib/streaming_providers/providers/simplitv/auth.py +++ b/lib/streaming_providers/providers/simpli/auth.py @@ -1,4 +1,4 @@ -# streaming_providers/providers/simplitv/auth.py +# streaming_providers/providers/simpli/auth.py """ simpliTV authentication. diff --git a/lib/streaming_providers/providers/simplitv/catchup_manager.py b/lib/streaming_providers/providers/simpli/catchup_manager.py similarity index 99% rename from lib/streaming_providers/providers/simplitv/catchup_manager.py rename to lib/streaming_providers/providers/simpli/catchup_manager.py index 0001ff2..eb35539 100644 --- a/lib/streaming_providers/providers/simplitv/catchup_manager.py +++ b/lib/streaming_providers/providers/simpli/catchup_manager.py @@ -1,4 +1,4 @@ -# streaming_providers/providers/simplitv/catchup_manager.py +# streaming_providers/providers/simpli/catchup_manager.py """ simpliTV catchup manager. diff --git a/lib/streaming_providers/providers/simplitv/channel_manager.py b/lib/streaming_providers/providers/simpli/channel_manager.py similarity index 99% rename from lib/streaming_providers/providers/simplitv/channel_manager.py rename to lib/streaming_providers/providers/simpli/channel_manager.py index 2c3aec1..617819d 100644 --- a/lib/streaming_providers/providers/simplitv/channel_manager.py +++ b/lib/streaming_providers/providers/simpli/channel_manager.py @@ -1,4 +1,4 @@ -# streaming_providers/providers/simplitv/channel_manager.py +# streaming_providers/providers/simpli/channel_manager.py """ simpliTV channel manager. @@ -482,7 +482,7 @@ def codename_from_playable_id(content_id: str) -> str: def programme_codename_from_epg_id(epg_id: str) -> str: """ Programme codename from whatever the host passes as epg_id: an EPG - broadcast_id (simplitv:::), a prog: id, + broadcast_id (simpli:::), a prog: id, or the bare programme codename. """ if not epg_id: diff --git a/lib/streaming_providers/providers/simplitv/constants.py b/lib/streaming_providers/providers/simpli/constants.py similarity index 97% rename from lib/streaming_providers/providers/simplitv/constants.py rename to lib/streaming_providers/providers/simpli/constants.py index 07dc8c0..f5782b5 100644 --- a/lib/streaming_providers/providers/simplitv/constants.py +++ b/lib/streaming_providers/providers/simpli/constants.py @@ -1,4 +1,4 @@ -# streaming_providers/providers/simplitv/constants.py +# streaming_providers/providers/simpli/constants.py """ simpliTV constants. @@ -10,14 +10,14 @@ from typing import Optional class SimpliTVDefaults: - PROVIDER_NAME = "simplitv" + PROVIDER_NAME = "simpli" PROVIDER_LOGO = "https://files.app.simplitv.at/files/orf1-hd-bunt.png" # --- Endpoints / hosts --------------------------------------------- # Confirmed against the browser capture: the API host is # api.app.austrostream.at (multi-tenant; simpliTV is the - # X-Tenant-Codename: simplitv tenant). The web app itself lives on - # streaming.simpli.at, NOT streaming.simplitv.at. + # X-Tenant-Codename: simpli tenant). The web app itself lives on + # streaming.simpli.at, NOT streaming.simpli.at. BASE_URL = "https://api.app.austrostream.at" WEBSITE = "https://streaming.simpli.at" @@ -64,7 +64,7 @@ class SimpliTVDefaults: # --- Platform / device identity ------------------------------------ PLATFORM_CODENAME = "www" - TENANT_CODENAME = "simplitv" + TENANT_CODENAME = "simpli" RESOURCE_LANGUAGE_CONTEXT = "de" DEVICE_NAME = "Firefox" @@ -133,7 +133,7 @@ class SimpliTVDefaults: PROGRAMME_PREFIX = "prog:" CATCHUP_PREFIX = "catchup:" CATCHUP_TS_SEPARATOR = "@" - BROADCAST_ID_PREFIX = "simplitv:" + BROADCAST_ID_PREFIX = "simpli:" # --- Catchup / timeshift ------------------------------------------ # The DVR window is per-channel (AdditionalInfo.Epg_TimeshiftSeconds diff --git a/lib/streaming_providers/providers/simplitv/epg_manager.py b/lib/streaming_providers/providers/simpli/epg_manager.py similarity index 99% rename from lib/streaming_providers/providers/simplitv/epg_manager.py rename to lib/streaming_providers/providers/simpli/epg_manager.py index 856dc3f..883d2ab 100644 --- a/lib/streaming_providers/providers/simplitv/epg_manager.py +++ b/lib/streaming_providers/providers/simpli/epg_manager.py @@ -1,4 +1,4 @@ -# streaming_providers/providers/simplitv/epg_manager.py +# streaming_providers/providers/simpli/epg_manager.py """ simpliTV EPG manager. diff --git a/lib/streaming_providers/providers/simplitv/helpers.py b/lib/streaming_providers/providers/simpli/helpers.py similarity index 98% rename from lib/streaming_providers/providers/simplitv/helpers.py rename to lib/streaming_providers/providers/simpli/helpers.py index 8829048..cd96944 100644 --- a/lib/streaming_providers/providers/simplitv/helpers.py +++ b/lib/streaming_providers/providers/simpli/helpers.py @@ -1,4 +1,4 @@ -# streaming_providers/providers/simplitv/helpers.py +# streaming_providers/providers/simpli/helpers.py """ Helpers shared by more than one simpliTV module. diff --git a/lib/streaming_providers/providers/simplitv/logos.py b/lib/streaming_providers/providers/simpli/logos.py similarity index 99% rename from lib/streaming_providers/providers/simplitv/logos.py rename to lib/streaming_providers/providers/simpli/logos.py index 2a89cef..0f77005 100644 --- a/lib/streaming_providers/providers/simplitv/logos.py +++ b/lib/streaming_providers/providers/simpli/logos.py @@ -1,4 +1,4 @@ -# streaming_providers/providers/simplitv/logos.py +# streaming_providers/providers/simpli/logos.py """ simpliTV channel names and logos. diff --git a/lib/streaming_providers/providers/simplitv/models.py b/lib/streaming_providers/providers/simpli/models.py similarity index 97% rename from lib/streaming_providers/providers/simplitv/models.py rename to lib/streaming_providers/providers/simpli/models.py index 3c9f9f3..8cd1c9f 100644 --- a/lib/streaming_providers/providers/simplitv/models.py +++ b/lib/streaming_providers/providers/simpli/models.py @@ -1,4 +1,4 @@ -# streaming_providers/providers/simplitv/models.py +# streaming_providers/providers/simpli/models.py """ simpliTV models. diff --git a/lib/streaming_providers/providers/simplitv/provider.py b/lib/streaming_providers/providers/simpli/provider.py similarity index 99% rename from lib/streaming_providers/providers/simplitv/provider.py rename to lib/streaming_providers/providers/simpli/provider.py index febd22a..2dc600d 100644 --- a/lib/streaming_providers/providers/simplitv/provider.py +++ b/lib/streaming_providers/providers/simpli/provider.py @@ -1,4 +1,4 @@ -# streaming_providers/providers/simplitv/provider.py +# streaming_providers/providers/simpli/provider.py """ simpliTV orchestrator. diff --git a/lib/streaming_providers/providers/simplitv/recordings_manager.py b/lib/streaming_providers/providers/simpli/recordings_manager.py similarity index 99% rename from lib/streaming_providers/providers/simplitv/recordings_manager.py rename to lib/streaming_providers/providers/simpli/recordings_manager.py index ef089d5..b53c1c7 100644 --- a/lib/streaming_providers/providers/simplitv/recordings_manager.py +++ b/lib/streaming_providers/providers/simpli/recordings_manager.py @@ -1,4 +1,4 @@ -# streaming_providers/providers/simplitv/recordings_manager.py +# streaming_providers/providers/simpli/recordings_manager.py """ simpliTV recordings manager. diff --git a/resources/settings.xml b/resources/settings.xml index 42f0fe7..21d66e5 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -203,6 +203,20 @@ + + + + + + + + + + + + + +