lghorizon 0.6.7__tar.gz → 0.6.9__tar.gz

{lghorizon-0.6.7 → lghorizon-0.6.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lghorizon
-Version: 0.6.7
+Version: 0.6.9
 Summary: Python client for Liberty Global Horizon settop boxes
 Home-page: https://github.com/sholofly/LGHorizon-python
 Author: Rudolf Offereins

lghorizon-0.6.9/lghorizon/const.py

@@ -0,0 +1,143 @@
+"""Python client for LGHorizon."""
+# flake8: noqa
+# Box states
+ONLINE_RUNNING = "ONLINE_RUNNING"
+ONLINE_STANDBY = "ONLINE_STANDBY"
+UNKNOWN = "UNKNOWN"
+
+BOX_PLAY_STATE_CHANNEL = "linear"
+BOX_PLAY_STATE_REPLAY = "replay"
+BOX_PLAY_STATE_DVR = "nDVR"
+BOX_PLAY_STATE_BUFFER = "reviewbuffer"
+BOX_PLAY_STATE_APP = "app"
+BOX_PLAY_STATE_VOD = "VOD"
+
+# List with available media keys.
+MEDIA_KEY_POWER = "Power"
+MEDIA_KEY_ENTER = "Enter"
+MEDIA_KEY_ESCAPE = "Escape"  # Not yet implemented
+
+MEDIA_KEY_HELP = "Help"  # Not yet implemented
+MEDIA_KEY_INFO = "Info"  # Not yet implemented
+MEDIA_KEY_GUIDE = "Guide"  # Not yet implemented
+
+MEDIA_KEY_CONTEXT_MENU = "ContextMenu"  # Not yet implemented
+MEDIA_KEY_CHANNEL_UP = "ChannelUp"
+MEDIA_KEY_CHANNEL_DOWN = "ChannelDown"
+
+MEDIA_KEY_RECORD = "MediaRecord"
+MEDIA_KEY_PLAY_PAUSE = "MediaPlayPause"
+MEDIA_KEY_STOP = "MediaStop"
+MEDIA_KEY_REWIND = "MediaRewind"
+MEDIA_KEY_FAST_FORWARD = "MediaFastForward"
+
+RECORDING_TYPE_SINGLE = "single"
+RECORDING_TYPE_SHOW = "show"
+RECORDING_TYPE_SEASON = "season"
+
+BE_AUTH_URL = "https://login.prd.telenet.be/openid/login.do"
+
+COUNTRY_SETTINGS = {
+    "nl": {
+        "api_url": "https://prod.spark.ziggogo.tv",
+        "mqtt_url": "obomsg.prod.nl.horizon.tv",
+        "use_oauth": False,
+        "channels": [
+            {
+                "channelId": "NL_000073_019506",
+                "channelName": "Netflix",
+                "channelNumber": "150",
+            },
+            {
+                "channelId": "NL_000074_019507",
+                "channelName": "Videoland",
+                "channelNumber": "151",
+            },
+            {
+                "channelId": "NL_000194_019352",
+                "channelName": "NPO",
+                "channelNumber": "152",
+            },
+            {
+                "channelId": "NL_000199_019356",
+                "channelName": "Prime Video",
+                "channelNumber": "153",
+            },
+        ],
+        "platform_types": {
+            "EOS": {"manufacturer": "Arris", "model": "DCX960"},
+            "APOLLO": {"manufacturer": "Arris", "model": "VIP5002W"},
+        },
+        "language": "nl",
+        "use_legacy_auth": False,
+    },
+    "ch": {
+        "api_url": "https://prod.spark.sunrisetv.ch",
+        "use_oauth": False,
+        "channels": [],
+        "language": "de",
+        "use_legacy_auth": True,
+    },
+    "be-nl": {
+        "api_url": "https://spark-prod-be.gnp.cloud.telenet.tv",
+        "use_oauth": True,
+        "oauth_username_fieldname": "j_username",
+        "oauth_password_fieldname": "j_password",
+        "oauth_add_accept_header": False,
+        "oauth_url": "https://login.prd.telenet.be/openid/login.do",
+        "oauth_quote_login": False,
+        "oauth_redirect_header": "Location",
+        "channels": [
+            {"channelId": "netflix", "channelName": "Netflix", "channelNumber": "600"},
+            {"channelId": "youtube", "channelName": "Youtube", "channelNumber": "-1"},
+        ],
+        "platform_types": {
+            "EOS": {"manufacturer": "Arris", "model": "DCX960"},
+            "HORIZON": {"manufacturer": "Arris", "model": "DCX960"},
+            "EOS2": {"manufacturer": "HUMAX", "model": "2008C-STB-TN"},
+        },
+        "language": "nl",
+        "use_legacy_auth": False,
+    },
+    "be-nl-preprod": {
+        "api_url": "https://spark-preprod-be.gnp.cloud.telenet.tv",
+        "use_oauth": True,
+        "oauth_username_fieldname": "j_username",
+        "oauth_password_fieldname": "j_password",
+        "oauth_add_accept_header": False,
+        "oauth_url": "https://login.prd.telenet.be/openid/login.do",
+        "oauth_quote_login": False,
+        "oauth_redirect_header": "Location",
+        "channels": [
+            {"channelId": "netflix", "channelName": "Netflix", "channelNumber": "600"},
+            {"channelId": "youtube", "channelName": "Youtube", "channelNumber": "-1"},
+        ],
+        "use_legacy_auth": False,
+    },
+    "gb": {
+        "api_url": "https://spark-prod-gb.gnp.cloud.virgintvgo.virginmedia.com",
+        "oauth_url": "https://id.virginmedia.com/rest/v40/session/start?protocol=oidc&rememberMe=true",
+        "channels": [],
+        "oesp_url": "https://prod.oesp.virginmedia.com/oesp/v4/GB/eng/web",
+        "language": "en",
+        "use_legacy_auth": False,
+    },
+    "ie": {
+        "api_url": "https://spark-prod-ie.gnp.cloud.virginmediatv.ie",
+        "use_oauth": False,
+        "channels": [],
+        "language": "en",
+        "use_legacy_auth": False,
+    },
+    "pl": {
+        "api_url": "https://spark-prod-pl.gnp.cloud.upctv.pl",
+        "use_oauth": False,
+        "channels": [],
+        "language": "pl",
+        "platform_types": {
+            "EOS": {"manufacturer": "Arris", "model": "DCX960"},
+            "APOLLO": {"manufacturer": "Arris", "model": "VIP5002W"},
+        },
+        "use_legacy_auth": False,
+    }
+}

{lghorizon-0.6.7 → lghorizon-0.6.9}/lghorizon/lghorizon_api.py

@@ -79,9 +79,10 @@ class LGHorizonApi:
         backoff.expo, LGHorizonApiConnectionError, max_tries=3, logger=_logger
     )
     def _authorize(self) -> None:
-        if self._country_code == "be-nl":
+        ctry_code = self._country_code[0:2]
+        if ctry_code == "be":
             self.authorize_telenet()
-        elif self._country_code == "gb":
+        elif ctry_code == "gb":
             self.authorize_gb()
         else:
             self._authorize_default()
@@ -269,9 +270,10 @@ class LGHorizonApi:
 
     def _obtain_mqtt_token(self):
         _logger.debug("Obtain mqtt token...")
-        mqtt_response = self._do_api_call(
-            f"{self._config['authorizationService']['URL']}/v1/mqtt/token"
-        )
+        mqtt_auth_url = self._config["authorizationService"]["URL"]
+        if self._country_settings["use_legacy_auth"]:
+            mqtt_auth_url = self._country_settings["api_url"] + "/auth-service"
+        mqtt_response = self._do_api_call(f"{mqtt_auth_url}/v1/mqtt/token")
         self._auth.mqttToken = mqtt_response["token"]
         _logger.debug(f"MQTT token: {self._auth.mqttToken}")
 

{lghorizon-0.6.7 → lghorizon-0.6.9}/lghorizon.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lghorizon
-Version: 0.6.7
+Version: 0.6.9
 Summary: Python client for Liberty Global Horizon settop boxes
 Home-page: https://github.com/sholofly/LGHorizon-python
 Author: Rudolf Offereins

{lghorizon-0.6.7 → lghorizon-0.6.9}/test.py

@@ -52,7 +52,12 @@ if __name__ == "__main__":
     try:
         secrets_file_path = "secrets.json"
         secrets = read_secrets(secrets_file_path)
-        api = LGHorizonApi(secrets["username"], secrets["password"], secrets["country"])
+        api = LGHorizonApi(
+            secrets["username"],
+            secrets["password"],
+            secrets["country"],
+            # identifier="DTV3907048",
+        )
         api.connect()
         event_loop()
     except KeyboardInterrupt:

lghorizon-0.6.7/lghorizon/const.py

@@ -1,207 +0,0 @@
-"""Python client for LGHorizon."""
-# flake8: noqa
-# Box states
-ONLINE_RUNNING = "ONLINE_RUNNING"
-ONLINE_STANDBY = "ONLINE_STANDBY"
-UNKNOWN = "UNKNOWN"
-
-BOX_PLAY_STATE_CHANNEL = "linear"
-BOX_PLAY_STATE_REPLAY = "replay"
-BOX_PLAY_STATE_DVR = "nDVR"
-BOX_PLAY_STATE_BUFFER = "reviewbuffer"
-BOX_PLAY_STATE_APP = "app"
-BOX_PLAY_STATE_VOD = "VOD"
-
-# List with available media keys.
-MEDIA_KEY_POWER = "Power"
-MEDIA_KEY_ENTER = "Enter"
-MEDIA_KEY_ESCAPE = "Escape"  # Not yet implemented
-
-MEDIA_KEY_HELP = "Help"  # Not yet implemented
-MEDIA_KEY_INFO = "Info"  # Not yet implemented
-MEDIA_KEY_GUIDE = "Guide"  # Not yet implemented
-
-MEDIA_KEY_CONTEXT_MENU = "ContextMenu"  # Not yet implemented
-MEDIA_KEY_CHANNEL_UP = "ChannelUp"
-MEDIA_KEY_CHANNEL_DOWN = "ChannelDown"
-
-MEDIA_KEY_RECORD = "MediaRecord"
-MEDIA_KEY_PLAY_PAUSE = "MediaPlayPause"
-MEDIA_KEY_STOP = "MediaStop"
-MEDIA_KEY_REWIND = "MediaRewind"
-MEDIA_KEY_FAST_FORWARD = "MediaFastForward"
-
-RECORDING_TYPE_SINGLE = "single"
-RECORDING_TYPE_SHOW = "show"
-RECORDING_TYPE_SEASON = "season"
-
-BE_AUTH_URL = "https://login.prd.telenet.be/openid/login.do"
-
-COUNTRY_SETTINGS = {
-    "nl": {
-        "api_url": "https://prod.spark.ziggogo.tv",
-        "mqtt_url": "obomsg.prod.nl.horizon.tv",
-        "use_oauth": False,
-        "channels": [
-            {
-                "channelId": "NL_000073_019506",
-                "channelName": "Netflix",
-                "channelNumber": "150",
-            },
-            {
-                "channelId": "NL_000074_019507",
-                "channelName": "Videoland",
-                "channelNumber": "151",
-            },
-            {
-                "channelId": "NL_000194_019352",
-                "channelName": "NPO",
-                "channelNumber": "152",
-            },
-            {
-                "channelId": "NL_000199_019356",
-                "channelName": "Prime Video",
-                "channelNumber": "153",
-            },
-        ],
-        "platform_types": {
-            "EOS": {"manufacturer": "Arris", "model": "DCX960"},
-            "APOLLO": {"manufacturer": "Arris", "model": "VIP5002W"},
-        },
-        "language": "nl",
-    },
-    "ch": {
-        "api_url": "https://prod.spark.sunrisetv.ch",
-        "use_oauth": False,
-        "channels": [],
-        "language": "de",
-    },
-    "be-nl": {
-        "api_url": "https://spark-prod-be.gnp.cloud.telenet.tv",
-        "use_oauth": True,
-        "oauth_username_fieldname": "j_username",
-        "oauth_password_fieldname": "j_password",
-        "oauth_add_accept_header": False,
-        "oauth_url": "https://login.prd.telenet.be/openid/login.do",
-        "oauth_quote_login": False,
-        "oauth_redirect_header": "Location",
-        "channels": [
-            {"channelId": "netflix", "channelName": "Netflix", "channelNumber": "600"},
-            {"channelId": "youtube", "channelName": "Youtube", "channelNumber": "-1"},
-        ],
-        "platform_types": {
-            "EOS": {"manufacturer": "Arris", "model": "DCX960"},
-            "HORIZON": {"manufacturer": "Arris", "model": "DCX960"},
-            "EOS2": {"manufacturer": "HUMAX", "model": "2008C-STB-TN"},
-        },
-        "language": "nl",
-    },
-    # "be-nl-preprod": {
-    #     "api_url": "https://web-api-preprod-obo.horizon.tv/oesp/v4/BE/nld/web",
-    #     "personalization_url_format": "https://preprod.spark.telenettv.be/nld/web/personalization-service/v1/customer/{household_id}/devices",
-    #     "mqtt_url": "obomsg.preprod.be.horizon.tv",
-    #     "use_oauth": True,
-    #     "oauth_username_fieldname": "j_username",
-    #     "oauth_password_fieldname": "j_password",
-    #     "oauth_add_accept_header": False,
-    #     "oauth_url": "https://login.prd.telenet.be/openid/login.do",
-    #     "oauth_quote_login": False,
-    #     "oauth_redirect_header": "Location",
-    #     "channels": [
-    #         {"channelId": "netflix", "channelName": "Netflix", "channelNumber": "600"},
-    #         {"channelId": "youtube", "channelName": "Youtube", "channelNumber": "-1"},
-    #     ],
-    # },
-    # "be-fr": {
-    #     "api_url": "https://web-api-prod-obo.horizon.tv/oesp/v4/BE/fr/web",
-    #     "personalization_url_format": "https://prod.spark.telenettv.be/fr/web/personalization-service/v1/customer/{household_id}/devices",
-    #     "mqtt_url": "obomsg.prod.be.horizon.tv",
-    #     "use_oauth": True,
-    #     "oauth_username_fieldname": "j_username",
-    #     "oauth_password_fieldname": "j_password",
-    #     "oauth_add_accept_header": False,
-    #     "oauth_url": "https://login.prd.telenet.be/openid/login.do",
-    #     "oauth_quote_login": False,
-    #     "oauth_redirect_header": "Location",
-    #     "channels": [],
-    # },
-    # "at": {
-    #     "api_url": "https://prod.spark.magentatv.at",
-    #     "personalization_url_format": "https://prod.spark.magentatv.at/deu/web/personalization-service/v1/customer/{householdId}/devices",
-    #     "mqtt_url": "obomsg.prod.at.horizon.tv",
-    #     "use_oauth": False,
-    #     "channels": [],
-    #     "language": "de",
-    # },
-    "gb": {
-        "api_url": "https://spark-prod-gb.gnp.cloud.virgintvgo.virginmedia.com",
-        "oauth_url": "https://id.virginmedia.com/rest/v40/session/start?protocol=oidc&rememberMe=true",
-        "channels": [],
-        "oesp_url": "https://prod.oesp.virginmedia.com/oesp/v4/GB/eng/web",
-        "language": "en",
-    },
-    # "gb-preprod": {
-    #     "api_url": "https://web-api-preprod-obo.horizon.tv/oesp/v4/GB/eng/web/",
-    #     "personalization_url_format": "https://preprod.spark.virginmedia.com/eng/web/personalization-service/v1/customer/{household_id}/devices",
-    #     "mqtt_url": "obomsg.preprod.gb.horizon.tv",
-    #     "use_oauth": False,
-    #     "oauth_username_fieldname": "username",
-    #     "oauth_password_fieldname": "credential",
-    #     "oauth_add_accept_header": True,
-    #     "oauth_url": "https://id.virginmedia.com/rest/v40/session/start?protocol=oidc&rememberMe=true",
-    #     "oauth_quote_login": True,
-    #     "oauth_redirect_header": "x-redirect-location",
-    #     "channels": [],
-    # },
-    "ie": {
-        "api_url": "https://spark-prod-ie.gnp.cloud.virginmediatv.ie",
-        "use_oauth": False,
-        "channels": [],
-        "language": "en",
-    },
-    "pl": {
-        "api_url": "https://spark-prod-pl.gnp.cloud.upctv.pl",
-        "use_oauth": False,
-        "channels": [],
-        "language": "pl",
-        "platform_types": {
-            "EOS": {"manufacturer": "Arris", "model": "DCX960"},
-            "APOLLO": {"manufacturer": "Arris", "model": "VIP5002W"},
-        },
-    },
-    # "hu": {
-    #     "api_url": "https://web-api-pepper.horizon.tv/oesp/v4/HU/HUN/web",
-    #     "personalization_url_format": "https://prod.spark.upctv.hu/HUN/web/personalization-service/v1/customer/{householdId}/devices",  # guessed
-    #     "mqtt_url": "obomsg.prod.hu.horizon.tv/mqtt",
-    #     "use_oauth": False,
-    #     "channels": [],
-    # },
-    # "de": {
-    #     "api_url": "https://web-api-pepper.horizon.tv/oesp/v4/DE/DEU/web",
-    #     "personalization_url_format": "https://prod.spark.upctv.de/DEU/web/personalization-service/v1/customer/{householdId}/devices",  # guessed
-    #     "mqtt_url": "obomsg.prod.de.horizon.tv/mqtt",
-    #     "use_oauth": False,
-    #     "channels": [],
-    # },
-    # "cz": {
-    #     "api_url": "https://web-api-pepper.horizon.tv/oesp/v4/CZ/ces/web/",
-    #     "personalization_url_format": "https://prod.spark.upctv.cz/ces/web/personalization-service/v1/customer/{householdId}/devices",  # guessed
-    #     "mqtt_url": "obomsg.prod.cz.horizon.tv/mqtt",
-    #     "use_oauth": False,
-    #     "channels": [],
-    # },
-    # "sk": {
-    #     "api_url": "https://web-api-pepper.horizon.tv/oesp/v4/sk/slk/web/",
-    #     "personalization_url_format": "https://prod.spark.upctv.sk/SLK/web/personalization-service/v1/customer/{householdId}/devices",  # guessed
-    #     "mqtt_url": "obomsg.prod.sk.horizon.tv/mqtt",
-    #     "use_oauth": False,
-    #     "channels": [],
-    # },
-    # "ro": {
-    #     "api_url": "https://web-api-pepper.horizon.tv/oesp/v4/ro/ron/web/",
-    #     "personalization_url_format": "https://prod.spark.upctv.ro/ron/web/personalization-service/v1/customer/{householdId}/devices",  # guessed
-    #     "mqtt_url": "obomsg.prod.ro.horizon.tv/mqtt",
-    #     "use_oauth": False,
-    #     "channels": [],
-    # },
-}