Lyrics: fix typo in getlyrics()

This commit is contained in:
oddluck 2020-07-17 22:57:49 +00:00
parent 454fac3ca9
commit 7e305bd92c

View File

@ -140,7 +140,7 @@ class Lyrics(callbacks.Plugin):
lyrics = re.sub(r"\s+\n", "", lyrics) lyrics = re.sub(r"\s+\n", "", lyrics)
return lyrics return lyrics
else: else:
self.getLyrics(query, retries + 1) self.getlyrics(query, retries + 1)
else: else:
log.info("Lyrics: maximum number of retries (3) reached.") log.info("Lyrics: maximum number of retries (3) reached.")
return return
@ -153,28 +153,20 @@ class Lyrics(callbacks.Plugin):
url = None url = None
title, url = self.dosearch(irc, msg.channel, lyric) title, url = self.dosearch(irc, msg.channel, lyric)
if url and title and "lyrics.fandom.com/wiki/" in url: if url and title and "lyrics.fandom.com/wiki/" in url:
try:
lyrics = self.getlyrics(url) lyrics = self.getlyrics(url)
if lyrics: if lyrics:
irc.reply(title + " | " + lyrics, prefixNick=False) irc.reply(title + " | " + lyrics, prefixNick=False)
else: else:
irc.reply("Unable to retrieve lyrics from {0}".format(url)) irc.reply("Unable to retrieve lyrics from {0}".format(url))
return return
except Exception:
irc.reply("Unable to retrieve lyrics from {0}".format(url))
return
else: else:
if "," in lyric: if "," in lyric:
try:
lyrics = self.getlyrics(lyric) lyrics = self.getlyrics(lyric)
if lyrics: if lyrics:
irc.reply(lyrics, prefixNick=False) irc.reply(lyrics, prefixNick=False)
else: else:
irc.reply("Unable to retrieve lyrics for {0}".format(lyric)) irc.reply("Unable to retrieve lyrics for {0}".format(lyric))
return return
except Exception:
irc.reply("Unable to retrieve lyrics for {0}".format(lyric))
return
else: else:
irc.reply("Searches must be formatted as <artist>, <song title>") irc.reply("Searches must be formatted as <artist>, <song title>")
return return