Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

fixed showing track tags in lastfm.py.

Browse source
This commit is contained in:
jesopo 2016-04-04 12:37:17 +01:00
parent 80818fad66
commit 1cc28a5581
No known key found for this signature in database
GPG key ID: 0BBDEB2AEFCFFCB3
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/lastfm.py
View file

@ -34,22 +34,27 @@ class Module(object):
track_name = now_playing["name"] track_name = now_playing["name"]
artist = now_playing["artist"]["#text"] artist = now_playing["artist"]["#text"]
tags_page = Utils.get_url(URL_SCROBBLER, get_params={ info_page = Utils.get_url(URL_SCROBBLER, get_params={
"method": "track.getTags", "artist": artist, "method": "track.getInfo", "artist": artist,
"track": track_name, "autocorrect": "1", "track": track_name, "autocorrect": "1",
"api_key": self.bot.config["lastfm-api-key"], "api_key": self.bot.config["lastfm-api-key"],
"user": username, "format": "json"}, json=True) "user": username, "format": "json"}, json=True)
tags = [] tags = []
if tags_page.get("tags", {}).get("tag"): print(info_page.keys())
for tag in tags_page["tags"]["tag"]: if "toptags" in info_page["track"]:
for tag in info_page["track"]["toptags"]["tag"]:
tags.append(tag["name"]) tags.append(tag["name"])
if tags: if tags:
tags = " (%s)" % ", ".join(tags) tags = " (%s)" % ", ".join(tags)
else: else:
tags = "" tags = ""
play_count = int(info_page["track"]["userplaycount"])
play_count = "%d play%s" % (play_count,
"s" if play_count > 1 else "")
event["stdout"].write("%s is now playing: %s - %s%s" % ( event["stdout"].write(
username, artist, track_name, tags)) "%s is now playing: %s - %s (%s)%s" % (
username, artist, track_name, play_count, tags))
else: else:
event["stderr"].write( event["stderr"].write(
"The user '%s' has never scrobbled before" % ( "The user '%s' has never scrobbled before" % (