get_remote_video() has been updated to use the session's sessions for…

… hostname connection retrieval #633
sandialabs · Aug 24, 2016 · fa36eba · fa36eba
1 parent 85785eb
commit fa36eba
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/packages/slycat/web/server/engine.py b/packages/slycat/web/server/engine.py
@@ -108,7 +108,7 @@ def abspath(path):
   #TODO: scrub sid
   dispatcher.connect("get-remote-file", "/remotes/:hostname/file{path:.*}", slycat.web.server.handlers.get_remote_file, conditions={"method" : ["GET"]})
   dispatcher.connect("get-remote-image", "/remotes/:hostname/image{path:.*}", slycat.web.server.handlers.get_remote_image, conditions={"method" : ["GET"]})
-  dispatcher.connect("get-remote-video", "/remotes/:sid/videos/:vsid", slycat.web.server.handlers.get_remote_video, conditions={"method" : ["GET"]})
+  dispatcher.connect("get-remote-video", "/remotes/:hostname/videos/:vsid", slycat.web.server.handlers.get_remote_video, conditions={"method" : ["GET"]})
   dispatcher.connect("get-remote-video-status", "/remotes/:sid/videos/:vsid/status", slycat.web.server.handlers.get_remote_video_status, conditions={"method" : ["GET"]})
 
   dispatcher.connect("get-user", "/users/:uid", slycat.web.server.handlers.get_user, conditions={"method" : ["GET"]})

diff --git a/packages/slycat/web/server/handlers.py b/packages/slycat/web/server/handlers.py
@@ -1852,7 +1852,7 @@ def get_remote_file(hostname, path, **kwargs):
   :param hostname: connection host name
   :param path: path to file
   :param kwargs:
-  :return:
+  :return: file
   """
   sid = get_sid(hostname)
   with slycat.web.server.remote.get_session(sid) as session:
@@ -1865,7 +1865,7 @@ def get_remote_image(hostname, path, **kwargs):
   :param hostname: connection host name
   :param path: path to image
   :param kwargs:
-  :return:
+  :return: image
   """
   sid = get_sid(hostname)
   with slycat.web.server.remote.get_session(sid) as session:
@@ -1889,7 +1889,15 @@ def get_remote_video_status(sid, vsid):
   with slycat.web.server.remote.get_session(sid) as session:
     return session.get_video_status(vsid)
 
-def get_remote_video(sid, vsid):
+def get_remote_video(hostname, vsid):
+  """
+  Given a hostname and vsid returns the video given
+  by the vsid
+  :param hostname: connection host name
+  :param vsid: video uuid
+  :return: video
+  """
+  sid = get_sid(hostname)
   with slycat.web.server.remote.get_session(sid) as session:
     return session.get_video(vsid)