home-assistant · balloob · May 13, 2022 · May 12, 2022 · May 9, 2022 · May 9, 2022
@@ -237,12 +237,14 @@ def _is_url(url):
     return all([result.scheme, result.netloc])
 
 
-async def _fetch_playlist(hass, url):
+async def _fetch_playlist(hass, url, supported_content_types):
     """Fetch a playlist from the given url."""
     try:
         session = aiohttp_client.async_get_clientsession(hass, verify_ssl=False)
         async with session.get(url, timeout=5) as resp:
             charset = resp.charset or "utf-8"
+            if resp.content_type in supported_content_types:
+                raise PlaylistSupported
             try:
                 playlist_data = (await resp.content.read(64 * 1024)).decode(charset)
             except ValueError as err:
@@ -260,7 +262,16 @@ async def parse_m3u(hass, url):
 
     Based on https://github.com/dvndrsn/M3uParser/blob/master/m3uparser.py
     """
-    m3u_data = await _fetch_playlist(hass, url)
+    # From Mozilla gecko source: https://github.com/mozilla/gecko-dev/blob/c4c1adbae87bf2d128c39832d72498550ee1b4b8/dom/media/DecoderTraits.cpp#L47-L52
+    hls_content_types = (
+        # https://tools.ietf.org/html/draft-pantos-http-live-streaming-19#section-10
+        "application/vnd.apple.mpegurl",
+        # Some sites serve these as the informal HLS m3u type.
+        "application/x-mpegurl",
+        "audio/mpegurl",
+        "audio/x-mpegurl",
+    )
+    m3u_data = await _fetch_playlist(hass, url, hls_content_types)
     m3u_lines = m3u_data.splitlines()
 
     playlist = []
@@ -301,7 +312,7 @@ async def parse_pls(hass, url):
 
     Based on https://github.com/mariob/plsparser/blob/master/src/plsparser.py
     """
-    pls_data = await _fetch_playlist(hass, url)
+    pls_data = await _fetch_playlist(hass, url, ())
 
     pls_parser = configparser.ConfigParser()
     try:

@@ -3,7 +3,7 @@
   "name": "Google Cast",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/cast",
-  "requirements": ["pychromecast==12.1.1"],
+  "requirements": ["pychromecast==12.1.2"],
   "after_dependencies": [
     "cloud",
     "http",

@@ -3,7 +3,7 @@
   "name": "deCONZ",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/deconz",
-  "requirements": ["pydeconz==91"],
+  "requirements": ["pydeconz==92"],
   "ssdp": [
     {
       "manufacturer": "Royal Philips Electronics",

diff --git a/homeassistant/components/fibaro/light.py b/homeassistant/components/fibaro/light.py
@@ -112,6 +112,7 @@ def _turn_on(self, **kwargs):
         if ATTR_BRIGHTNESS in kwargs:
             self._attr_brightness = kwargs[ATTR_BRIGHTNESS]
             self.set_level(scaleto99(self._attr_brightness))
+            return
 
         if ATTR_RGB_COLOR in kwargs:
             # Update based on parameters

@@ -37,6 +37,7 @@
     CONF_RTSP_TRANSPORT,
     CONF_STILL_IMAGE_URL,
     CONF_STREAM_SOURCE,
+    CONF_USE_WALLCLOCK_AS_TIMESTAMPS,
     DEFAULT_NAME,
     FFMPEG_OPTION_MAP,
     GET_IMAGE_TIMEOUT,
@@ -160,6 +161,10 @@ def __init__(self, hass, device_info, identifier, title):
                 CONF_RTSP_TRANSPORT
             ]
         self._auth = generate_auth(device_info)
+        if device_info.get(CONF_USE_WALLCLOCK_AS_TIMESTAMPS):
+            self.stream_options[
+                FFMPEG_OPTION_MAP[CONF_USE_WALLCLOCK_AS_TIMESTAMPS]
+            ] = "1"
 
         self._last_url = None
         self._last_image = None

@@ -41,6 +41,7 @@
     CONF_RTSP_TRANSPORT,
     CONF_STILL_IMAGE_URL,
     CONF_STREAM_SOURCE,
+    CONF_USE_WALLCLOCK_AS_TIMESTAMPS,
     DEFAULT_NAME,
     DOMAIN,
     FFMPEG_OPTION_MAP,
@@ -64,6 +65,7 @@
 def build_schema(
     user_input: dict[str, Any] | MappingProxyType[str, Any],
     is_options_flow: bool = False,
+    show_advanced_options=False,
 ):
     """Create schema for camera config setup."""
     spec = {
@@ -106,6 +108,13 @@ def build_schema(
                 default=user_input.get(CONF_LIMIT_REFETCH_TO_URL_CHANGE, False),
             )
         ] = bool
+        if show_advanced_options:
+            spec[
+                vol.Required(
+                    CONF_USE_WALLCLOCK_AS_TIMESTAMPS,
+                    default=user_input.get(CONF_USE_WALLCLOCK_AS_TIMESTAMPS, False),
+                )
+            ] = bool
     return vol.Schema(spec)
 
 
@@ -199,6 +208,8 @@ async def async_test_stream(hass, info) -> dict[str, str]:
             }
         if rtsp_transport := info.get(CONF_RTSP_TRANSPORT):
             stream_options[FFMPEG_OPTION_MAP[CONF_RTSP_TRANSPORT]] = rtsp_transport
+        if info.get(CONF_USE_WALLCLOCK_AS_TIMESTAMPS):
+            stream_options[FFMPEG_OPTION_MAP[CONF_USE_WALLCLOCK_AS_TIMESTAMPS]] = "1"
         _LOGGER.debug("Attempting to open stream %s", stream_source)
         container = await hass.async_add_executor_job(
             partial(
@@ -356,13 +367,20 @@ async def async_step_init(
                     ],
                     CONF_FRAMERATE: user_input[CONF_FRAMERATE],
                     CONF_VERIFY_SSL: user_input[CONF_VERIFY_SSL],
+                    CONF_USE_WALLCLOCK_AS_TIMESTAMPS: user_input.get(
+                        CONF_USE_WALLCLOCK_AS_TIMESTAMPS
+                    ),
                 }
                 return self.async_create_entry(
                     title=title,
                     data=data,
                 )
         return self.async_show_form(
             step_id="init",
-            data_schema=build_schema(user_input or self.config_entry.options, True),
+            data_schema=build_schema(
+                user_input or self.config_entry.options,
+                True,
+                self.show_advanced_options,
+            ),
             errors=errors,
         )
@@ -8,7 +8,11 @@
 CONF_STREAM_SOURCE = "stream_source"
 CONF_FRAMERATE = "framerate"
 CONF_RTSP_TRANSPORT = "rtsp_transport"
-FFMPEG_OPTION_MAP = {CONF_RTSP_TRANSPORT: "rtsp_transport"}
+CONF_USE_WALLCLOCK_AS_TIMESTAMPS = "use_wallclock_as_timestamps"
+FFMPEG_OPTION_MAP = {
+    CONF_RTSP_TRANSPORT: "rtsp_transport",
+    CONF_USE_WALLCLOCK_AS_TIMESTAMPS: "use_wallclock_as_timestamps",
+}
 RTSP_TRANSPORTS = {
     "tcp": "TCP",
     "udp": "UDP",

@@ -55,9 +55,13 @@
           "authentication": "[%key:component::generic::config::step::user::data::authentication%]",
           "limit_refetch_to_url_change": "[%key:component::generic::config::step::user::data::limit_refetch_to_url_change%]",
           "password": "[%key:common::config_flow::data::password%]",
+          "use_wallclock_as_timestamps": "Use wallclock as timestamps",
           "username": "[%key:common::config_flow::data::username%]",
           "framerate": "[%key:component::generic::config::step::user::data::framerate%]",
           "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
+        },
+        "data_description": {
+          "use_wallclock_as_timestamps": "This option may correct segmenting or crashing issues arising from buggy timestamp implementations on some cameras"
         }
       },
       "content_type": {

diff --git a/homeassistant/components/generic/translations/en.json b/homeassistant/components/generic/translations/en.json
@@ -32,7 +32,6 @@
             "user": {
                 "data": {
                     "authentication": "Authentication",
-                    "content_type": "Content Type",
                     "framerate": "Frame Rate (Hz)",
                     "limit_refetch_to_url_change": "Limit refetch to url change",
                     "password": "Password",
@@ -72,15 +71,18 @@
             "init": {
                 "data": {
                     "authentication": "Authentication",
-                    "content_type": "Content Type",
                     "framerate": "Frame Rate (Hz)",
                     "limit_refetch_to_url_change": "Limit refetch to url change",
                     "password": "Password",
                     "rtsp_transport": "RTSP transport protocol",
                     "still_image_url": "Still Image URL (e.g. http://...)",
                     "stream_source": "Stream Source URL (e.g. rtsp://...)",
+                    "use_wallclock_as_timestamps": "Use wallclock as timestamps",
                     "username": "Username",
                     "verify_ssl": "Verify SSL certificate"
+                },
+                "data_description": {
+                    "use_wallclock_as_timestamps": "This option may correct segmenting or crashing issues arising from buggy timestamp implementations on some cameras"
                 }
             }
         }

diff --git a/homeassistant/components/history_stats/data.py b/homeassistant/components/history_stats/data.py
@@ -96,7 +96,11 @@ async def async_update(self, event: Event | None) -> HistoryStatsState:
             new_data = False
             if event and event.data["new_state"] is not None:
                 new_state: State = event.data["new_state"]
-                if current_period_start <= new_state.last_changed <= current_period_end:
+                if (
+                    current_period_start_timestamp
+                    <= floored_timestamp(new_state.last_changed)
+                    <= current_period_end_timestamp
+                ):
                     self._history_current_period.append(new_state)
                     new_data = True
             if not new_data and current_period_end_timestamp < now_timestamp:

@@ -153,10 +153,9 @@ def _print_aldb(self):
 
     def get_device_property(self, name: str):
         """Get a single Insteon device property value (raw)."""
-        value = None
         if (prop := self._insteon_device.properties.get(name)) is not None:
-            value = prop.value if prop.new_value is None else prop.new_value
-        return value
+            return prop.value
+        return None
 
     def _get_label(self):
         """Get the device label for grouped devices."""

@@ -58,9 +58,9 @@ async def async_turn_on(self, **kwargs):
         """Turn light on."""
         if ATTR_BRIGHTNESS in kwargs:
             brightness = int(kwargs[ATTR_BRIGHTNESS])
-        else:
+        elif self._insteon_device_group.group == 1:
             brightness = self.get_device_property(ON_LEVEL)
-        if brightness is not None:
+        if brightness:
             await self._insteon_device.async_on(
                 on_level=brightness, group=self._insteon_device_group.group
             )

diff --git a/homeassistant/components/logi_circle/manifest.json b/homeassistant/components/logi_circle/manifest.json
@@ -3,7 +3,7 @@
   "name": "Logi Circle",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/logi_circle",
-  "requirements": ["logi_circle==0.2.2"],
+  "requirements": ["logi_circle==0.2.3"],
   "dependencies": ["ffmpeg", "http"],
   "codeowners": ["@evanjd"],
   "iot_class": "cloud_polling",

@@ -176,8 +176,6 @@ class MeaterProbeTemperature(
 ):
     """Meater Temperature Sensor Entity."""
 
-    _attr_device_class = SensorDeviceClass.TEMPERATURE
-    _attr_native_unit_of_measurement = TEMP_CELSIUS
     entity_description: MeaterSensorEntityDescription
 
     def __init__(

@@ -3,7 +3,7 @@
   "name": "Nettigo Air Monitor",
   "documentation": "https://www.home-assistant.io/integrations/nam",
   "codeowners": ["@bieniu"],
-  "requirements": ["nettigo-air-monitor==1.2.3"],
+  "requirements": ["nettigo-air-monitor==1.2.4"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",

@@ -165,17 +165,13 @@ async def async_check_date_and_time(self) -> None:
                 )
                 return
 
+            tzone = dt_util.DEFAULT_TIME_ZONE
+            cdate = device_time.LocalDateTime
             if device_time.UTCDateTime:
                 tzone = dt_util.UTC
                 cdate = device_time.UTCDateTime
-            else:
-                tzone = (
-                    dt_util.get_time_zone(
-                        device_time.TimeZone or str(dt_util.DEFAULT_TIME_ZONE)
-                    )
-                    or dt_util.DEFAULT_TIME_ZONE
-                )
-                cdate = device_time.LocalDateTime
+            elif device_time.TimeZone:
+                tzone = dt_util.get_time_zone(device_time.TimeZone.TZ) or tzone
 
             if cdate is None:
                 LOGGER.warning("Could not retrieve date/time on this camera")