added file storage config entries

diff --git a/motioneye.py b/motioneye.py
index 7ca3a9e6c4a7cf38160b4c9ac6f8e88f4f4ca885..eeec7a910edef2a06ec17dcfcc656ed8f88b85a0 100644 (file)
--- a/motioneye.py
+++ b/motioneye.py
@@ -40,17 +40,15 @@ def _start_server():
 
 
 if __name__ == '__main__':
-    #_configure_signals()
+    _configure_signals()
     _configure_logging()
-    #_start_server()
-    import config
+    _start_server()
     
-    main_config = config.get_main()
-    #config.add_camera('v4l2:///dev/video0')
-    #data = config.get_camera(1)
-    #data['@enabled'] = True
-    #config.set_camera(1, data)
-    config.rem_camera(1)
-    
-    a = 10
+#     import config
+#     main_config = config.get_main()
+#     #config.add_camera('v4l2:///dev/video0')
+#     #data = config.get_camera(1)
+#     #data['@enabled'] = True
+#     #config.set_camera(1, data)
+#     config.rem_camera(1)
     

diff --git a/src/config.py b/src/config.py
index 8333709fc68d6f66aefbc30a21a43dd444e9a51e..d7ec91fc94a2dd6b45275169a09d92c0a91ce839 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -314,7 +314,14 @@ def camera_ui_to_dict(camera_id, ui):
         'width': int(ui.get('resolution', '352x288').split('x')[0]),
         'height': int(ui.get('resolution', '352x288').split('x')[1]),
         'framerate': int(ui.get('framerate', 1)),
-        # TODO target_dir
+        
+        # file storage
+        '@storage_device': ui.get('storage_device', 'local-disk'),
+        '@network_server': ui.get('network_server', ''),
+        '@network_share_name': ui.get('network_share_name', ''),
+        '@network_username': ui.get('network_username', ''),
+        '@network_password': ui.get('network_password', ''),
+        'target_dir': ui.get('root_directory', '/'),
         
         # text overlay
         'text_left': '',
@@ -416,7 +423,14 @@ def camera_dict_to_ui(camera_id, data):
         'hue': int(int(data['hue'])),
         'resolution': str(data['width']) + 'x' + str(data['height']),
         'framerate': int(data['framerate']),
-        # TODO target_dir
+        
+        # file storage
+        'storage_device': data['@storage_device'],
+        'network_server': data['@network_server'],
+        'network_share_name': data['@network_share_name'],
+        'network_username': data['@network_username'],
+        'network_password': data['@network_password'],
+        'root_directory': data['target_dir'],
         
         # text overlay
         'text_overlay': False,
@@ -691,6 +705,13 @@ def _set_default_motion_camera(data):
     data.setdefault('height', 288)
     data.setdefault('framerate', 1)
     
+    data.setdefault('@storage_device', 'local-disk')
+    data.setdefault('@network_server', '')
+    data.setdefault('@network_share_name', '')
+    data.setdefault('@network_username', '')
+    data.setdefault('@network_password', '')
+    data.setdefault('target_dir', '.')
+    
     data.setdefault('webcam_localhost', False)
     data.setdefault('webcam_port', 8080)
     data.setdefault('webcam_maxrate', 1)

diff --git a/templates/base-site.html b/templates/base-site.html
index f7ef3297f9dc85b1ba864acd9bb0b84221723490..68db0bb75e2318398be2d6c7685f8eb9e60a9e1d 100644 (file)
--- a/templates/base-site.html
+++ b/templates/base-site.html
@@ -60,44 +60,6 @@
                         <td class="settings-item-value"><input type="password" class="styled general" id="normalPasswordEntry"></td>
                         <td><span class="help-mark" title="the password for the surveillance user">?</span></td>
                     </tr>
-                    <tr class="settings-item advanced-setting">
-                        <td colspan="100"><div class="settings-item-separator"></div></td>
-                    </tr>
-                    <tr class="settings-item advanced-setting">
-                        <td class="settings-item-label"><span class="settings-item-label">Storage Device</span></td>
-                        <td class="settings-item-value">
-                            <select class="styled general" id="storageDeviceSelect">
-                                <option value="local-disk">Local Disk</option>
-                                <option value="network-share">Network Share</option>
-                            </select>
-                        </td>
-                        <td><span class="help-mark" title="indicates the storage device where the image and video files will be saved">?</span></td>
-                    </tr>
-                    <tr class="settings-item advanced-setting">
-                        <td class="settings-item-label"><span class="settings-item-label">Network Server</span></td>
-                        <td class="settings-item-value"><input type="text" class="styled general" id="networkServerEntry"></td>
-                        <td><span class="help-mark" title="the address of the network server (IP address or hostname)">?</span></td>
-                    </tr>
-                    <tr class="settings-item advanced-setting">
-                        <td class="settings-item-label"><span class="settings-item-label">Share Username</span></td>
-                        <td class="settings-item-value"><input type="text" class="styled general" id="networkUsernameEntry"></td>
-                        <td><span class="help-mark" title="the username to be supplied when accessing the network share (leave empty if no username is required)">?</span></td>
-                    </tr>
-                    <tr class="settings-item advanced-setting">
-                        <td class="settings-item-label"><span class="settings-item-label">Share Password</span></td>
-                        <td class="settings-item-value"><input type="text" class="styled general" id="networkPasswordEntry"></td>
-                        <td><span class="help-mark" title="the password required by the network share (leave empty if no password is required)">?</span></td>
-                    </tr>
-                    <tr class="settings-item advanced-setting">
-                        <td class="settings-item-label"><span class="settings-item-label">Share Name</span></td>
-                        <td class="settings-item-value"><input type="text" class="styled general" id="networkShareNameEntry"></td>
-                        <td><span class="help-mark" title="the name of the network share">?</span></td>
-                    </tr>
-                    <tr class="settings-item advanced-setting">
-                        <td class="settings-item-label"><span class="settings-item-label">Root Directory</span></td>
-                        <td class="settings-item-value"><input type="text" class="styled general" id="rootDirectoryEntry"></td>
-                        <td><span class="help-mark" title="the root path (on the selected storage device) where the files will be saved">?</span></td>
-                    </tr>
                 </table>
                 
                 <div class="settings-section-title"><input type="checkbox" class="styled section" id="videoDeviceSwitch">Video Device</div>
@@ -171,7 +133,46 @@
                         <td><span class="help-mark" title="sets the number of frames captured by the camera every second (higher values yield smoother videos but require larger storage space and bandwidth)">?</span></td>
                     </tr>
                 </table>
-
+                
+                <div class="settings-section-title advanced-setting">File Storage</div>
+                <table class="settings advanced-setting">
+                    <tr class="settings-item advanced-setting">
+                        <td class="settings-item-label"><span class="settings-item-label">Storage Device</span></td>
+                        <td class="settings-item-value">
+                            <select class="styled general" id="storageDeviceSelect">
+                                <option value="local-disk">Local Disk</option>
+                                <option value="network-share">Network Share</option>
+                            </select>
+                        </td>
+                        <td><span class="help-mark" title="indicates the storage device where the image and video files will be saved">?</span></td>
+                    </tr>
+                    <tr class="settings-item advanced-setting">
+                        <td class="settings-item-label"><span class="settings-item-label">Network Server</span></td>
+                        <td class="settings-item-value"><input type="text" class="styled general" id="networkServerEntry"></td>
+                        <td><span class="help-mark" title="the address of the network server (IP address or hostname)">?</span></td>
+                    </tr>
+                    <tr class="settings-item advanced-setting">
+                        <td class="settings-item-label"><span class="settings-item-label">Share Name</span></td>
+                        <td class="settings-item-value"><input type="text" class="styled general" id="networkShareNameEntry"></td>
+                        <td><span class="help-mark" title="the name of the network share">?</span></td>
+                    </tr>
+                    <tr class="settings-item advanced-setting">
+                        <td class="settings-item-label"><span class="settings-item-label">Share Username</span></td>
+                        <td class="settings-item-value"><input type="text" class="styled general" id="networkUsernameEntry"></td>
+                        <td><span class="help-mark" title="the username to be supplied when accessing the network share (leave empty if no username is required)">?</span></td>
+                    </tr>
+                    <tr class="settings-item advanced-setting">
+                        <td class="settings-item-label"><span class="settings-item-label">Share Password</span></td>
+                        <td class="settings-item-value"><input type="text" class="styled general" id="networkPasswordEntry"></td>
+                        <td><span class="help-mark" title="the password required by the network share (leave empty if no password is required)">?</span></td>
+                    </tr>
+                    <tr class="settings-item advanced-setting">
+                        <td class="settings-item-label"><span class="settings-item-label">Root Directory</span></td>
+                        <td class="settings-item-value"><input type="text" class="styled general" id="rootDirectoryEntry"></td>
+                        <td><span class="help-mark" title="the root path (on the selected storage device) where the files will be saved">?</span></td>
+                    </tr>
+                </table>
+                
                 <div class="settings-section-title advanced-setting"><input type="checkbox" class="styled section" id="textOverlaySwitch">Text Overlay</div>
                 <table class="settings advanced-setting">
                     <tr class="settings-item advanced-setting">