Workaround to allow optional arguments during backward-compat

Author: lowlyocean

motioneye/config.py

@@ -1185,10 +1185,10 @@ def motion_camera_ui_to_dict(ui, prev_config=None):
         url = re.sub('\\s', '+', ui['web_hook_notifications_url'])
 
         on_event_start.append(
-            "{script} '{useragent}' '{accept}' '{method}' '{url}'".format(
+            "{script} {useragent} {accept} '{method}' '{url}'".format(
                 script=meyectl.find_command('webhook'),
-                useragent=ui['web_hook_notifications_user_agent'],
-                accept=ui['web_hook_notifications_accept'],
+                useragent=f"'{ui['web_hook_notifications_user_agent']}'" if ui['web_hook_notifications_user_agent'] else '',
+                accept=f"'{ui['web_hook_notifications_accept']}'" if ui['web_hook_notifications_accept'] else '',
                 method=ui['web_hook_notifications_http_method'],
                 url=url,
             )
@@ -1208,14 +1208,13 @@ def motion_camera_ui_to_dict(ui, prev_config=None):
         url = re.sub(r'\s', '+', ui['web_hook_end_notifications_url'])
 
         on_event_end.append(
-            "%(script)s '%(useragent)s' '%(accept)s' '%(method)s' '%(url)s'"
-            % {
-                'script': meyectl.find_command('webhook'),
-                'useragent': ui['web_hook_end_notifications_user_agent'],
-                'accept': ui['web_hook_end_notifications_accept'],
-                'method': ui['web_hook_end_notifications_http_method'],
-                'url': url,
-            }
+            "{script} {useragent} {accept} '{method}' '{url}'".format(
+                script=meyectl.find_command('webhook'),
+                useragent=f"'{ui['web_hook_end_notifications_user_agent']}'" if ui['web_hook_end_notifications_user_agent'] else '',
+                accept=f"'{ui['web_hook_end_notifications_accept']}'" if ui['web_hook_end_notifications_accept'] else '',
+                method=ui['web_hook_end_notifications_http_method'],
+                url=url,
+            )
         )
 
     if ui['command_end_notifications_enabled']:
@@ -1287,7 +1286,7 @@ def motion_camera_ui_to_dict(ui, prev_config=None):
     return prev_config
 
 
-def motion_camera_dict_to_ui(data):
+def motion_camera_dict_to_ui(data):  # noqa: C901
 
     ui = {
         # device
@@ -1699,15 +1698,15 @@ def motion_camera_dict_to_ui(data):
         elif ' webhook ' in e:
             e = shlex.split(e)
 
-            if len(e) < 3:
+            if len(e) < 7:
                 continue
 
             ui['web_hook_notifications_enabled'] = True
             ui['web_hook_notifications_http_method'] = e[-2]
             ui['web_hook_notifications_url'] = e[-1]
 
             # support pre-v0.43.0 configs
-            if len(e) < 5:
+            if len(e) < 9:
                 continue
 
             ui['web_hook_notifications_accept'] = e[-3]
@@ -1733,15 +1732,15 @@ def motion_camera_dict_to_ui(data):
         if ' webhook ' in e:
             e = shlex.split(e)
 
-            if len(e) < 3:
+            if len(e) < 7:
                 continue
 
             ui['web_hook_end_notifications_enabled'] = True
             ui['web_hook_end_notifications_http_method'] = e[-2]
             ui['web_hook_end_notifications_url'] = e[-1]
 
             # support pre-v0.43.0 configs
-            if len(e) < 5:
+            if len(e) < 9:
                 continue
 
             ui['web_hook_end_notifications_accept'] = e[-3]