remote camera device is now presented using

http://host:port/config/camera_id

diff --git a/doc/todo.txt b/doc/todo.txt
index 32515b76d57cecd53961bbc00d4bbcc4ce701fee..1d151b87fce6a13f753f0c46188251141742f688 100644 (file)
--- a/doc/todo.txt
+++ b/doc/todo.txt
@@ -1,8 +1,6 @@
 -> add an autoupdate mechanism
--> the camera is not available on page load, it is never shown afterwards - increase the timeout
 -> click to zoom on cameras
 -> make camera frames positions configurable
--> remote cameras are presented as http:///dev/video0
 -> add a view log functionality
 -> add a previewer for movies
 -> add a previewer for snapshots

diff --git a/src/handlers.py b/src/handlers.py
index 5ec4946ec685647ff7056f782da1b0f20fcb38c5..4b25dd26bd2b714a7382288534c03205eaa36557 100644 (file)
--- a/src/handlers.py
+++ b/src/handlers.py
@@ -149,6 +149,11 @@ class ConfigHandler(BaseHandler):
                     for key, value in camera_config.items():
                         remote_ui_config[key.replace('@', '')] = value
                     
+                    remote_ui_config['device'] = remote.make_remote_camera_url(
+                            camera_config.get('@host'),
+                            camera_config.get('@port'),
+                            camera_config.get('@remote_camera_id'))
+                    
                     self.finish_json(remote_ui_config)
                 
                 remote.get_config(
@@ -351,9 +356,14 @@ class ConfigHandler(BaseHandler):
             def on_response_builder(camera_id, camera_config):
                 def on_response(remote_ui_config):
                     if remote_ui_config is None:
+                        camera_url = remote.make_remote_camera_url(
+                                camera_config.get('@host'),
+                                camera_config.get('@port'),
+                                camera_config.get('@remote_camera_id'))
+                        
                         cameras.append({
                             'id': camera_id,
-                            'name': '<error>', # TODO add the camera url here
+                            'name': '<' + camera_url + '>',
                             'enabled': False,
                             'streaming_framerate': 1,
                             'framerate': 1

diff --git a/src/remote.py b/src/remote.py
index 870accc0589515a2b967d93f42a07c8927c76288..3f9b1f7b1bc473ac8eaeaf15ddfa6119f3af5991 100644 (file)
--- a/src/remote.py
+++ b/src/remote.py
@@ -25,6 +25,14 @@ def _make_request(host, port, username, password, uri, method='GET', data=None,
     return request
 
 
+def make_remote_camera_url(host, port, camera_id):
+    return '%(host)s:%(port)s/config/%(camera_id)s' % {
+        'host': host,
+        'port': port,
+        'camera_id': camera_id
+    }
+
+
 def list_cameras(host, port, username, password, callback):
     logging.debug('listing remote cameras on %(host)s:%(port)s' % {
             'host': host,