Merge remote-tracking branch 'origin/dev' into dev

Author: weblate

motioneye/config.py

@@ -1131,6 +1131,12 @@ def motion_camera_ui_to_dict(ui, prev_config=None):
                 )
                 data['vid_control_params'] = ','.join(vid_control_params)
 
+            else:
+                logging.warning(
+                    f'camera {prev_config["@id"]} control listing failed, '
+                    'controls not updated'
+                )
+
     else:  # assuming netcam
         if match(
             r'^rtsp|^rtmp', data.get('netcam_url', prev_config.get('netcam_url', ''))

motioneye/controls/v4l2ctl.py

@@ -205,6 +205,8 @@ def list_ctrls(device):
 
         controls[control] = properties
 
-    _ctrls_cache[device] = controls
+    # don't cache an empty result, the cache has no expiry
+    if controls:
+        _ctrls_cache[device] = controls
 
     return controls