lghorizon 0.5.14__py3-none-any.whl → 0.6.0__py3-none-any.whl

lghorizon/lghorizon_api.py

@@ -5,6 +5,7 @@ import sys, traceback
 from .exceptions import LGHorizonApiUnauthorizedError, LGHorizonApiConnectionError
 import backoff
 from requests import Session, exceptions as request_exceptions
+from paho.mqtt.client import WebsocketConnectionError
 import re
 from .models import (
     LGHorizonAuth, 
@@ -260,6 +261,7 @@ class LGHorizonApi:
         self._auth.mqttToken = mqtt_response["token"]
         _logger.debug(f"MQTT token: {self._auth.mqttToken}")
 
+    @backoff.on_exception(backoff.expo, BaseException, jitter=None, max_time=600, logger=_logger)
     def connect(self) -> None:
         _logger.debug("Connect to API")
         self._authorize()
@@ -295,8 +297,8 @@ class LGHorizonApi:
                 if "status" in message:
                     self._handle_box_update(deviceId, message)
             except Exception as ex:
-                _logger.error("Could not handle status message")
-                _logger.error(f"Full message: {str(message)}")
+                _logger.exception("Could not handle status message")
+                _logger.warning(f"Full message: {str(message)}")
                 self.settop_boxes[deviceId].playing_info.reset()
                 self.settop_boxes[deviceId].playing_info.set_paused(False)
         elif "CPE.capacity" in message:
@@ -332,15 +334,21 @@ class LGHorizonApi:
                 self.settop_boxes[deviceId].update_with_replay_event(source_type, replayEvent, channel)
             elif source_type == BOX_PLAY_STATE_DVR:
                 recordingId = state_source["recordingId"]
+                session_start_time = state_source["sessionStartTime"]
+                session_end_time = state_source["sessionEndTime"]
+                last_speed_change_time = playerState["lastSpeedChangeTime"]
+                relative_position = playerState["relativePosition"]
                 raw_recording = self._do_api_call(f"{self._country_settings['api_url']}/eng/web/recording-service/customers/{self._auth.householdId}/details/single/{recordingId}?profileId=4504e28d-c1cb-4284-810b-f5eaab06f034&language={self._country_settings['language']}")
                 recording = LGHorizonRecordingSingle(raw_recording)
                 channel = self._channels[recording.channelId]
-                self.settop_boxes[deviceId].update_with_recording(source_type, recording, channel)
+                self.settop_boxes[deviceId].update_with_recording(source_type, recording, channel,session_start_time, session_end_time, last_speed_change_time, relative_position)
             elif source_type == BOX_PLAY_STATE_VOD:
                 titleId = state_source["titleId"]
+                last_speed_change_time = playerState["lastSpeedChangeTime"]
+                relative_position = playerState["relativePosition"]
                 raw_vod = self._do_api_call(f"{self._country_settings['api_url']}/eng/web/vod-service/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(source_type, vod)
+                self.settop_boxes[deviceId].update_with_vod(source_type, vod, last_speed_change_time, relative_position)
         elif uiStatus == "apps":
             app = LGHorizonApp(statusPayload["appsState"])
             self.settop_boxes[deviceId].update_with_app('app', app)     

lghorizon/models.py

@@ -66,6 +66,9 @@ class LGHorizonPlayingInfo:
     source_type: str = None
     paused: bool = False
     channel_title: str = None
+    duration: float = None
+    position: float = None
+    last_position_update: datetime = None
 
     def __init__(self):
         """Initialize the playing info."""
@@ -92,8 +95,20 @@ class LGHorizonPlayingInfo:
         self.image = image
 
     def set_source_type(self, source_type):
-        """Set sourfce type."""
+        """Set source type."""
         self.source_type = source_type
+    
+    def set_duration(self, duration: float):
+        """Set duration."""
+        self.duration = duration
+    
+    def set_position(self, position: float):
+        """Set position."""
+        self.position = position
+
+    def set_last_position_update(self, last_position_update:datetime):
+        """Set last position update."""
+        self.last_position_update = last_position_update
 
     def reset(self):
         self.channel_id = None
@@ -102,6 +117,9 @@ class LGHorizonPlayingInfo:
         self.source_type = None
         self.paused = False
         self.channel_title = None
+        self.duration = None
+        self.last_position_update = None
+        self.position = None
 
 class LGHorizonChannel:
     """Represent a channel."""
@@ -255,8 +273,10 @@ class LGHorizonRecordingListSeasonShow(LGHorizonBaseRecording):
 class LGHorizonVod:
     title:str = None
     image: str = None
+    duration: float = None
     def __init__(self, vod_json) -> None:
         self.title = vod_json['title']
+        self.duration = vod_json['duration']
 
 class LGHorizonApp:
     title:str = None
@@ -407,20 +427,31 @@ class LGHorizonBox:
         self.playing_info.set_image(channel.stream_image)
         self._trigger_callback()
 
-    def update_with_recording(self, source_type: str, recording:LGHorizonRecordingSingle, channel: LGHorizonChannel) -> None:
+    def update_with_recording(self, source_type: str, recording:LGHorizonRecordingSingle, channel: LGHorizonChannel, start:float, end: float, last_speed_change:float, relative_position: float) -> None:
         self.playing_info.set_source_type(source_type)
         self.playing_info.set_channel(channel.id)
         self.playing_info.set_channel_title(channel.title)
         self.playing_info.set_title(f"{recording.title}")
         self.playing_info.set_image(recording.image)
+        start_dt = datetime.fromtimestamp(start / 1000.0)
+        end_dt = datetime.fromtimestamp(end / 1000.0)
+        duration = (end_dt - start_dt).total_seconds()
+        self.playing_info.set_duration(duration)
+        self.playing_info.set_position(relative_position)
+        last_update_dt = datetime.fromtimestamp(last_speed_change / 1000.0)
+        self.playing_info.set_last_position_update(last_update_dt)
         self._trigger_callback()
     
-    def update_with_vod(self, source_type: str, vod:LGHorizonVod) -> None:
+    def update_with_vod(self, source_type: str, vod:LGHorizonVod, last_speed_change:float, relative_position: float) -> None:
         self.playing_info.set_source_type(source_type)
         self.playing_info.set_channel(None)
         self.playing_info.set_channel_title(None)
         self.playing_info.set_title(vod.title)
         self.playing_info.set_image(None)
+        self.playing_info.set_duration(vod.duration)
+        self.playing_info.set_position(relative_position)
+        last_update_dt = datetime.fromtimestamp(last_speed_change / 1000.0)
+        self.playing_info.set_last_position_update(last_update_dt)
         self._trigger_callback()
     
     def update_with_app(self, source_type: str, app:LGHorizonApp) -> None:

{lghorizon-0.5.14.dist-info → lghorizon-0.6.0.dist-info}/METADATA

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

lghorizon-0.6.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+lghorizon/__init__.py,sha256=_VjVE44ErvJJMnF5QgXdlw_nQzbHZUhGWw5hF40PolQ,426
+lghorizon/const.py,sha256=ffLn2oicPMDEdTBqofnig8tLJ7dd-kzqLr80UwEZj3Y,9706
+lghorizon/exceptions.py,sha256=spEjRvbNdce2fauQiOFromAbV1QcfA0uMUt0nRVnnkM,318
+lghorizon/helpers.py,sha256=ZWpi7B3hBvwGV02KWQQHVyj7FLLUDtIvKc-Iqsj5VHA,263
+lghorizon/lghorizon_api.py,sha256=o1EB22gYtnFrt5hTw3V5zIqOq7dyUHkg1MWjZO92Fcc,22402
+lghorizon/models.py,sha256=35jAU5mIXq8CaimMGZlZq5-EDCd7SSqJJwoQFm_BAiU,22832
+lghorizon-0.6.0.dist-info/LICENSE,sha256=6Dh2tur1gMX3r3rITjVwUONBEJxyyPZDY8p6DZXtimE,1059
+lghorizon-0.6.0.dist-info/METADATA,sha256=mAGM9zAKVTQ6F9-xGmUvSVfC4Kcxn_q-vpQRXkv6vnc,1044
+lghorizon-0.6.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+lghorizon-0.6.0.dist-info/top_level.txt,sha256=usii76_AxGfPI6gjrrh-NyZxcQQuF1B8_Q9kd7sID8Q,10
+lghorizon-0.6.0.dist-info/RECORD,,

lghorizon-0.5.14.dist-info/RECORD

@@ -1,11 +0,0 @@
-lghorizon/__init__.py,sha256=_VjVE44ErvJJMnF5QgXdlw_nQzbHZUhGWw5hF40PolQ,426
-lghorizon/const.py,sha256=ffLn2oicPMDEdTBqofnig8tLJ7dd-kzqLr80UwEZj3Y,9706
-lghorizon/exceptions.py,sha256=spEjRvbNdce2fauQiOFromAbV1QcfA0uMUt0nRVnnkM,318
-lghorizon/helpers.py,sha256=ZWpi7B3hBvwGV02KWQQHVyj7FLLUDtIvKc-Iqsj5VHA,263
-lghorizon/lghorizon_api.py,sha256=kBdZYsIbFfPo1TYl8RKZoDuIh9OUfB5FyMwp2BF869c,21697
-lghorizon/models.py,sha256=TV7utGdGaOTBvglElqHWZ16xyML-GkHaf7EwqUuPCG8,21377
-lghorizon-0.5.14.dist-info/LICENSE,sha256=6Dh2tur1gMX3r3rITjVwUONBEJxyyPZDY8p6DZXtimE,1059
-lghorizon-0.5.14.dist-info/METADATA,sha256=rVkEFRl50CPHaQpORVi83UbncGOQAZ8Oja5wLUTEcnE,1045
-lghorizon-0.5.14.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-lghorizon-0.5.14.dist-info/top_level.txt,sha256=usii76_AxGfPI6gjrrh-NyZxcQQuF1B8_Q9kd7sID8Q,10
-lghorizon-0.5.14.dist-info/RECORD,,