raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

rename url from live to main

Browse Source
This commit is contained in:
Tim Bentley 2013-07-12 19:13:06 +01:00
parent 6062605622
commit 6e7700d8fd
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
openlp/plugins/remotes/html/live.css → openlp/plugins/remotes/html/main.css
View File

4
openlp/plugins/remotes/html/live.html → openlp/plugins/remotes/html/main.html
View File

@ -30,10 +30,10 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${live_title}</title> <title>${live_title}</title>
<link rel="stylesheet" href="/files/live.css" /> <link rel="stylesheet" href="/files/main.css" />
<link rel="shortcut icon" type="image/x-icon" href="/files/images/favicon.ico"> <link rel="shortcut icon" type="image/x-icon" href="/files/images/favicon.ico">
<script type="text/javascript" src="/files/jquery.js"></script> <script type="text/javascript" src="/files/jquery.js"></script>
<script type="text/javascript" src="/files/live.js"></script> <script type="text/javascript" src="/files/main.js"></script>
</head> </head>
<body> <body>
<img id="image" class="size"/> <img id="image" class="size"/>

4
openlp/plugins/remotes/html/live.js → openlp/plugins/remotes/html/main.js
View File

@ -26,7 +26,7 @@
window.OpenLP = { window.OpenLP = {
loadSlide: function (event) { loadSlide: function (event) {
$.getJSON( $.getJSON(
"/live/image", "/main/image",
function (data, status) { function (data, status) {
var img = document.getElementById('image'); var img = document.getElementById('image');
img.src = data.results.slide_image; img.src = data.results.slide_image;
@ -36,7 +36,7 @@ window.OpenLP = {
}, },
pollServer: function () { pollServer: function () {
$.getJSON( $.getJSON(
"/live/poll", "/main/poll",
function (data, status) { function (data, status) {
if (OpenLP.slideCount != data.results.slide_count) { if (OpenLP.slideCount != data.results.slide_count) {
OpenLP.slideCount = data.results.slide_count; OpenLP.slideCount = data.results.slide_count;

40
openlp/plugins/remotes/lib/httpserver.py
View File

@ -177,11 +177,11 @@ class HttpServer(object):
self.root = self.Public() self.root = self.Public()
self.root.files = self.Files() self.root.files = self.Files()
self.root.stage = self.Stage() self.root.stage = self.Stage()
self.root.live = self.Live() self.root.main = self.Main()
self.root.router = self.router self.root.router = self.router
self.root.files.router = self.router self.root.files.router = self.router
self.root.stage.router = self.router self.root.stage.router = self.router
self.root.live.router = self.router self.root.main.router = self.router
cherrypy.tree.mount(self.root, '/', config=self.define_config()) cherrypy.tree.mount(self.root, '/', config=self.define_config())
# Turn off the flood of access messages cause by poll # Turn off the flood of access messages cause by poll
cherrypy.log.access_log.propagate = False cherrypy.log.access_log.propagate = False
@ -218,7 +218,7 @@ class HttpServer(object):
u'/stage': {u'tools.staticdir.on': True, u'/stage': {u'tools.staticdir.on': True,
u'tools.staticdir.dir': self.router.html_dir, u'tools.staticdir.dir': self.router.html_dir,
u'tools.basic_auth.on': False}, u'tools.basic_auth.on': False},
u'/live': {u'tools.staticdir.on': True, u'/main': {u'tools.staticdir.on': True,
u'tools.staticdir.dir': self.router.html_dir, u'tools.staticdir.dir': self.router.html_dir,
u'tools.basic_auth.on': False}} u'tools.basic_auth.on': False}}
return directory_config return directory_config
@ -253,9 +253,9 @@ class HttpServer(object):
url = urlparse.urlparse(cherrypy.url()) url = urlparse.urlparse(cherrypy.url())
return self.router.process_http_request(url.path, *args) return self.router.process_http_request(url.path, *args)
class Live(object): class Main(object):
""" """
Live view is read only so security is not relevant and would reduce it's usability Main view is read only so security is not relevant and would reduce it's usability
""" """
@cherrypy.expose @cherrypy.expose
def default(self, *args, **kwargs): def default(self, *args, **kwargs):
@ -281,12 +281,12 @@ class HttpRouter(object):
self.routes = [ self.routes = [
(u'^/$', self.serve_file), (u'^/$', self.serve_file),
(u'^/(stage)$', self.serve_file), (u'^/(stage)$', self.serve_file),
(u'^/(live)$', self.serve_file), (u'^/(main)$', self.serve_file),
(r'^/files/(.*)$', self.serve_file), (r'^/files/(.*)$', self.serve_file),
(r'^/api/poll$', self.poll), (r'^/api/poll$', self.poll),
(r'^/stage/poll$', self.poll), (r'^/stage/poll$', self.poll),
(r'^/live/poll$', self.live_poll), (r'^/main/poll$', self.main_poll),
(r'^/live/image$', self.live_image), (r'^/main/image$', self.main_image),
(r'^/api/controller/(live|preview)/(.*)$', self.controller), (r'^/api/controller/(live|preview)/(.*)$', self.controller),
(r'^/stage/controller/(live|preview)/(.*)$', self.controller), (r'^/stage/controller/(live|preview)/(.*)$', self.controller),
(r'^/api/service/(.*)$', self.service), (r'^/api/service/(.*)$', self.service),
@ -378,7 +378,7 @@ class HttpRouter(object):
'slides': translate('RemotePlugin.Mobile', 'Slides') 'slides': translate('RemotePlugin.Mobile', 'Slides')
} }
def serve_file(self, filename=None): def serve_file(self, file_name=None):
""" """
Send a file to the socket. For now, just a subset of file types and must be top level inside the html folder. Send a file to the socket. For now, just a subset of file types and must be top level inside the html folder.
If subfolders requested return 404, easier for security for the present. If subfolders requested return 404, easier for security for the present.
@ -386,17 +386,17 @@ class HttpRouter(object):
Ultimately for i18n, this could first look for xx/file.html before falling back to file.html. Ultimately for i18n, this could first look for xx/file.html before falling back to file.html.
where xx is the language, e.g. 'en' where xx is the language, e.g. 'en'
""" """
log.debug(u'serve file request %s' % filename) log.debug(u'serve file request %s' % file_name)
if not filename: if not file_name:
filename = u'index.html' file_name = u'index.html'
elif filename == u'stage': elif file_name == u'stage':
filename = u'stage.html' file_name = u'stage.html'
elif filename == u'live': elif file_name == u'main':
filename = u'live.html' file_name = u'main.html'
path = os.path.normpath(os.path.join(self.html_dir, filename)) path = os.path.normpath(os.path.join(self.html_dir, file_name))
if not path.startswith(self.html_dir): if not path.startswith(self.html_dir):
return self._http_not_found() return self._http_not_found()
ext = os.path.splitext(filename)[1] ext = os.path.splitext(file_name)[1]
html = None html = None
if ext == u'.html': if ext == u'.html':
mimetype = u'text/html' mimetype = u'text/html'
@ -447,7 +447,7 @@ class HttpRouter(object):
cherrypy.response.headers['Content-Type'] = u'application/json' cherrypy.response.headers['Content-Type'] = u'application/json'
return json.dumps({u'results': result}) return json.dumps({u'results': result})
def live_poll(self): def main_poll(self):
""" """
Poll OpenLP to determine the current slide count. Poll OpenLP to determine the current slide count.
""" """
@ -457,7 +457,7 @@ class HttpRouter(object):
cherrypy.response.headers['Content-Type'] = u'application/json' cherrypy.response.headers['Content-Type'] = u'application/json'
return json.dumps({u'results': result}) return json.dumps({u'results': result})
def live_image(self): def main_image(self):
""" """
Return the latest display image as a byte stream. Return the latest display image as a byte stream.
""" """