Added support for spotify:type:id links, added album to track info

This commit is contained in:
Luke Rogers 2013-02-06 19:53:08 +13:00
parent 9185e7c8d5
commit 1f774a72d1

View file

@ -1,23 +1,24 @@
import re
import time
import spotimeta
from util import hook, http
gateway = 'http://open.spotify.com/{}/{}' # http spotify gw address
spotify_re = (r'(open\.spotify\.com\/(track|album|artist|user)\/'
spotify_re = (r'(spotify:(track|album|artist|user):([a-zA-Z0-9]+))', re.I)
http_re = (r'(open\.spotify\.com\/(track|album|artist|user)\/'
'([a-zA-Z0-9]+))', re.I)
@hook.regex(*http_re)
@hook.regex(*spotify_re)
def spotify_url(match):
spotify_type = match.group(2)
print spotify_type
type = match.group(2)
spotify_id = match.group(3)
url = gateway.format(spotify_type, spotify_id)
url = gateway.format(type, spotify_id)
data = spotimeta.lookup(url)
if spotify_type == "track":
return "Spotify Track: {} - {}".format(data["result"]["artist"]["name"], data["result"]["name"])
elif spotify_type == "artist":
return "Spotify Artist: {}".format(data["result"]["name"])
elif spotify_type == "album":
return "Spotify Album: {} - {}".format(data["result"]["artist"]["name"], data["result"]["name"])
if type == "track":
return u"Spotify Track: {} by {} from the album {}".format(data["result"]["name"], data["result"]["artist"]["name"], data["result"]["album"]["name"])
elif type == "artist":
return u"Spotify Artist: {}".format(data["result"]["name"])
elif type == "album":
return u"Spotify Album: {} - {}".format(data["result"]["artist"]["name"], data["result"]["name"])