lghorizon 0.6.7__py3-none-any.whl → 0.6.9__py3-none-any.whl

lghorizon/const.py

@@ -69,12 +69,14 @@ COUNTRY_SETTINGS = {
             "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",
@@ -95,69 +97,37 @@ COUNTRY_SETTINGS = {
             "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,
     },
-    # "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",
+        "use_legacy_auth": False,
     },
-    # "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",
+        "use_legacy_auth": False,
     },
     "pl": {
         "api_url": "https://spark-prod-pl.gnp.cloud.upctv.pl",
@@ -168,40 +138,6 @@ COUNTRY_SETTINGS = {
             "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": [],
-    # },
+        "use_legacy_auth": False,
+    }
 }

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.dist-info → lghorizon-0.6.9.dist-info}/METADATA

@@ -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.dist-info/RECORD

@@ -0,0 +1,12 @@
+lghorizon/__init__.py,sha256=_VjVE44ErvJJMnF5QgXdlw_nQzbHZUhGWw5hF40PolQ,426
+lghorizon/const.py,sha256=GljKG9GNOv3vXpY6wdjkJLfBZJPqKx0MzmQBrdmYEoE,4873
+lghorizon/exceptions.py,sha256=spEjRvbNdce2fauQiOFromAbV1QcfA0uMUt0nRVnnkM,318
+lghorizon/helpers.py,sha256=ZWpi7B3hBvwGV02KWQQHVyj7FLLUDtIvKc-Iqsj5VHA,263
+lghorizon/lghorizon_api.py,sha256=wsLn-uj3DVWqwwmLDz3Wt9AM6CjFBPxGed8CAXsPPVA,23770
+lghorizon/models.py,sha256=mOeW9LegkaSlYefyyxVUGrNgSGiWcbEqGFd3lyyCzjQ,23678
+lghorizon/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lghorizon-0.6.9.dist-info/LICENSE,sha256=6Dh2tur1gMX3r3rITjVwUONBEJxyyPZDY8p6DZXtimE,1059
+lghorizon-0.6.9.dist-info/METADATA,sha256=4wEZyvLhmXPSl6lK9bxc_Hg5bKLkgOhAK1kSoOcwJRo,1038
+lghorizon-0.6.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+lghorizon-0.6.9.dist-info/top_level.txt,sha256=usii76_AxGfPI6gjrrh-NyZxcQQuF1B8_Q9kd7sID8Q,10
+lghorizon-0.6.9.dist-info/RECORD,,

lghorizon-0.6.7.dist-info/RECORD

@@ -1,12 +0,0 @@
-lghorizon/__init__.py,sha256=_VjVE44ErvJJMnF5QgXdlw_nQzbHZUhGWw5hF40PolQ,426
-lghorizon/const.py,sha256=75Qqmf6XJcBYcOya18cdeRrWq2D_1Q45tz9MLlfQ8Ao,8407
-lghorizon/exceptions.py,sha256=spEjRvbNdce2fauQiOFromAbV1QcfA0uMUt0nRVnnkM,318
-lghorizon/helpers.py,sha256=ZWpi7B3hBvwGV02KWQQHVyj7FLLUDtIvKc-Iqsj5VHA,263
-lghorizon/lghorizon_api.py,sha256=1lNnN6FaPo4oV4x_SLXBA5kLnIILiNz8w3CiRko26Ao,23597
-lghorizon/models.py,sha256=mOeW9LegkaSlYefyyxVUGrNgSGiWcbEqGFd3lyyCzjQ,23678
-lghorizon/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lghorizon-0.6.7.dist-info/LICENSE,sha256=6Dh2tur1gMX3r3rITjVwUONBEJxyyPZDY8p6DZXtimE,1059
-lghorizon-0.6.7.dist-info/METADATA,sha256=yF-VpLIb2XBfkFIXzmcpb8PIWCrQbyynYVUlegF4NbA,1038
-lghorizon-0.6.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-lghorizon-0.6.7.dist-info/top_level.txt,sha256=usii76_AxGfPI6gjrrh-NyZxcQQuF1B8_Q9kd7sID8Q,10
-lghorizon-0.6.7.dist-info/RECORD,,