diff --git a/packages/slycat/web/server/engine.py b/packages/slycat/web/server/engine.py index 4a0bcec6d..2b10c9623 100644 --- a/packages/slycat/web/server/engine.py +++ b/packages/slycat/web/server/engine.py @@ -106,7 +106,7 @@ def abspath(path): dispatcher.connect("get-projects", "/projects", slycat.web.server.handlers.get_projects, conditions={"method" : ["GET"]}) #TODO: scrub sid - dispatcher.connect("get-remote-file", "/remotes/:sid/file{path:.*}", slycat.web.server.handlers.get_remote_file, conditions={"method" : ["GET"]}) + 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-status", "/remotes/:sid/videos/:vsid/status", slycat.web.server.handlers.get_remote_video_status, conditions={"method" : ["GET"]}) diff --git a/packages/slycat/web/server/handlers.py b/packages/slycat/web/server/handlers.py index e1be7ee8c..a298d3782 100644 --- a/packages/slycat/web/server/handlers.py +++ b/packages/slycat/web/server/handlers.py @@ -1845,15 +1845,24 @@ def post_remote_browse(sid, path): with slycat.web.server.remote.get_session(sid) as session: return session.browse(path, file_reject, file_allow, directory_reject, directory_allow) -def get_remote_file(sid, path, **kwargs): +def get_remote_file(hostname, path, **kwargs): + """ + Given a hostname and file path returns the file given + by the path + :param hostname: connection host name + :param path: path to file + :param kwargs: + :return: + """ + sid = get_sid(hostname) with slycat.web.server.remote.get_session(sid) as session: return session.get_file(path, **kwargs) def get_remote_image(hostname, path, **kwargs): """ - given a hostanme and image path returns the image given + Given a hostname and image path returns the image given by the path - :param hostname: connection name + :param hostname: connection host name :param path: path to image :param kwargs: :return: