3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-04-29 10:17:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Query current track before properties

Browse source
This commit is contained in:
badaix 2022-07-14 15:13:18 +02:00
parent 7a70e460a5
commit 3d072dbbb6
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
server/etc/plug-ins/meta_mopidy.py
View file

@ -117,6 +117,8 @@ class MopidyControl(object):
def getMetaData(self, track): def getMetaData(self, track):
metadata = {} metadata = {}
if track is None:
return metadata
if 'uri' in track: if 'uri' in track:
metadata['url'] = track['uri'] metadata['url'] = track['uri']
update_image = True update_image = True
@ -218,17 +220,22 @@ class MopidyControl(object):
properties['metadata'] = self._metadata properties['metadata'] = self._metadata
return properties return properties
def onGetTrackResponse(self, req_id, track):
self._metadata = self.getMetaData(track)
batch_req = [("core.playback.get_stream_title", None), ("core.playback.get_state", None), ("core.tracklist.get_repeat", None), ("core.tracklist.get_single", None),
("core.tracklist.get_random", None), ("core.mixer.get_volume", None), ("core.playback.get_time_position", None)]
if 'url' in self._metadata:
batch_req.append(('core.library.get_images', {
'uris': [self._metadata['url']]}))
self.send_batch_request(
batch_req, lambda req_res: self.onSnapcastPropertiesResponse(req_id, req_res))
def onSnapcastPropertiesResponse(self, req_id, req_res): def onSnapcastPropertiesResponse(self, req_id, req_res):
logger.debug(f'onSnapcastPropertiesRequest id: {req_id}') logger.debug(f'onSnapcastPropertiesRequest id: {req_id}')
self._properties = self.getProperties(req_res) self._properties = self.getProperties(req_res)
logger.info(f'New properties: {self._properties}') logger.info(f'New properties: {self._properties}')
send({"jsonrpc": "2.0", "id": req_id, send({"jsonrpc": "2.0", "id": req_id,
"result": self._properties}) "result": self._properties})
# The next request will trigger another update to Snapcast
# Sleep for a short while to avoid too frequent updates
sleep(0.2)
self.send_request('core.library.get_images', {
'uris': [self._metadata['url']]}, self.onGetImageResponse)
def onPropertiesResponse(self, req_res): def onPropertiesResponse(self, req_res):
self._properties = self.getProperties(req_res) self._properties = self.getProperties(req_res)
@ -287,9 +294,13 @@ class MopidyControl(object):
self._metadata = self.getMetaData( self._metadata = self.getMetaData(
jmsg['tl_track']['track']) jmsg['tl_track']['track'])
logger.debug(f'Meta: {self._metadata}') logger.debug(f'Meta: {self._metadata}')
self.send_batch_request([("core.playback.get_stream_title", None), ("core.playback.get_state", None), ("core.tracklist.get_repeat", None), ("core.tracklist.get_single", None), batch_req = [("core.playback.get_stream_title", None), ("core.playback.get_state", None), ("core.tracklist.get_repeat", None), ("core.tracklist.get_single", None),
("core.tracklist.get_random", None), ("core.mixer.get_volume", None), ("core.mixer.get_mute", None), ("core.playback.get_time_position", None), ('core.library.get_images', { ("core.tracklist.get_random", None), ("core.mixer.get_volume", None), ("core.mixer.get_mute", None), ("core.playback.get_time_position", None)]
'uris': [self._metadata['url']]})], self.onPropertiesResponse) if 'url' in self._metadata:
batch_req.append(('core.library.get_images', {
'uris': [self._metadata['url']]}))
self.send_batch_request(
batch_req, self.onPropertiesResponse)
elif event in ['tracklist_changed', 'track_playback_ended']: elif event in ['tracklist_changed', 'track_playback_ended']:
logger.debug("Nothing to do") logger.debug("Nothing to do")
elif event == 'playback_state_changed' and jmsg["old_state"] == jmsg["new_state"]: elif event == 'playback_state_changed' and jmsg["old_state"] == jmsg["new_state"]:
@ -411,8 +422,8 @@ class MopidyControl(object):
self.send_request("core.mixer.set_mute", { self.send_request("core.mixer.set_mute", {
"mute": property['mute']}) "mute": property['mute']})
elif cmd == 'GetProperties': elif cmd == 'GetProperties':
self.send_batch_request([("core.playback.get_current_track", None), ("core.playback.get_stream_title", None), ("core.playback.get_state", None), ("core.tracklist.get_repeat", None), ("core.tracklist.get_single", None), self.send_request("core.playback.get_current_track", None,
("core.tracklist.get_random", None), ("core.mixer.get_volume", None), ("core.playback.get_time_position", None)], lambda req_res: self.onSnapcastPropertiesResponse(id, req_res)) lambda track: self.onGetTrackResponse(id, track))
return return
elif cmd == 'GetMetadata': elif cmd == 'GetMetadata':
send({"jsonrpc": "2.0", "method": "Plugin.Stream.Log", "params": { send({"jsonrpc": "2.0", "method": "Plugin.Stream.Log", "params": {