a trailing slash is now added to netcam urls

diff --git a/src/handlers.py b/src/handlers.py
index 3d7ee0d2797faed9ad60a9a90b3d8710db83d1ff..eeecc8a837d74e6f5954aa6a59a1608e4fcafbe0 100644 (file)
--- a/src/handlers.py
+++ b/src/handlers.py
@@ -605,8 +605,6 @@ class ConfigHandler(BaseHandler):
             # adjust uri format
             if device_details['uri'] and not device_details['uri'].startswith('/'):
                 device_details['uri'] = '/' + device_details['uri']
-            while device_details['uri'] and device_details['uri'].endswith('/'):
-                device_details['uri'] = device_details['uri'][:-1]
 
         camera_id, camera_config = config.add_camera(device_details)
         camera_config['@id'] = camera_id

diff --git a/static/js/main.js b/static/js/main.js
index 8faa661ab1140a5080322564bcb754193159f8fd..c2b9926cf4fa183c9d56ee5bfafa85bba0050308 100644 (file)
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -2583,6 +2583,15 @@ function runAddCameraDialog() {
         }
         else if (deviceSelect.val() == 'netcam') {
             usernameEntry.removeAttr('readonly');
+            
+            /* make sure there is one trailing slash so that
+             * an URI can be detected */
+            var url = urlEntry.val().trim();
+            var m = url.match(new RegExp('/', 'g'));
+            if (m && m.length < 3 && !url.endsWith('/')) {
+                urlEntry.val(url + '/');
+            }
+
             content.find('tr.netcam').css('display', 'table-row');
             addCameraSelect.hide();
         }
@@ -2642,8 +2651,8 @@ function runAddCameraDialog() {
             port = parts[1];
         }
         
-        if (uri == '/') {
-            uri = '';
+        if (uri == '') {
+            uri = '/';
         }
         
         return {