config: simplified set_default mechanism

diff --git a/motioneye/config.py b/motioneye/config.py
index 6d9c6711acac4126f8fb22caaa9c697e42a56e75..4c4baaad69b93209df68fae6b85478a22ba742c6 100644 (file)
--- a/motioneye/config.py
+++ b/motioneye/config.py
@@ -131,7 +131,6 @@ def set_main(main_config):
     global _main_config_cache
     
     main_config = dict(main_config)
-    _set_default_motion(main_config, old_motion=is_old_motion())
     for n, v in _main_config_cache.iteritems():
         main_config.setdefault(n, v)
     _main_config_cache = main_config
@@ -326,7 +325,6 @@ def get_camera(camera_id, as_lines=False):
                 camera_config['netcam_keepalive'] = camera_config.pop('netcam_http') in ['1.1', 'keepalive']
 
         _get_additional_config(camera_config, camera_id=camera_id)
-        _set_default_motion_camera(camera_id, camera_config)
     
     elif utils.remote_camera(camera_config):
         pass
@@ -389,9 +387,7 @@ def set_camera(camera_id, camera_config):
                 camera_config['gap'] = camera_config.pop('event_gap')
             if 'netcam_keepalive' in camera_config:
                 camera_config['netcam_http'] = '1.1' if camera_config.pop('netcam_keepalive') else '1.0'
-                
-        _set_default_motion_camera(camera_id, camera_config, old_motion)
-        
+         
         # set the enabled status in main config
         main_config = get_main()
         threads = main_config.setdefault('thread', [])
@@ -488,7 +484,6 @@ def add_camera(device_details):
                 break
 
         camera_config['videodevice'] = device_details['uri']
-        _set_default_motion_camera(camera_id, camera_config)
     
     elif proto == 'motioneye':
         camera_config['@proto'] = 'motioneye'
@@ -517,13 +512,22 @@ def add_camera(device_details):
             camera_config['width'] = 640
             camera_config['height'] = 480
 
-        _set_default_motion_camera(camera_id, camera_config)
-
     else: # assuming mjpeg
         camera_config['@proto'] = 'mjpeg'
         camera_config['@url'] = device_details['url']
+    
+    if utils.local_motion_camera(camera_config):
+        _set_default_motion_camera(camera_id, camera_config, is_old_motion())
+
+        # go through the config conversion functions back and forth once
+        camera_config = motion_camera_ui_to_dict(motion_camera_dict_to_ui(camera_config), camera_config)
+    
+    elif utils.simple_mjpeg_camera(camera_config):
         _set_default_simple_mjpeg_camera(camera_id, camera_config)
 
+        # go through the config conversion functions back and forth once
+        camera_config = simple_mjpeg_camera_ui_to_dict(simple_mjpeg_camera_dict_to_ui(camera_config), camera_config)
+
     # write the configuration to file
     set_camera(camera_id, camera_config)
     
@@ -1564,7 +1568,6 @@ def _set_default_motion(data, old_motion):
 
 def _set_default_motion_camera(camera_id, data, old_motion=False):
     data.setdefault('@name', 'Camera' + str(camera_id))
-    data.setdefault('@enabled', False)
     data.setdefault('@id', camera_id)
     
     if not utils.net_camera(data):
@@ -1667,7 +1670,6 @@ def _set_default_motion_camera(camera_id, data, old_motion=False):
 
 def _set_default_simple_mjpeg_camera(camera_id, data):
     data.setdefault('@name', 'Camera' + str(camera_id))
-    data.setdefault('@enabled', False)
     data.setdefault('@id', camera_id)