lukmangrd/platypush
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Few more fixes on mopidy backend

Browse source
This commit is contained in:
Fabio Manganiello 2019-02-12 22:57:09 +01:00
parent 9a4963a48a
commit c18515bd3c
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
platypush/backend/music/mopidy.py
View file

@ -87,7 +87,9 @@ class MusicMopidyBackend(Backend):
ws = websocket.create_connection(self.url) ws = websocket.create_connection(self.url)
ws.send(msg) ws.send(msg)
return json.loads(ws.recv()).get('result') response = json.loads(ws.recv()).get('result')
ws.close()
return response
def _get_tracklist_status(self): def _get_tracklist_status(self):
@ -102,21 +104,6 @@ class MusicMopidyBackend(Backend):
'method': 'core.tracklist.get_consume'}), 'method': 'core.tracklist.get_consume'}),
} }
async def _poll_events(self):
import websocket
try:
while not self.should_stop():
async with websockets.connect(self.url) as ws:
msg = await ws.recv()
if isinstance(msg, bytes):
msg = msg.decode()
self._handle_msg(msg)
except Exception as e:
self.logger.warning('The Mopidy backend raised an exception')
self.logger.exception(e)
time.sleep(2) # Wait a bit before retrying
def _on_msg(self): def _on_msg(self):
def hndl(msg): def hndl(msg):
msg = json.loads(msg) msg = json.loads(msg)
@ -210,6 +197,8 @@ class MusicMopidyBackend(Backend):
return hndl return hndl
def _connect(self): def _connect(self):
import websocket
if not self._ws: if not self._ws:
self._ws = websocket.WebSocketApp(self.url, self._ws = websocket.WebSocketApp(self.url,
on_message=self._on_msg(), on_message=self._on_msg(),