find_motion() result is now cached; motion webcontrol option is now

enabled on port 7999

diff --git a/src/config.py b/src/config.py
index 0fc2a2b964b07efd655580f1accd476f410368a5..36ec6a77d42d6c4d9433e5d2720c1b4c17443602 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -104,7 +104,9 @@ def get_main(as_lines=False):
 def set_main(main_config):
     global _main_config_cache
     
-    _set_default_motion(main_config)
+    old_motion = _is_old_motion()
+    
+    _set_default_motion(main_config, old_motion)
     _main_config_cache = dict(main_config)
 
     _set_wifi_settings(main_config)
@@ -1221,9 +1223,9 @@ def _is_old_motion():
         return False
 
 
-def _set_default_motion(data):
+def _set_default_motion(data, old_motion=False):
     data.setdefault('@enabled', True)
-    
+
     data.setdefault('@show_advanced', False)
     data.setdefault('@admin_username', 'admin')
     data.setdefault('@admin_password', '')
@@ -1234,6 +1236,12 @@ def _set_default_motion(data):
     data.setdefault('@wifi_enabled', False)
     data.setdefault('@wifi_name', '')
     data.setdefault('@wifi_key', '')
+    
+    if old_motion:
+        data.setdefault('control_port', 7999)
+    
+    else:
+        data.setdefault('webcontrol_port', 7999)
 
 
 def _set_default_motion_camera(camera_id, data, old_motion=False):

diff --git a/src/motionctl.py b/src/motionctl.py
index aab9a5b20fc9a912e3fee097a615d264848df0d7..e62aa5c150bd2e329ef7fe6d7917973f9084b2f1 100644 (file)
--- a/src/motionctl.py
+++ b/src/motionctl.py
@@ -28,9 +28,14 @@ import settings
 
 
 _started = False
+_motion_binary_cache = None
 
 
 def find_motion():
+    global _motion_binary_cache
+    if _motion_binary_cache:
+        return _motion_binary_cache
+
     try:
         binary = subprocess.check_output('which motion', shell=True).strip()
     
@@ -46,7 +51,9 @@ def find_motion():
     result = re.findall('^motion Version ([^,]+)', help)
     version = result and result[0] or ''
     
-    return (binary, version)
+    _motion_binary_cache = (binary, version)
+    
+    return _motion_binary_cache
 
 
 def start():