lghorizon 0.9.0.dev1__tar.gz → 0.9.0.dev2__tar.gz

{lghorizon-0.9.0.dev1 → lghorizon-0.9.0.dev2}/PKG-INFO

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

lghorizon-0.9.0.dev2/lghorizon/__init__.py

@@ -0,0 +1,3 @@
+"""Python client for LG Horizon."""
+
+pass

lghorizon-0.9.0.dev1/lghorizon/lghorizonapi.py → lghorizon-0.9.0.dev2/lghorizon/lghorizon_api.py

@@ -3,21 +3,21 @@
 import logging
 from typing import Any, Dict, cast
 
-from .models.lghorizon_device import LGHorizonDevice
-from .models.lghorizon_channel import LGHorizonChannel
-from .models.lghorizon_auth import LGHorizonAuth
-from .models.lghorizon_customer import LGHorizonCustomer
-from .models.lghorizon_mqtt_client import LGHorizonMqttClient
-from .models.lghorizon_config import LGHorizonServicesConfig
-from .models.lghorizon_entitlements import LGHorizonEntitlements
-from .models.lghorizon_profile import LGHorizonProfile
-from .models.lghorizon_message import LGHorizonMessageType
-from .message_factory import LGHorizonMessageFactory
-from .models.lghorizon_message import LGHorizonStatusMessage, LGHorizonUIStatusMessage
-from .models.lghorizon_device_state import LGHorizonRunningState
-from .models.lghorizon_recordings import LGHorizonRecordingList, LGHorizonRecordingQuota
-from .recording_factory import LGHorizonRecordingFactory
-from .device_state_processor import LGHorizonDeviceStateProcessor
+from .lghorizon_device import LGHorizonDevice
+from .lghorizon_models import LGHorizonChannel
+from .lghorizon_models import LGHorizonAuth
+from .lghorizon_models import LGHorizonCustomer
+from .lghorizon_mqtt_client import LGHorizonMqttClient
+from .lghorizon_models import LGHorizonServicesConfig
+from .lghorizon_models import LGHorizonEntitlements
+from .lghorizon_models import LGHorizonProfile
+from .lghorizon_models import LGHorizonMessageType
+from .lghorizon_message_factory import LGHorizonMessageFactory
+from .lghorizon_models import LGHorizonStatusMessage, LGHorizonUIStatusMessage
+from .lghorizon_models import LGHorizonRunningState
+from .lghorizon_models import LGHorizonRecordingList, LGHorizonRecordingQuota
+from .lghorizon_recording_factory import LGHorizonRecordingFactory
+from .lghorizon_device_state_processor import LGHorizonDeviceStateProcessor
 
 
 _LOGGER = logging.getLogger(__name__)

{lghorizon-0.9.0.dev1/lghorizon/models → lghorizon-0.9.0.dev2/lghorizon}/lghorizon_device.py

@@ -1,44 +1,38 @@
-"""LG Horizon device (set-top box) model."""
+"""LG Horizon Device."""
+
+from __future__ import annotations
 
 import json
 import logging
-from typing import Callable, Dict, Optional, Any, Coroutine
-
+from typing import Any, Callable, Coroutine, Dict, Optional
+from .lghorizon_models import (
+    LGHorizonRunningState,
+    LGHorizonStatusMessage,
+    LGHorizonUIStatusMessage,
+    LGHorizonDeviceState,
+    LGHorizonAuth,
+    LGHorizonChannel,
+)
 
-from ..const import (
-    ONLINE_RUNNING,
-    MEDIA_KEY_POWER,
-    MEDIA_KEY_PLAY_PAUSE,
-    MEDIA_KEY_STOP,
-    MEDIA_KEY_CHANNEL_UP,
+from .exceptions import LGHorizonApiConnectionError
+from .helpers import make_id
+from .lghorizon_device_state_processor import LGHorizonDeviceStateProcessor
+from .lghorizon_mqtt_client import LGHorizonMqttClient
+from .const import (
     MEDIA_KEY_CHANNEL_DOWN,
+    MEDIA_KEY_CHANNEL_UP,
     MEDIA_KEY_ENTER,
-    MEDIA_KEY_REWIND,
     MEDIA_KEY_FAST_FORWARD,
+    MEDIA_KEY_PLAY_PAUSE,
+    MEDIA_KEY_POWER,
     MEDIA_KEY_RECORD,
+    MEDIA_KEY_REWIND,
+    MEDIA_KEY_STOP,
+    ONLINE_RUNNING,
     PLATFORM_TYPES,
 )
-from ..helpers import make_id
-from .lghorizon_auth import LGHorizonAuth
-from .lghorizon_channel import LGHorizonChannel
-from .lghorizon_mqtt_client import LGHorizonMqttClient  # Added import for type checking
-from .lghorizon_device_state import LGHorizonDeviceState, LGHorizonRunningState
-from .exceptions import LGHorizonApiConnectionError
-from .lghorizon_message import LGHorizonStatusMessage, LGHorizonUIStatusMessage
-
-from ..device_state_processor import LGHorizonDeviceStateProcessor
-
-# Assuming these models are available from legacy or will be moved to models/
-# from ..legacy.models import (
-#     # LGHorizonPlayingInfo,
-#     # LGHorizonPlayerState, # This is now in lghorizon_ui_status.py
-#     # LGHorizonReplayEvent,
-#     # LGHorizonRecordingSingle,
-#     # LGHorizonVod,
-#     # LGHorizonApp,
-# )
 
-_logger = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(__name__)
 
 
 class LGHorizonDevice:
@@ -207,7 +201,7 @@ class LGHorizonDevice:
 
     async def _trigger_callback(self):
         if self._change_callback:
-            _logger.debug("Callback called from box %s", self.device_id)
+            _LOGGER.debug("Callback called from box %s", self.device_id)
             await self._change_callback(self.device_id)
 
     async def turn_on(self) -> None:

lghorizon-0.9.0.dev1/lghorizon/device_state_processor.py → lghorizon-0.9.0.dev2/lghorizon/lghorizon_device_state_processor.py

@@ -6,9 +6,9 @@ import urllib.parse
 
 from typing import cast, Dict, Optional
 
-from .models.lghorizon_device_state import LGHorizonDeviceState, LGHorizonRunningState
-from .models.lghorizon_message import LGHorizonStatusMessage, LGHorizonUIStatusMessage
-from .models.lghorizon_sources import (
+from .lghorizon_models import LGHorizonDeviceState, LGHorizonRunningState
+from .lghorizon_models import LGHorizonStatusMessage, LGHorizonUIStatusMessage
+from .lghorizon_models import (
     LGHorizonSourceType,
     LGHorizonLinearSource,
     LGHorizonVODSource,
@@ -16,20 +16,20 @@ from .models.lghorizon_sources import (
     LGHorizonNDVRSource,
     LGHorizonReviewBufferSource,
 )
-from .models.lghorizon_auth import LGHorizonAuth
-from .models.lghorizon_events import (
+from .lghorizon_models import LGHorizonAuth
+from .lghorizon_models import (
     LGHorizonReplayEvent,
     LGHorizonVOD,
 )
 
-from .models.lghorizon_recordings import LGHorizonRecordingSingle
-from .models.lghorizon_channel import LGHorizonChannel
-from .models.lghorizon_ui_status import (
+from .lghorizon_models import LGHorizonRecordingSingle
+from .lghorizon_models import LGHorizonChannel
+from .lghorizon_models import (
     LGHorizonUIStateType,
     LGHorizonAppsState,
     LGHorizonPlayerState,
 )
-from .models.lghorizon_customer import LGHorizonCustomer
+from .lghorizon_models import LGHorizonCustomer
 
 
 class LGHorizonDeviceStateProcessor:

lghorizon-0.9.0.dev1/lghorizon/message_factory.py → lghorizon-0.9.0.dev2/lghorizon/lghorizon_message_factory.py

@@ -1,6 +1,6 @@
 "LG Horizon Message Factory."
 
-from .models.lghorizon_message import (
+from .lghorizon_models import (
     LGHorizonMessage,
     LGHorizonStatusMessage,
     LGHorizonUnknownMessage,