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

Reformat code

Browse source
This commit is contained in:
badaix 2021-05-19 22:14:39 +02:00
parent 94ecaa93b8
commit 1ee9448a07
2 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
control/meta_mpd.py
View file

@ -350,7 +350,7 @@ class MPDWrapper(object):
"""
mpd_meta = self.last_currentsong()
print(mpd_meta)
logger.debug(f'mpd meta: {mpd_meta}')
snapmeta = {}
for key, values in mpd_meta.items():
try:
@ -364,21 +364,20 @@ class MPDWrapper(object):
value = tag_mapping[key][1](values[0])
else:
if tag_mapping[key][2]:
print('cast')
value = [tag_mapping[key][1](values)]
else:
value = tag_mapping[key][1](values)
snapmeta[tag_mapping[key][0]] = value
print(
logger.debug(
f'key: {key}, value: {value}, mapped key: {tag_mapping[key][0]}, mapped value: {snapmeta[tag_mapping[key][0]]}')
except KeyError:
print(f'tag "{key}" not supported')
logger.warn(f'tag "{key}" not supported')
except (ValueError, TypeError):
print("Can't cast value %r to %s" %
(value, tag_mapping[key][1]))
logger.warn("Can't cast value %r to %s" %
(value, tag_mapping[key][1]))
# Stream: populate some missings tags with stream's name
print(snapmeta)
logger.debug(f'snapcast meta: {snapmeta}')
album_key = 'musicbrainzAlbumId'
try:
@ -397,7 +396,8 @@ class MPDWrapper(object):
mbrelease = fields[1]
if mbartist is not None and mbrelease is not None:
logger.info(f'Querying album art for artist "{mbartist}", release: "{mbrelease}"')
logger.info(
f'Querying album art for artist "{mbartist}", release: "{mbrelease}"')
result = musicbrainzngs.search_releases(artist=mbartist, release=mbrelease,
limit=1)
if result['release-list']:
@ -408,15 +408,16 @@ class MPDWrapper(object):
for image in data["images"]:
if "Front" in image["types"] and image["approved"]:
snapmeta['artUrl'] = image["thumbnails"]["small"]
print("%s is an approved front image!" % snapmeta['artUrl'])
logger.debug(
f'{snapmeta["artUrl"]} is an approved front image')
break
except musicbrainzngs.musicbrainz.ResponseError as e:
logger.error(f'Error while getting cover for {snapmeta[album_key]}: {e}')
logger.error(
f'Error while getting cover for {snapmeta[album_key]}: {e}')
r = requests.post('http://127.0.0.1:1780/jsonrpc', json={"id": 4, "jsonrpc": "2.0", "method": "Stream.SetMeta", "params": {
requests.post('http://127.0.0.1:1780/jsonrpc', json={"id": 4, "jsonrpc": "2.0", "method": "Stream.SetMeta", "params": {
"id": "Spotify", "meta": snapmeta}})
print(r)
def find_cover(self, song_url):
if song_url.startswith('file://'):

15
control/snapcast_mpris.py
View file

@ -238,6 +238,7 @@ MPRIS2_INTROSPECTION = """<node name="/org/mpris/MediaPlayer2">
urlhandlers = ['http://']
downloaded_covers = ['~/.covers/%s-%s.jpg']
class SnapcastRpcListener:
def on_snapserver_stream_pause(self):
pass
@ -255,8 +256,6 @@ class SnapcastRpcListener:
pass
class MPDWrapper(object):
""" Wrapper of mpd.MPDClient to handle socket
errors and similar
@ -315,12 +314,14 @@ class MPDWrapper(object):
jmsg = json.loads(message)
if jmsg["method"] == "Stream.OnMetadata":
logger.info(f'Stream meta changed for "{jmsg["params"]["id"]}"')
meta = jmsg["params"]["meta"];
meta = jmsg["params"]["meta"]
logger.info(f'Meta: "{meta}"')
self._metadata = {}
self._metadata['xesam:artist'] = self.__getValue(meta, 'artist', ['Unknown Artist'])
self._metadata['xesam:title'] = self.__getValue(meta, 'title', 'Unknown Title')
self._metadata['xesam:artist'] = self.__getValue(
meta, 'artist', ['Unknown Artist'])
self._metadata['xesam:title'] = self.__getValue(
meta, 'title', 'Unknown Title')
if 'artUrl' in meta:
self._metadata['mpris:artUrl'] = meta['artUrl']
@ -384,8 +385,6 @@ class MPDWrapper(object):
# def connected(self):
# return self.client._sock is not None
# def init_state(self):
# # Get current state
# self._status = self.client.status()
@ -1222,7 +1221,6 @@ if __name__ == '__main__':
if config.has_option('Bling', 'notify_urgency'):
params['notify_urgency'] = int(config.get('Bling', 'notify_urgency'))
logger.debug('Parameters: %r' % params)
if mutagen:
@ -1260,4 +1258,3 @@ if __name__ == '__main__':
# logger.debug('Exiting')
# except mpd.ConnectionError:
# logger.error('Failed to disconnect properly')