andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

http: Rename variable

Browse Source
This commit is contained in:
Stein Magnus Jodal 2014-05-22 21:03:32 +02:00
parent d03988e1f5
commit 5526a500ab
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mopidy/http/actor.py
View File

@ -61,20 +61,22 @@ class HttpFrontend(pykka.ThreadingActor, CoreListener):
handlers.WebSocketHandler.broadcast(message) handlers.WebSocketHandler.broadcast(message)
def _get_request_handlers(self): def _get_request_handlers(self):
request_handlers = []
request_handlers.extend(self._get_extension_request_handlers())
# Either default Mopidy or user defined path to files # Either default Mopidy or user defined path to files
static_dir = self.config['http']['static_dir'] static_dir = self.config['http']['static_dir']
data_dir = os.path.join(os.path.dirname(__file__), 'data') data_dir = os.path.join(os.path.dirname(__file__), 'data')
root_dir = (r'/(.*)', handlers.StaticFileHandler, { root_handler = (r'/(.*)', handlers.StaticFileHandler, {
'path': static_dir if static_dir else data_dir, 'path': static_dir if static_dir else data_dir,
'default_filename': 'index.html' 'default_filename': 'index.html'
}) })
request_handlers.append(root_handler)
request_handlers = self._get_extension_request_handlers()
logger.debug( logger.debug(
'HTTP routes from extensions: %s', 'HTTP routes from extensions: %s',
list((l[0], l[1]) for l in request_handlers)) list((l[0], l[1]) for l in request_handlers))
request_handlers.append(root_dir)
return request_handlers return request_handlers
def _get_extension_request_handlers(self): def _get_extension_request_handlers(self):