Release 1.0.10

Author: user2684

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.0.10] (2022-12-04)
+### Added
+- Camera entity now supports snapshots and video streaming
+
 ## [1.0.9] (2022-11-26)
 ### Added
 - PTZ Support, exposed as `imou_life.ptz_location` and `imou_life.ptz_move` services

custom_components/imou_life/camera.py

@@ -2,7 +2,11 @@
 from collections.abc import Callable
 import logging
 
-from homeassistant.components.camera import ENTITY_ID_FORMAT, Camera
+from homeassistant.components.camera import (
+    ENTITY_ID_FORMAT,
+    Camera,
+    CameraEntityFeature,
+)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_platform
@@ -16,6 +20,7 @@
     ATTR_PTZ_VERTICAL,
     ATTR_PTZ_ZOOM,
     DOMAIN,
+    ENABLED_CAMERAS,
     SERVIZE_PTZ_LOCATION,
     SERVIZE_PTZ_MOVE,
 )
@@ -70,12 +75,35 @@ async def async_setup_entry(
 class ImouCamera(ImouEntity, Camera):
     """imou camera class."""
 
+    _attr_supported_features = CameraEntityFeature.STREAM
+
     def __init__(self, coordinator, config_entry, sensor_instance, entity_format):
         """Initialize."""
+        Camera.__init__(self)
         ImouEntity.__init__(
             self, coordinator, config_entry, sensor_instance, entity_format
         )
-        Camera.__init__(self)
+
+    @property
+    def entity_registry_enabled_default(self) -> bool:
+        """If the entity is enabled by default."""
+        return self.sensor_instance.get_name() in ENABLED_CAMERAS
+
+    async def async_camera_image(self, width=None, height=None) -> bytes:
+        """Return bytes of camera image."""
+        _LOGGER.debug(
+            "[%s] requested camera image",
+            self.device.get_name(),
+        )
+        return await self.sensor_instance.async_get_image()
+
+    async def stream_source(self) -> str:
+        """Return the source of the stream."""
+        _LOGGER.debug(
+            "[%s] requested camera stream url",
+            self.device.get_name(),
+        )
+        return await self.sensor_instance.async_get_stream_url()
 
     async def async_service_ptz_location(self, horizontal, vertical, zoom):
         """Perform PTZ location action."""
@@ -104,7 +132,3 @@ async def async_service_ptz_move(self, operation, duration):
             operation,
             duration,
         )
-
-    async def async_camera_image(self, width=None, height=None):
-        """Return bytes of camera image."""
-        return None

custom_components/imou_life/const.py

@@ -43,6 +43,11 @@
     "pushNotifications",
 ]
 
+# cameras which are enabled by default
+ENABLED_CAMERAS = [
+    "camera",
+]
+
 # icons of the sensors
 SENSOR_ICONS = {
     "__default__": "mdi:bookmark",
@@ -74,4 +79,5 @@
     "siren": "mdi:alarm-light",
     # cameras
     "camera": "mdi:video",
+    "cameraSD": "mdi:video",
 }

custom_components/imou_life/manifest.json

@@ -6,7 +6,7 @@
   "dependencies": [],
   "config_flow": true,
   "codeowners": ["@user2684"],
-  "requirements": ["imouapi==1.0.9"],
-  "version": "1.0.9",
+  "requirements": ["imouapi==1.0.10"],
+  "version": "1.0.10",
   "iot_class": "cloud_polling"
 }

requirements_test.txt

@@ -1,3 +1,3 @@
 -r requirements_dev.txt
 pytest-homeassistant-custom-component==0.12.19
-imouapi==1.0.9
+imouapi==1.0.10

tests/test_config_flow.py

@@ -37,6 +37,7 @@ def bypass_setup_fixture():
         yield
 
 
+@pytest.mark.asyncio
 async def test_discover_ok(hass, api_ok):
     """Test discover flow: ok."""
     # Initialize a config flow as the user is clicking on add new integration
@@ -76,6 +77,7 @@ async def test_discover_ok(hass, api_ok):
     assert result["result"]
 
 
+@pytest.mark.asyncio
 async def test_login_error(hass, api_invalid_app_id):
     """Test config flow: invalid app id."""
     result = await hass.config_entries.flow.async_init(
@@ -88,6 +90,7 @@ async def test_login_error(hass, api_invalid_app_id):
     assert result["errors"] == {"base": "invalid_configuration"}
 
 
+@pytest.mark.asyncio
 async def test_manual_ok(hass, api_ok):
     """Test manual flow: ok."""
     # Initialize a config flow as the user is clicking on add new integration
@@ -128,6 +131,7 @@ async def test_manual_ok(hass, api_ok):
     assert result["result"]
 
 
+@pytest.mark.asyncio
 async def test_options_flow(hass):
     """Test an options flow."""
     entry = MockConfigEntry(domain=DOMAIN, data=MOCK_CONFIG_ENTRY, entry_id="test")

tests/test_init.py

@@ -14,6 +14,7 @@
 from .const import MOCK_CONFIG_ENTRY
 
 
+@pytest.mark.asyncio
 async def test_setup_unload_and_reload_entry(hass, api_ok):
     """Test entry setup and unload."""
     # Create a mock entry so we don't have to go through config flow
@@ -39,6 +40,7 @@ async def test_setup_unload_and_reload_entry(hass, api_ok):
     assert config_entry.entry_id not in hass.data[DOMAIN]
 
 
+@pytest.mark.asyncio
 async def test_setup_entry_exception(hass, api_invalid_data):
     """Test ConfigEntryNotReady when API raises an exception during entry setup."""
     config_entry = MockConfigEntry(

tests/test_switch.py

@@ -26,6 +26,7 @@ def bypass_added_to_hass():
         yield
 
 
+@pytest.mark.asyncio
 async def test_switch(hass, api_ok):
     """Test switch services."""
     # Create a mock entry so we don't have to go through config flow