also check for persistent device path when determining if a v4l2 camera

is already added

diff --git a/src/handlers.py b/src/handlers.py
index 2a2cfe365d610cb45c369c2ba083106e2ee2be2e..34966e77677f6732a90b50eaaba62d980fae74e3 100644 (file)
--- a/src/handlers.py
+++ b/src/handlers.py
@@ -525,7 +525,8 @@ class ConfigHandler(BaseHandler):
                 if utils.v4l2_camera(data):
                     configured_devices.add(data['videodevice'])
 
-            cameras = [{'id': d[0], 'name': d[1]} for d in v4l2ctl.list_devices() if d[0] not in configured_devices]
+            cameras = [{'id': d[1], 'name': d[2]} for d in v4l2ctl.list_devices()
+                    if (d[0] not in configured_devices) and (d[1] not in configured_devices)]
             
             self.finish_json({'cameras': cameras})
 

diff --git a/src/v4l2ctl.py b/src/v4l2ctl.py
index 3be3467522a5cda2cd3ed09717df2e0326b6573d..53de064a0cfb582ba705f3527f223fecf897ff14 100644 (file)
--- a/src/v4l2ctl.py
+++ b/src/v4l2ctl.py
@@ -90,12 +90,12 @@ def list_devices():
     for line in output.split('\n'):
         if line.startswith('\t'):
             device = line.strip()
-            device = find_persistent_device(device)
-            devices.append((device, name))
+            persistent_device = find_persistent_device(device)
+            devices.append((device, persistent_device, name))
         
-            logging.debug('found device %(name)s: %(device)s' % {
-                    'name': name, 'device': device})
-            
+            logging.debug('found device %(name)s: %(device)s, %(persistent_device)s' % {
+                    'name': name, 'device': device, 'persistent_device': persistent_device})
+
         else:
             name = line.split('(')[0].strip()