lghorizon 0.7.3b4__tar.gz → 0.7.5__tar.gz

{lghorizon-0.7.3b4 → lghorizon-0.7.5}/PKG-INFO

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

{lghorizon-0.7.3b4 → lghorizon-0.7.5}/lghorizon/const.py

@@ -73,13 +73,11 @@ COUNTRY_SETTINGS = {
     },
     "ch": {
         "api_url": "https://spark-prod-ch.gnp.cloud.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,

{lghorizon-0.7.3b4 → lghorizon-0.7.5}/lghorizon/lghorizon_api.py

@@ -90,8 +90,10 @@ class LGHorizonApi:
         ctry_code = self._country_code[0:2]
         if ctry_code == "be":
             self.authorize_telenet()
-        elif ctry_code == "gb":
-            self.authorize_gb()
+        elif ctry_code in ("gb", "ch"):
+            self.authorize_with_refreshtoken()
+            # elif ctry_code == "ch":
+            #     self.authorize_sunrise()
         else:
             self._authorize_default()
 
@@ -122,7 +124,7 @@ class LGHorizonApi:
         self._auth.fill(auth_response.json())
         _logger.debug("Authorization succeeded")
 
-    def authorize_gb(self) -> None:
+    def authorize_with_refreshtoken(self) -> None:
         _logger.debug("Authorizing via refresh")
         refresh_url = (
             f"{self._country_settings['api_url']}/auth-service/v1/authorization/refresh"
@@ -279,11 +281,7 @@ class LGHorizonApi:
     def _on_mqtt_message(self, message: str, topic: str) -> None:
         if "action" in message and message["action"] == "OPS.getProfilesUpdate":
             self._update_customer()
-            self._channels.clear()
-            self._get_channels()
             box: LGHorizonBox
-            for box in self.settop_boxes.values():
-                box.update_channels(self._channels)
         elif "source" in message:
             deviceId = message["source"]
             if not isinstance(deviceId, str):
@@ -433,13 +431,6 @@ class LGHorizonApi:
         channels_result = self._do_api_call(
             f"{self._config['linearService']['URL']}/v2/channels?cityId={self.customer.cityId}&language={self._country_settings['language']}&productClass=Orion-DASH"
         )
-        profile_channels = []
-        if self._profile_id and self._profile_id in self.customer.profiles:
-            profile_channels = self.customer.profiles[
-                self._profile_id
-            ].favorite_channels
-
-        has_profile_channels = len(profile_channels) > 0
         for channel in channels_result:
             if "isRadio" in channel and channel["isRadio"]:
                 continue
@@ -449,12 +440,21 @@ class LGHorizonApi:
             if len(common_entitlements) == 0:
                 continue
             channel_id = channel["id"]
-            if has_profile_channels and channel_id not in profile_channels:
-                continue
-
             self._channels[channel_id] = LGHorizonChannel(channel)
         _logger.info(f"{len(self._channels)} retrieved.")
 
+    def get_display_channels(self):
+        all_channels = self._channels.values()
+        if not self._profile_id or self._profile_id not in self.customer.profiles:
+            return all_channels
+        profile_channel_ids = self.customer.profiles[self._profile_id].favorite_channels
+        if len(profile_channel_ids) == 0:
+            return all_channels
+
+        return [
+            channel for channel in all_channels if channel.id in profile_channel_ids
+        ]
+
     def _get_replay_event(self, listingId) -> Any:
         """Get listing."""
         _logger.info("Retrieving replay event details...")

{lghorizon-0.7.3b4 → lghorizon-0.7.5}/lghorizon.egg-info/PKG-INFO

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