refine the ui, link the players to the api server static dir

nateliu · Dec 25, 2013 · 4b4f317 · 4b4f317
1 parent 7b2f9d5
commit 4b4f317
Show file tree

Hide file tree

Showing 10 changed files with 514 additions and 15 deletions.
diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh
@@ -300,6 +300,10 @@ else
     echo "#undef SRS_HTTP" >> $SRS_AUTO_HEADERS_H
 fi
 
+echo "link players to cherrypy static-dir"
+rm -f research/api-server/static-dir/players &&
+ln -sf `pwd`/research/players research/api-server/static-dir/players
+
 #####################################################################################
 # openssl, for rtmp complex handshake
 #####################################################################################

diff --git a/trunk/research/api-server/server.py b/trunk/research/api-server/server.py
@@ -474,7 +474,8 @@ def __init__(self):
 
 # parse port from user options.
 port = int(sys.argv[1])
-trace("api server listen at port: %s"%(port))
+static_dir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "static-dir"))
+trace("api server listen at port: %s, static_dir: %s"%(port, static_dir))
 
 # cherrypy config.
 conf = {
@@ -483,9 +484,12 @@ def __init__(self):
         'server.socket_host': '0.0.0.0',
         'server.socket_port': port,
         'tools.encode.on': True,
+        'tools.staticdir.on': True,
         'tools.encode.encoding': "utf-8"
     },
     '/': {
+        'tools.staticdir.dir': static_dir,
+        'tools.staticdir.index': "index.html",
         # for cherrypy RESTful api support
         'request.dispatch': cherrypy.dispatch.MethodDispatcher()
     }