diff options
Diffstat (limited to 'modules/lastfm.py')
| -rw-r--r-- | modules/lastfm.py | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/modules/lastfm.py b/modules/lastfm.py index e448d9ea..3675bbd5 100644 --- a/modules/lastfm.py +++ b/modules/lastfm.py @@ -5,8 +5,10 @@ import Utils URL_SCROBBLER = "http://ws.audioscrobbler.com/2.0/" class Module(object): + _name = "last.fm" def __init__(self, bot, events, exports): self.bot = bot + self.events = events exports.add("set", {"setting": "lastfm", "help": "Set username on last.fm"}) @@ -34,6 +36,14 @@ class Module(object): track_name = now_playing["name"] artist = now_playing["artist"]["#text"] + ytquery = " - ".join([artist, track_name]) + + short_url = self.events.on( + "get.youtubefromlastfm").call_for_result( + query=ytquery) + + short_url = " -- " + short_url if short_url else "" + info_page = Utils.get_url(URL_SCROBBLER, get_params={ "method": "track.getInfo", "artist": artist, "track": track_name, "autocorrect": "1", @@ -55,8 +65,9 @@ class Module(object): "s" if play_count > 1 else "") event["stdout"].write( - "%s is now playing: %s - %s%s%s" % ( - shown_username, artist, track_name, play_count, tags)) + "%s is now playing: %s - %s%s%s%s" % ( + shown_username, artist, track_name, play_count, tags, + short_url)) else: event["stderr"].write( "The user '%s' has never scrobbled before" % ( |