From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 23 Aug 2014 17:15:07 +0000 (+0300)
Subject: added MEDIA_PATH setting
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=ee3556ec8f48b963b2c6cadce82c59a6ee48bcf7;p=motioneye-debian

added MEDIA_PATH setting
---

diff --git a/motioneye.py b/motioneye.py
index 72deb90..4d93d6b 100755
--- a/motioneye.py
+++ b/motioneye.py
@@ -38,11 +38,12 @@ def _configure_settings():
             setattr(settings, name, value)
     
     set_default_setting('PROJECT_PATH', os.path.dirname(sys.argv[0]))
-    set_default_setting('TEMPLATE_PATH', os.path.join(settings.PROJECT_PATH, 'templates'))  # @UndefinedVariable
-    set_default_setting('STATIC_PATH', os.path.join(settings.PROJECT_PATH, 'static'))  # @UndefinedVariable
+    set_default_setting('TEMPLATE_PATH', os.path.join(settings.PROJECT_PATH, 'templates'))
+    set_default_setting('STATIC_PATH', os.path.join(settings.PROJECT_PATH, 'static'))
     set_default_setting('STATIC_URL', '/static/')
-    set_default_setting('CONF_PATH', os.path.join(settings.PROJECT_PATH, 'conf'))  # @UndefinedVariable
-    set_default_setting('RUN_PATH', os.path.join(settings.PROJECT_PATH, 'run'))  # @UndefinedVariable
+    set_default_setting('CONF_PATH', os.path.join(settings.PROJECT_PATH, 'conf'))
+    set_default_setting('RUN_PATH', os.path.join(settings.PROJECT_PATH, 'run'))
+    set_default_setting('MEDIA_PATH', os.path.join(settings.PROJECT_PATH, 'media'))
     set_default_setting('REPO', ('ccrisan', 'motioneye'))
     set_default_setting('LOG_LEVEL', logging.INFO)
     set_default_setting('LISTEN', '0.0.0.0')
@@ -127,6 +128,12 @@ def _configure_settings():
     except:
         pass
 
+    try:
+        os.makedirs(settings.MEDIA_PATH)
+
+    except:
+        pass
+
 
 def _test_requirements():
     if os.geteuid() != 0:
diff --git a/settings_default.py b/settings_default.py
index 54cc924..b9990d6 100644
--- a/settings_default.py
+++ b/settings_default.py
@@ -14,9 +14,12 @@ STATIC_URL = '/static/'
 # path to the config directory; must be writable
 CONF_PATH = os.path.abspath(os.path.join(PROJECT_PATH, 'conf'))
 
-# logs, pid files and other output files go here
+# log and pid files go here
 RUN_PATH = os.path.abspath(os.path.join(PROJECT_PATH, 'run'))
 
+# default output path for media files
+MEDIA_PATH = os.path.abspath(os.path.join(PROJECT_PATH, 'media'))
+
 # repository details for software updating
 REPO = ('ccrisan', 'motioneye')
 
diff --git a/src/config.py b/src/config.py
index 9b4f24a..0fc2a2b 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1259,7 +1259,7 @@ def _set_default_motion_camera(camera_id, data, old_motion=False):
     data.setdefault('@network_share_name', '')
     data.setdefault('@network_username', '')
     data.setdefault('@network_password', '')
-    data.setdefault('target_dir', settings.RUN_PATH)
+    data.setdefault('target_dir', settings.MEDIA_PATH)
     
     if old_motion:
         data.setdefault('webcam_localhost', False)