ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse source
This commit is contained in:
Fletcher Boyd 2013-09-06 11:12:21 +08:00
commit c08d3c2daf
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/lyrics.py
View file

@ -1,5 +1,4 @@
from util import hook, http, web
from spotify import spotifyfunc as spotify
url = "http://search.azlyrics.com/search.php?q="
@ -33,16 +32,12 @@ def lyrics(inp):
else:
pasteurl = ""
artist = div.find('b').text.title()
try:
spurl = " (Spotify: http://" + spotify(title + " " + artist).split("http://")[1].split("\x02")[0] + ")"
except:
spurl = ""
lyricsum = div.find('div').text
if "\r\n" in lyricsum.strip():
lyricsum = " / ".join(lyricsum.strip().split("\r\n")[0:4]) # truncate, format
else:
lyricsum = " / ".join(lyricsum.strip().split("\n")[0:4]) # truncate, format
return "\x02{}\x02 by \x02{}\x02 {}{}{} - {}".format(title, artist, web.try_isgd(link), spurl, pasteurl,
return "\x02{}\x02 by \x02{}\x02 {}{} - {}".format(title, artist, web.try_isgd(link), pasteurl,
lyricsum[:-3])
else:
return "No song results. " + url + inp.replace(" ", "+")