lghorizon 0.7.3b1__py3-none-any.whl → 0.7.3b3__py3-none-any.whl

lghorizon/__init__.py

@@ -9,7 +9,11 @@ from .models import (
     LGHorizonRecordingEpisode,
     LGHorizonCustomer,
 )
-from .exceptions import LGHorizonApiUnauthorizedError, LGHorizonApiConnectionError
+from .exceptions import (
+    LGHorizonApiUnauthorizedError,
+    LGHorizonApiConnectionError,
+    LGHorizonApiLockedError,
+)
 from .const import (
     ONLINE_RUNNING,
     ONLINE_STANDBY,

lghorizon/exceptions.py

@@ -1,11 +1,17 @@
 """Exceptions for the LGHorizon API."""
 
+
 class LGHorizonApiError(Exception):
-    """Generic GeocachingApi exception."""
+    """Generic LGHorizon exception."""
+
 
 class LGHorizonApiConnectionError(LGHorizonApiError):
-    """Generic GeocachingApi exception."""
+    """Generic LGHorizon exception."""
+
 
 class LGHorizonApiUnauthorizedError(Exception):
-    """Generic GeocachingApi exception."""
-        
+    """Generic LGHorizon exception."""
+
+
+class LGHorizonApiLockedError(LGHorizonApiUnauthorizedError):
+    """Generic LGHorizon exception."""

lghorizon/lghorizon_api.py

@@ -3,7 +3,11 @@
 import logging
 import json
 import sys, traceback
-from .exceptions import LGHorizonApiUnauthorizedError, LGHorizonApiConnectionError
+from .exceptions import (
+    LGHorizonApiUnauthorizedError,
+    LGHorizonApiConnectionError,
+    LGHorizonApiLockedError,
+)
 import backoff
 from requests import Session, exceptions as request_exceptions
 from paho.mqtt.client import WebsocketConnectionError
@@ -82,9 +86,6 @@ class LGHorizonApi:
         self._identifier = identifier
         self._profile_id = profile_id
 
-    @backoff.on_exception(
-        backoff.expo, LGHorizonApiConnectionError, max_tries=3, logger=_logger
-    )
     def _authorize(self) -> None:
         ctry_code = self._country_code[0:2]
         if ctry_code == "be":
@@ -111,6 +112,8 @@ class LGHorizonApi:
             error = error_json["error"]
             if error and error["statusCode"] == 97401:
                 raise LGHorizonApiUnauthorizedError("Invalid credentials")
+            elif error and error["statusCode"] == 97117:
+                raise LGHorizonApiLockedError("Account locked")
             elif error:
                 raise LGHorizonApiConnectionError(error["message"])
             else:
@@ -236,7 +239,14 @@ class LGHorizonApi:
         _logger.debug(f"MQTT token: {self._auth.mqttToken}")
 
     @backoff.on_exception(
-        backoff.expo, BaseException, jitter=None, max_time=600, logger=_logger
+        backoff.expo,
+        BaseException,
+        jitter=None,
+        max_tries=3,
+        logger=_logger,
+        giveup=lambda e: isinstance(
+            e, (LGHorizonApiLockedError, LGHorizonApiUnauthorizedError)
+        ),
     )
     def connect(self) -> None:
         self._config = self._get_config(self._country_code)
@@ -256,7 +266,7 @@ class LGHorizonApi:
     def disconnect(self):
         """Disconnect."""
         _logger.debug("Disconnect from API")
-        if not self._mqttClient.is_connected:
+        if not self._mqttClient or not self._mqttClient.is_connected:
             return
         self._mqttClient.disconnect()
 
@@ -267,7 +277,11 @@ class LGHorizonApi:
             box.register_mqtt()
 
     def _on_mqtt_message(self, message: str, topic: str) -> None:
-        if "source" in message:
+        if "action" in message and message["action"] == "OPS.getProfilesUpdate":
+            self._update_customer()
+            self._channels.clear()
+            self._get_channels()
+        elif "source" in message:
             deviceId = message["source"]
             if not isinstance(deviceId, str):
                 _logger.debug("ignoring message - not a string")
@@ -279,6 +293,7 @@ class LGHorizonApi:
                     self.settop_boxes[deviceId].update_state(message)
                 if "status" in message:
                     self._handle_box_update(deviceId, message)
+
             except Exception:
                 _logger.exception("Could not handle status message")
                 _logger.warning(f"Full message: {str(message)}")
@@ -378,14 +393,9 @@ class LGHorizonApi:
         return json_response
 
     def _register_customer_and_boxes(self):
-        _logger.info("Get personalisation info...")
-        personalisation_result = self._do_api_call(
-            f"{self._config['personalizationService']['URL']}/v1/customer/{self._auth.householdId}?with=profiles%2Cdevices"
-        )
-        _logger.debug("Personalisation result: %s ", personalisation_result)
-        self.customer = LGHorizonCustomer(personalisation_result)
+        self._update_customer()
         self._get_channels()
-        if "assignedDevices" not in personalisation_result:
+        if len(self.customer.settop_boxes) == 0:
             _logger.warning("No boxes found.")
             return
         _logger.info("Registering boxes")
@@ -406,6 +416,14 @@ class LGHorizonApi:
             self.settop_boxes[box.deviceId] = box
             _logger.info("Box %s registered...", box.deviceId)
 
+    def _update_customer(self):
+        _logger.info("Get customer data")
+        personalisation_result = self._do_api_call(
+            f"{self._config['personalizationService']['URL']}/v1/customer/{self._auth.householdId}?with=profiles%2Cdevices"
+        )
+        _logger.debug("Personalisation result: %s ", personalisation_result)
+        self.customer = LGHorizonCustomer(personalisation_result)
+
     def _get_channels(self):
         self._update_entitlements()
         _logger.info("Retrieving channels...")

{lghorizon-0.7.3b1.dist-info → lghorizon-0.7.3b3.dist-info}/METADATA

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

lghorizon-0.7.3b3.dist-info/RECORD

@@ -0,0 +1,12 @@
+lghorizon/__init__.py,sha256=XqePG0hj8NnudOcfCtEWqPsWP5l2headzrQhkfuDlv8,544
+lghorizon/const.py,sha256=S8UWatG7JPCqd1zk-iOoILTvFDEj7YhLcEXxLGhyJXs,4755
+lghorizon/exceptions.py,sha256=-6v55KDTogBldGAg1wV9Mrxm5L5BsaVguhBgVMOeJHk,404
+lghorizon/helpers.py,sha256=ZWpi7B3hBvwGV02KWQQHVyj7FLLUDtIvKc-Iqsj5VHA,263
+lghorizon/lghorizon_api.py,sha256=9cgTOMY5OI3BDBTPRz-q3AA1LUZ3ri1JFj7S6VgdOcw,21823
+lghorizon/models.py,sha256=lUKUJiebK65l0lfOwAzDvn0fC6UIvvQS6HI6a0ROZ_8,24437
+lghorizon/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lghorizon-0.7.3b3.dist-info/LICENSE,sha256=6Dh2tur1gMX3r3rITjVwUONBEJxyyPZDY8p6DZXtimE,1059
+lghorizon-0.7.3b3.dist-info/METADATA,sha256=MCqR616SRzYkwOezY9mV3s3lyfFJACi24-Owhio8ByE,1039
+lghorizon-0.7.3b3.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+lghorizon-0.7.3b3.dist-info/top_level.txt,sha256=usii76_AxGfPI6gjrrh-NyZxcQQuF1B8_Q9kd7sID8Q,10
+lghorizon-0.7.3b3.dist-info/RECORD,,

lghorizon-0.7.3b1.dist-info/RECORD

@@ -1,12 +0,0 @@
-lghorizon/__init__.py,sha256=Vu9KXNPKpZOqZOk1pXdptYzpXNwM77OjlSJNUOpukKQ,502
-lghorizon/const.py,sha256=S8UWatG7JPCqd1zk-iOoILTvFDEj7YhLcEXxLGhyJXs,4755
-lghorizon/exceptions.py,sha256=spEjRvbNdce2fauQiOFromAbV1QcfA0uMUt0nRVnnkM,318
-lghorizon/helpers.py,sha256=ZWpi7B3hBvwGV02KWQQHVyj7FLLUDtIvKc-Iqsj5VHA,263
-lghorizon/lghorizon_api.py,sha256=WyOVTXxvFHv6wj0niA4WxcUEHgLy_2D5Vi3-I00WRQM,21364
-lghorizon/models.py,sha256=lUKUJiebK65l0lfOwAzDvn0fC6UIvvQS6HI6a0ROZ_8,24437
-lghorizon/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lghorizon-0.7.3b1.dist-info/LICENSE,sha256=6Dh2tur1gMX3r3rITjVwUONBEJxyyPZDY8p6DZXtimE,1059
-lghorizon-0.7.3b1.dist-info/METADATA,sha256=kk5Pb-r7v35saP0gsIqTXIrhaimWoiwCNSKbhohHuVs,1039
-lghorizon-0.7.3b1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-lghorizon-0.7.3b1.dist-info/top_level.txt,sha256=usii76_AxGfPI6gjrrh-NyZxcQQuF1B8_Q9kd7sID8Q,10
-lghorizon-0.7.3b1.dist-info/RECORD,,