Add: Tornado as required dependency

Fix: Remove draft76
Fix: Remove class attributes for ws handler
Revert: default to /ws/ for for mopidy.html
This commit is contained in:
dz0ny 2014-05-12 16:16:08 +02:00
parent 73721c77ad
commit 031c7c8e93
7 changed files with 5 additions and 12 deletions

View File

@ -27,7 +27,7 @@ Node.js.
WebSocket API WebSocket API
============= =============
The web server exposes a WebSocket at ``/mopidy/ws``. The WebSocket gives you The web server exposes a WebSocket at ``/mopidy/ws/``. The WebSocket gives you
access to Mopidy's full API and enables Mopidy to instantly push events to the access to Mopidy's full API and enables Mopidy to instantly push events to the
client, as they happen. client, as they happen.

View File

@ -40,7 +40,7 @@ class HttpFrontend(pykka.ThreadingActor, CoreListener):
extension = extension(self.config) extension = extension(self.config)
if callable(getattr(extension, "setup_routes", None)): if callable(getattr(extension, "setup_routes", None)):
routes.extend(extension.setup_routes()) routes.extend(extension.setup_routes())
logger.info('Loaded HTTP router: %s', logger.info('Loaded HTTP extension: %s',
extension.__class__.__name__) extension.__class__.__name__)
else: else:
logger.info( logger.info(

View File

@ -40,7 +40,7 @@
</div> </div>
<script src="mopidy.js" type="text/javascript"></script> <script src="mopidy.js" type="text/javascript"></script>
<script type="text/javascript"> <script type="text/javascript">
var ws = new WebSocket("ws://" + document.location.host + "/mopidy/ws"); var ws = new WebSocket("ws://" + document.location.host + "/mopidy/ws/");
ws.onmessage = function (message) { ws.onmessage = function (message) {
var console = document.getElementById('ws-console'); var console = document.getElementById('ws-console');
var newLine = (new Date()).toLocaleTimeString() + ": " + var newLine = (new Date()).toLocaleTimeString() + ": " +

View File

@ -39,9 +39,6 @@ def construct_rpc(actor):
class WebSocketHandler(tornado.websocket.WebSocketHandler): class WebSocketHandler(tornado.websocket.WebSocketHandler):
actor = None
jsonrpc = None
def initialize(self, actor): def initialize(self, actor):
self.actor = actor self.actor = actor
self.jsonrpc = construct_rpc(actor) self.jsonrpc = construct_rpc(actor)

View File

@ -25,11 +25,9 @@ setup(
include_package_data=True, include_package_data=True,
install_requires=[ install_requires=[
'setuptools', 'setuptools',
'Pykka >= 1.1', 'tornado', 'Pykka >= 1.1',
'tornado >= 3.1.1',
], ],
extras_require={
'http': ['tornado >= 3.1.1'],
},
test_suite='nose.collector', test_suite='nose.collector',
tests_require=[ tests_require=[
'nose', 'nose',

View File

@ -24,7 +24,6 @@ class HttpEventsTest(unittest.TestCase):
'hostname': '127.0.0.1', 'hostname': '127.0.0.1',
'port': 6680, 'port': 6680,
'static_dir': None, 'static_dir': None,
'allow_draft76': True,
'zeroconf': '', 'zeroconf': '',
} }
} }

View File

@ -42,7 +42,6 @@ class HttpRouterTest(unittest.TestCase):
'hostname': '127.0.0.1', 'hostname': '127.0.0.1',
'port': 6680, 'port': 6680,
'static_dir': None, 'static_dir': None,
'allow_draft76': True,
'zeroconf': '', 'zeroconf': '',
} }
} }