Update systembridgeconnector to 5.2.4, fix media source (home-assistant#158917)

Author: timmo001

homeassistant/components/system_bridge/__init__.py

@@ -13,12 +13,12 @@
     ConnectionErrorException,
     DataMissingException,
 )
+from systembridgeconnector.models.keyboard_key import KeyboardKey
+from systembridgeconnector.models.keyboard_text import KeyboardText
+from systembridgeconnector.models.modules.processes import Process
+from systembridgeconnector.models.open_path import OpenPath
+from systembridgeconnector.models.open_url import OpenUrl
 from systembridgeconnector.version import Version
-from systembridgemodels.keyboard_key import KeyboardKey
-from systembridgemodels.keyboard_text import KeyboardText
-from systembridgemodels.modules.processes import Process
-from systembridgemodels.open_path import OpenPath
-from systembridgemodels.open_url import OpenUrl
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry

homeassistant/components/system_bridge/config_flow.py

@@ -12,8 +12,8 @@
     ConnectionClosedException,
     ConnectionErrorException,
 )
+from systembridgeconnector.models.modules import GetData, Module
 from systembridgeconnector.websocket_client import WebSocketClient
-from systembridgemodels.modules import GetData, Module
 import voluptuous as vol
 
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult

homeassistant/components/system_bridge/const.py

@@ -2,7 +2,7 @@
 
 from typing import Final
 
-from systembridgemodels.modules import Module
+from systembridgeconnector.models.modules import Module
 
 DOMAIN = "system_bridge"
 

homeassistant/components/system_bridge/coordinator.py

@@ -13,13 +13,13 @@
     ConnectionClosedException,
     ConnectionErrorException,
 )
-from systembridgeconnector.websocket_client import WebSocketClient
-from systembridgemodels.modules import (
+from systembridgeconnector.models.modules import (
     GetData,
     Module,
     ModulesData,
     RegisterDataListener,
 )
+from systembridgeconnector.websocket_client import WebSocketClient
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (

homeassistant/components/system_bridge/data.py

@@ -2,7 +2,7 @@
 
 from dataclasses import dataclass, field
 
-from systembridgemodels.modules import (
+from systembridgeconnector.models.modules import (
     CPU,
     GPU,
     Battery,

homeassistant/components/system_bridge/manifest.json

@@ -9,6 +9,6 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["systembridgeconnector"],
-  "requirements": ["systembridgeconnector==5.1.0"],
+  "requirements": ["systembridgeconnector==5.2.4"],
   "zeroconf": ["_system-bridge._tcp.local."]
 }

homeassistant/components/system_bridge/media_player.py

@@ -5,7 +5,7 @@
 import datetime as dt
 from typing import Final
 
-from systembridgemodels.media_control import MediaAction, MediaControl
+from systembridgeconnector.models.media_control import MediaAction, MediaControl
 
 from homeassistant.components.media_player import (
     MediaPlayerDeviceClass,

homeassistant/components/system_bridge/media_source.py

@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from systembridgemodels.media_directories import MediaDirectory
-from systembridgemodels.media_files import MediaFile, MediaFiles
-from systembridgemodels.media_get_files import MediaGetFiles
+from systembridgeconnector.models.media_directories import MediaDirectory
+from systembridgeconnector.models.media_files import MediaFile, MediaFiles
+from systembridgeconnector.models.media_get_files import MediaGetFiles
 
 from homeassistant.components.media_player import MediaClass
 from homeassistant.components.media_source import (
@@ -183,9 +183,9 @@ def _build_media_items(
             for file in media_files.files
             if file.is_directory
             or (
-                file.is_file
-                and file.mime_type is not None
-                and file.mime_type.startswith(MEDIA_MIME_TYPES)
+                not file.is_directory
+                and file.content_type is not None
+                and file.content_type.startswith(MEDIA_MIME_TYPES)
             )
         ],
     )
@@ -197,20 +197,20 @@ def _build_media_item(
 ) -> BrowseMediaSource:
     """Build individual media item."""
     ext = ""
-    if media_file.is_file and media_file.mime_type is not None:
-        ext = f"~~{media_file.mime_type}"
+    if not media_file.is_directory and media_file.content_type is not None:
+        ext = f"~~{media_file.content_type}"
 
-    if media_file.is_directory or media_file.mime_type is None:
+    if media_file.is_directory or media_file.content_type is None:
         media_class = MediaClass.DIRECTORY
     else:
-        media_class = MEDIA_CLASS_MAP[media_file.mime_type.split("/", 1)[0]]
+        media_class = MEDIA_CLASS_MAP[media_file.content_type.split("/", 1)[0]]
 
     return BrowseMediaSource(
         domain=DOMAIN,
         identifier=f"{path}/{media_file.name}{ext}",
         media_class=media_class,
-        media_content_type=media_file.mime_type,
+        media_content_type=media_file.content_type,
         title=media_file.name,
-        can_play=media_file.is_file,
+        can_play=not media_file.is_directory,
         can_expand=media_file.is_directory,
     )

homeassistant/components/system_bridge/notify.py

@@ -5,7 +5,7 @@
 import logging
 from typing import Any
 
-from systembridgemodels.notification import Notification
+from systembridgeconnector.models.notification import Notification
 
 from homeassistant.components.notify import (
     ATTR_DATA,

homeassistant/components/system_bridge/sensor.py

@@ -7,9 +7,9 @@
 from datetime import UTC, datetime, timedelta
 from typing import Final, cast
 
-from systembridgemodels.modules.cpu import PerCPU
-from systembridgemodels.modules.displays import Display
-from systembridgemodels.modules.gpus import GPU
+from systembridgeconnector.models.modules.cpu import PerCPU
+from systembridgeconnector.models.modules.displays import Display
+from systembridgeconnector.models.modules.gpus import GPU
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,