added support for extra motion options

diff --git a/src/config.py b/src/config.py
index 09a04e01a48d65d36655865478358069e712b7cf..35420e3df47a88a0325488b86e6305dc595c9d2d 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -797,6 +797,11 @@ def camera_ui_to_dict(ui):
             continue
 
         data['@' + name] = value
+        
+    # extra motion options
+    extra_options = ui.get('extra_options', [])
+    for name, value in extra_options:
+        data[name] = value or ''
 
     return data
 
@@ -1119,6 +1124,22 @@ def camera_dict_to_ui(data):
             continue
         
         ui[name[1:]] = value
+    
+    # extra motion options
+    known_options = set([
+        'auto_brightness', 'brightness', 'contrast', 'emulate_motion', 'event_gap', 'ffmpeg_bps', 'ffmpeg_output_movies', 'ffmpeg_variable_bitrate', 'ffmpeg_video_codec',
+        'framerate', 'height', 'hue', 'lightswitch', 'locate_motion_mode', 'locate_motion_style', 'minimum_motion_frames', 'movie_filename', 'noise_level', 'noise_tune',
+        'on_event_end', 'on_event_start', 'output_pictures', 'picture_filename', 'post_capture', 'pre_capture', 'quality', 'rotate', 'saturation',
+        'snapshot_filename', 'snapshot_interval', 'stream_auth_method', 'stream_authentication', 'stream_localhost', 'stream_maxrate', 'stream_motion', 'stream_port', 'stream_quality',
+        'target_dir', 'text_changes', 'text_double', 'text_left', 'text_right', 'threshold', 'videodevice', 'width'
+    ])
+    
+    extra_options = []
+    for name, value in data.iteritems():
+        if name not in known_options and not name.startswith('@'):
+            extra_options.append((name, value))
+
+    ui['extra_options'] = extra_options
 
     return ui
 
@@ -1252,10 +1273,9 @@ def _dict_to_conf(lines, data, list_names=[]):
             new_value = data.get(name)
             if new_value is not None:
                 value = _python_to_value(new_value)
-            
-            line = name + ' ' + value
-            conf_lines.append(line)
-        
+                line = name + ' ' + value
+                conf_lines.append(line)
+
         remaining.pop(name, None)
     
     # add the remaining config values not covered by existing lines

diff --git a/static/css/ui.css b/static/css/ui.css
index 1da69b9d544da543e56dffaae569248c087db574..823f74b6bc69f97f26b3fc5612d1e37762e8c4bc 100644 (file)
--- a/static/css/ui.css
+++ b/static/css/ui.css
@@ -130,7 +130,9 @@ div.check-box.on:HOVER div.check-box-button {
     /* input box */
 
 input[type=password].styled,
-input[type=text].styled {
+input[type=text].styled,
+textarea.styled,
+[contenteditable=true].styled {
     width: 90%;
     border: 1px solid #317CAD;
     border-radius: 2px;
@@ -141,6 +143,8 @@ input[type=text].styled {
     font-size: 0.8em;
     margin: 2px;
     transition: all 0.1s ease;
+    resize: none;
+    vertical-align: middle;
 }
 
 input[type=password].styled:FOCUS,

diff --git a/static/js/main.js b/static/js/main.js
index a3015ed3854564176f23fda73a2479516fc4127d..8e320d407f8e6509967d2eebf5baa8364a9a835a 100644 (file)
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -541,6 +541,19 @@ function initUI() {
         }, '');
     });
     
+    /* implement change events for [contenteditable=true] elements */
+    $('[contenteditable=true]').each(function () {
+        var $this = $(this);
+        $this.focus(function () {
+            $this.data('val', $this.html());
+        });
+        $this.blur(function () {
+            if ($this.html() != $this.data('val')) {
+                $this.change();
+            }
+        });
+    });
+    
     /* input value processors */
     makeStrippedInput($('tr[strip=true] input[type=text]'));
     makeStrippedInput($('tr[strip=true] input[type=password]'));
@@ -657,8 +670,8 @@ function initUI() {
             fetchCurrentCameraConfig(endProgress);
         }
     });
-    $('input.main-config, select.main-config').change(pushMainConfig);
-    $('input.camera-config, select.camera-config').change(pushCameraConfig);
+    $('input.main-config, select.main-config, div[contenteditable=true].main-config').change(pushMainConfig);
+    $('input.camera-config, select.camera-config, div[contenteditable=true].camera-config').change(pushCameraConfig);
     
     /* preview controls */
     $('#brightnessSlider').change(function () {pushPreview('brightness');});
@@ -1131,7 +1144,30 @@ function cameraUi2Dict() {
         'uri': $('#deviceEntry')[0].uri,
         'username': $('#deviceEntry')[0].username,
         'password': $('#deviceEntry')[0].password,
-        
+        'extra_options': $('#extraOptionsEntry').html().split(new RegExp('(<br[^>]*>)|(<div>)|(<p>)')).map(function (o) {
+            if (!o) {
+                return null;
+            }
+
+            o = o.replace(new RegExp('(<([^>]+)>)', 'ig'), ''); /* remove crappy HTML tags added by the browser */
+            o = o.replace(new RegExp('&\\w+;', 'ig'), ''); /* remove crappy HTML entities added by the browser */
+            o = o.trim();
+            if (!o.length) {
+                return null;
+            }
+
+            var parts = o.replace(new RegExp('\\s+', 'g'), ' ').split(' ');
+            if (parts.length < 2) {
+                return [parts[0], ''];
+            }
+            else if (parts.length == 2) {
+                return parts;
+            }
+            else {
+                return [parts[0], parts.slice(1).join(' ')];
+            }
+        }).filter(function (e) {return e;}),
+
         /* file storage */
         'storage_device': $('#storageDeviceSelect').val(),
         'network_server': $('#networkServerEntry').val(),
@@ -1342,6 +1378,9 @@ function dict2CameraUi(dict) {
     
     $('#rotationSelect').val(dict['rotation']);
     $('#framerateSlider').val(dict['framerate']);
+    $('#extraOptionsEntry').html(dict['extra_options'].map(function (o) {
+        return o.join(' ');
+    }).join('<br>'));
     
     /* file storage */
     $('#storageDeviceSelect').empty();

diff --git a/templates/main.html b/templates/main.html
index a18e4a4eefc28880538681b7ca144ffd2dbbadd6..dbc3f3abc4373b88d96391a8214c22d6a909da00 100644 (file)
--- a/templates/main.html
+++ b/templates/main.html
@@ -249,6 +249,11 @@
                         <td class="settings-item-value"><input type="text" class="range styled device camera-config" id="framerateSlider"></td>
                         <td><span class="help-mark" title="sets the number of frames captured by the camera every second (higher values produce smoother videos but require larger storage space and bandwidth)">?</span></td>
                     </tr>
+                    <tr class="settings-item advanced-setting">
+                        <td class="settings-item-label"><span class="settings-item-label">Extra Motion Options</span></td>
+                        <td class="settings-item-value"><div class="styled device camera-config" id="extraOptionsEntry" contenteditable="true"></div></td>
+                        <td><span class="help-mark" title="you can add here any extra options for the motion daemon (use the &quot;name value&quot; format, one option per line)">?</span></td>
+                    </tr>
                     {% for config in camera_sections.get('device', {}).get('configs', []) %}
                         {{config_item(config)}}
                     {% endfor %}