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

more .format.

Browse source
This commit is contained in:
Fletcher Boyd 2013-09-05 10:11:18 +08:00
parent 7ab4f756fe
commit 0aa2185ede
15 changed files with 41 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/lyrics.py
View file

@ -29,7 +29,7 @@ def lyrics(inp):
lyrics = newsoup.find('div', {'style': 'margin-left:10px;margin-right:10px;'}).text.strip()
pasteurl = " " + web.haste(lyrics)
except Exception as e:
pasteurl = " (\x02Unable to paste lyrics\x02 [%s])" % str(e)
pasteurl = " (\x02Unable to paste lyrics\x02 [{}])".format(str(e))
else:
pasteurl = ""
artist = div.find('b').text.title()
@ -39,10 +39,10 @@ def lyrics(inp):
spurl = ""
lyricsum = div.find('div').text
if "\r\n" in lyricsum.strip():
lyricsum = " / ".join(lyricsum.strip().split("\r\n")[0:4]) # truncate, format
lyricsum = " / ".join(lyricsum.strip().split("\r\n")[0:4]) # truncate, format
else:
lyricsum = " / ".join(lyricsum.strip().split("\n")[0:4]) # truncate, format
return "\x02%s\x02 by \x02%s\x02 %s%s%s - %s" % (
title, artist, web.try_isgd(link), spurl, pasteurl, lyricsum[:-3])
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,
lyricsum[:-3])
else:
return "No song results. " + url + inp.replace(" ", "+")