lghorizon 0.7.2__tar.gz → 0.7.3b1__tar.gz

{lghorizon-0.7.2 → lghorizon-0.7.3b1}/PKG-INFO

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

lghorizon-0.7.3b1/lghorizon/__init__.py

@@ -0,0 +1,19 @@
+"""Python client for LG Horizon."""
+
+from .lghorizon_api import LGHorizonApi
+from .models import (
+    LGHorizonBox,
+    LGHorizonRecordingListSeasonShow,
+    LGHorizonRecordingSingle,
+    LGHorizonRecordingShow,
+    LGHorizonRecordingEpisode,
+    LGHorizonCustomer,
+)
+from .exceptions import LGHorizonApiUnauthorizedError, LGHorizonApiConnectionError
+from .const import (
+    ONLINE_RUNNING,
+    ONLINE_STANDBY,
+    RECORDING_TYPE_SHOW,
+    RECORDING_TYPE_SEASON,
+    RECORDING_TYPE_SINGLE,
+)  # noqa

{lghorizon-0.7.2 → lghorizon-0.7.3b1}/lghorizon/lghorizon_api.py

@@ -47,7 +47,7 @@ class LGHorizonApi:
     _auth: LGHorizonAuth = None
     _session: Session = None
     settop_boxes: Dict[str, LGHorizonBox] = None
-    _customer: LGHorizonCustomer = None
+    customer: LGHorizonCustomer = None
     _mqttClient: LGHorizonMqttClient = None
     _channels: Dict[str, LGHorizonChannel] = None
     _country_settings = None
@@ -57,6 +57,7 @@ class LGHorizonApi:
     _identifier: str = None
     _config: str = None
     _refresh_callback: Callable = None
+    _profile_id: str = None
 
     def __init__(
         self,
@@ -65,6 +66,7 @@ class LGHorizonApi:
         country_code: str = "nl",
         identifier: str = None,
         refresh_token=None,
+        profile_id=None,
     ) -> None:
         """Create LGHorizon API."""
         self.username = username
@@ -78,6 +80,7 @@ class LGHorizonApi:
         self._channels = {}
         self._entitlements = []
         self._identifier = identifier
+        self._profile_id = profile_id
 
     @backoff.on_exception(
         backoff.expo, LGHorizonApiConnectionError, max_tries=3, logger=_logger
@@ -149,7 +152,7 @@ class LGHorizonApi:
         self._session.cookies["ACCESSTOKEN"] = self._auth.accessToken
 
         if self._refresh_callback:
-            self._refresh_callback ()
+            self._refresh_callback()
 
         _logger.debug("Authorization succeeded")
 
@@ -246,6 +249,7 @@ class LGHorizonApi:
             self._on_mqtt_connected,
             self._on_mqtt_message,
         )
+
         self._register_customer_and_boxes()
         self._mqttClient.connect()
 
@@ -265,7 +269,7 @@ class LGHorizonApi:
     def _on_mqtt_message(self, message: str, topic: str) -> None:
         if "source" in message:
             deviceId = message["source"]
-            if not isinstance(deviceId,str):
+            if not isinstance(deviceId, str):
                 _logger.debug("ignoring message - not a string")
                 return
             if not deviceId in self.settop_boxes.keys():
@@ -346,7 +350,7 @@ class LGHorizonApi:
                 last_speed_change_time = playerState["lastSpeedChangeTime"]
                 relative_position = playerState["relativePosition"]
                 raw_vod = self._do_api_call(
-                    f"{self._config['vodService']['URL']}/v2/detailscreen/{titleId}?language={self._country_settings['language']}&profileId=4504e28d-c1cb-4284-810b-f5eaab06f034&cityId={self._customer.cityId}"
+                    f"{self._config['vodService']['URL']}/v2/detailscreen/{titleId}?language={self._country_settings['language']}&profileId=4504e28d-c1cb-4284-810b-f5eaab06f034&cityId={self.customer.cityId}"
                 )
                 vod = LGHorizonVod(raw_vod)
                 self.settop_boxes[deviceId].update_with_vod(
@@ -378,36 +382,43 @@ class LGHorizonApi:
         personalisation_result = self._do_api_call(
             f"{self._config['personalizationService']['URL']}/v1/customer/{self._auth.householdId}?with=profiles%2Cdevices"
         )
-        _logger.debug(f"Personalisation result: {personalisation_result}")
-        self._customer = LGHorizonCustomer(personalisation_result)
+        _logger.debug("Personalisation result: %s ", personalisation_result)
+        self.customer = LGHorizonCustomer(personalisation_result)
         self._get_channels()
-        if not "assignedDevices" in personalisation_result:
+        if "assignedDevices" not in personalisation_result:
             _logger.warning("No boxes found.")
             return
         _logger.info("Registering boxes")
-        for device in personalisation_result["assignedDevices"]:
+        for device in self.customer.settop_boxes:
             platform_type = device["platformType"]
-            if not platform_type in _supported_platforms:
+            if platform_type not in _supported_platforms:
                 continue
             if (
                 "platform_types" in self._country_settings
                 and platform_type in self._country_settings["platform_types"]
             ):
-                platformType = self._country_settings["platform_types"][platform_type]
+                platform_type = self._country_settings["platform_types"][platform_type]
             else:
-                platformType = None
+                platform_type = None
             box = LGHorizonBox(
-                device, platformType, self._mqttClient, self._auth, self._channels
+                device, platform_type, self._mqttClient, self._auth, self._channels
             )
             self.settop_boxes[box.deviceId] = box
-            _logger.info(f"Box {box.deviceId} registered...")
+            _logger.info("Box %s registered...", box.deviceId)
 
     def _get_channels(self):
         self._update_entitlements()
         _logger.info("Retrieving channels...")
         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"
+            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
@@ -417,6 +428,9 @@ 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.")
 

{lghorizon-0.7.2 → lghorizon-0.7.3b1}/lghorizon/models.py

@@ -677,17 +677,32 @@ class LGHorizonBox:
         self._mqtt_client.publish_message(topic, json.dumps(payload))
 
 
+class LGHorizonProfile:
+    profile_id: str = None
+    name: str = None
+    favorite_channels: [] = None
+
+    def __init__(self, json_payload):
+        self.profile_id = json_payload["profileId"]
+        self.name = json_payload["name"]
+        self.favorite_channels = json_payload["favoriteChannels"]
+
+
 class LGHorizonCustomer:
     customerId: str = None
     hashedCustomerId: str = None
     countryId: str = None
     cityId: int = 0
-    settop_boxes: Dict[str, LGHorizonBox] = None
+    settop_boxes: [] = None
+    profiles: Dict[str, LGHorizonProfile] = {}
 
     def __init__(self, json_payload):
         self.customerId = json_payload["customerId"]
         self.hashedCustomerId = json_payload["hashedCustomerId"]
         self.countryId = json_payload["countryId"]
         self.cityId = json_payload["cityId"]
-        if not "assignedDevices" in json_payload:
-            return
+        if "assignedDevices" in json_payload:
+            self.settop_boxes = json_payload["assignedDevices"]
+        if "profiles" in json_payload:
+            for profile in json_payload["profiles"]:
+                self.profiles[profile["profileId"]] = LGHorizonProfile(profile)

{lghorizon-0.7.2 → lghorizon-0.7.3b1}/lghorizon.egg-info/PKG-INFO

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

lghorizon-0.7.3b1/secrets_stub.json

@@ -0,0 +1,7 @@
+{
+    "username": "your_username",
+    "password": "your_password",
+    "country": "your_country_code",
+    "profile_id":"your_profile_id"
+
+}

{lghorizon-0.7.2 → lghorizon-0.7.3b1}/test.py

@@ -57,12 +57,17 @@ if __name__ == "__main__":
         if "refresh_token" in secrets:
             refresh_token = secrets["refresh_token"]
 
+        profile_id = None
+        if "profile_id" in secrets:
+            profile_id = secrets["profile_id"]
+
         api = LGHorizonApi(
             secrets["username"],
             secrets["password"],
             secrets["country"],
             # identifier="DTV3907048",
-            refresh_token = refresh_token,
+            refresh_token=refresh_token,
+            profile_id=profile_id
         )
         api.connect()
         event_loop()

lghorizon-0.7.2/lghorizon/__init__.py

@@ -1,5 +0,0 @@
-"""Python client for LG Horizon."""
-from .lghorizon_api import LGHorizonApi
-from .models import LGHorizonBox, LGHorizonRecordingListSeasonShow, LGHorizonRecordingSingle, LGHorizonRecordingShow, LGHorizonRecordingEpisode
-from .exceptions import LGHorizonApiUnauthorizedError, LGHorizonApiConnectionError
-from .const import ONLINE_RUNNING, ONLINE_STANDBY, RECORDING_TYPE_SHOW, RECORDING_TYPE_SEASON, RECORDING_TYPE_SINGLE# noqa

lghorizon-0.7.2/secrets_stub.json

@@ -1,5 +0,0 @@
-{
-    "username": "your_username",
-    "password": "your_password",
-    "country": "your_country_code"
-}