Fixed formatting.
This commit is contained in:
Fletcher Boyd
parent
146ae3c279
commit
4069dd21a3
89 changed files with 615 additions and 496 deletions
|
|
@ -10,10 +10,12 @@ 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)
|
||||
|
||||
|
||||
def sptfy(inp, sptfy=False):
|
||||
if sptfy:
|
||||
shortenurl = "http://sptfy.com/index.php"
|
||||
data = urlencode({'longUrl': inp, 'shortUrlDomain': 1, 'submitted': 1, "shortUrlFolder": 6, "customUrl": "", "shortUrlPassword": "", "shortUrlExpiryDate": "", "shortUrlUses": 0, "shortUrlType": 0})
|
||||
data = urlencode({'longUrl': inp, 'shortUrlDomain': 1, 'submitted': 1, "shortUrlFolder": 6, "customUrl": "",
|
||||
"shortUrlPassword": "", "shortUrlExpiryDate": "", "shortUrlUses": 0, "shortUrlType": 0})
|
||||
try:
|
||||
soup = http.get_soup(shortenurl, post_data=data, cookies=True)
|
||||
except:
|
||||
|
|
@ -22,7 +24,8 @@ def sptfy(inp, sptfy=False):
|
|||
link = soup.find('div', {'class': 'resultLink'}).text.strip()
|
||||
return link
|
||||
except:
|
||||
message = "Unable to shorten URL: %s" % soup.find('div', {'class': 'messagebox_text'}).find('p').text.split("<br/>")[0]
|
||||
message = "Unable to shorten URL: %s" % \
|
||||
soup.find('div', {'class': 'messagebox_text'}).find('p').text.split("<br/>")[0]
|
||||
return message
|
||||
else:
|
||||
return web.try_isgd(inp)
|
||||
|
|
@ -31,9 +34,9 @@ def sptfy(inp, sptfy=False):
|
|||
@hook.command('sptrack')
|
||||
@hook.command
|
||||
def spotify(inp):
|
||||
"spotify <song> -- Search Spotify for <song>"
|
||||
"""spotify <song> -- Search Spotify for <song>"""
|
||||
try:
|
||||
data = http.get_json("http://ws.spotify.com/search/1/track.json", q=inp.strip())
|
||||
data = http.get_json("http://ws.spotify.com/search/1/track.json", q=inp.strip())
|
||||
except Exception as e:
|
||||
return "Could not get track information: {}".format(e)
|
||||
|
||||
|
|
@ -42,13 +45,15 @@ def spotify(inp):
|
|||
except IndexError:
|
||||
return "Could not find track."
|
||||
url = sptfy(gateway.format(type, id))
|
||||
return u"\x02{}\x02 by \x02{}\x02 - \x02{}\x02".format(data["tracks"][0]["name"], data["tracks"][0]["artists"][0]["name"], url)
|
||||
return u"\x02{}\x02 by \x02{}\x02 - \x02{}\x02".format(data["tracks"][0]["name"],
|
||||
data["tracks"][0]["artists"][0]["name"], url)
|
||||
|
||||
|
||||
@hook.command
|
||||
def spalbum(inp):
|
||||
"spalbum <album> -- Search Spotify for <album>"
|
||||
"""spalbum <album> -- Search Spotify for <album>"""
|
||||
try:
|
||||
data = http.get_json("http://ws.spotify.com/search/1/album.json", q=inp.strip())
|
||||
data = http.get_json("http://ws.spotify.com/search/1/album.json", q=inp.strip())
|
||||
except Exception as e:
|
||||
return "Could not get album information: {}".format(e)
|
||||
|
||||
|
|
@ -57,13 +62,15 @@ def spalbum(inp):
|
|||
except IndexError:
|
||||
return "Could not find album."
|
||||
url = sptfy(gateway.format(type, id))
|
||||
return u"\x02{}\x02 by \x02{}\x02 - \x02{}\x02".format(data["albums"][0]["name"], data["albums"][0]["artists"][0]["name"], url)
|
||||
return u"\x02{}\x02 by \x02{}\x02 - \x02{}\x02".format(data["albums"][0]["name"],
|
||||
data["albums"][0]["artists"][0]["name"], url)
|
||||
|
||||
|
||||
@hook.command
|
||||
def spartist(inp):
|
||||
"spartist <artist> -- Search Spotify for <artist>"
|
||||
"""spartist <artist> -- Search Spotify for <artist>"""
|
||||
try:
|
||||
data = http.get_json("http://ws.spotify.com/search/1/artist.json", q=inp.strip())
|
||||
data = http.get_json("http://ws.spotify.com/search/1/artist.json", q=inp.strip())
|
||||
except Exception as e:
|
||||
return "Could not get artist information: {}".format(e)
|
||||
|
||||
|
|
@ -74,6 +81,7 @@ def spartist(inp):
|
|||
url = sptfy(gateway.format(type, id))
|
||||
return u"\x02{}\x02 - \x02{}\x02".format(data["artists"][0]["name"], url)
|
||||
|
||||
|
||||
@hook.regex(*http_re)
|
||||
@hook.regex(*spotify_re)
|
||||
def spotify_url(match):
|
||||
|
|
@ -86,8 +94,13 @@ def spotify_url(match):
|
|||
name = data["track"]["name"]
|
||||
artist = data["track"]["artists"][0]["name"]
|
||||
album = data["track"]["album"]["name"]
|
||||
return u"Spotify Track: \x02{}\x02 by \x02{}\x02 from the album \x02{}\x02 - \x02{}\x02".format(name, artist, album, sptfy(gateway.format(type, spotify_id)))
|
||||
return u"Spotify Track: \x02{}\x02 by \x02{}\x02 from the album \x02{}\x02 - \x02{}\x02".format(name, artist,
|
||||
album, sptfy(
|
||||
gateway.format(type, spotify_id)))
|
||||
elif type == "artist":
|
||||
return u"Spotify Artist: \x02{}\x02 - \x02{}\x02".format(data["artist"]["name"], sptfy(gateway.format(type, spotify_id)))
|
||||
return u"Spotify Artist: \x02{}\x02 - \x02{}\x02".format(data["artist"]["name"],
|
||||
sptfy(gateway.format(type, spotify_id)))
|
||||
elif type == "album":
|
||||
return u"Spotify Album: \x02{}\x02 - \x02{}\x02 - \x02{}\x02".format(data["album"]["artist"], data["album"]["name"], sptfy(gateway.format(type, spotify_id)))
|
||||
return u"Spotify Album: \x02{}\x02 - \x02{}\x02 - \x02{}\x02".format(data["album"]["artist"],
|
||||
data["album"]["name"],
|
||||
sptfy(gateway.format(type, spotify_id)))
|
||||
|
|
|
|||
Reference in a new issue