LastFM: simplify 'compare' output (just the percentage is enough)

This commit is contained in:
James Lu 2015-02-21 17:21:29 -05:00
parent f8a66f7d90
commit 832bd3eb18

View File

@ -309,18 +309,16 @@ class LastFM(callbacks.Plugin):
resultNode = xml.getElementsByTagName("result")[0] resultNode = xml.getElementsByTagName("result")[0]
try: try:
score = resultNode.getElementsByTagName('score')[0].firstChild.data score = resultNode.getElementsByTagName('score')[0].firstChild.data
score = round(float(score), 3) score = round(float(score) * 100, 1)
score = ircutils.bold("%s%%" % score)
except (IndexError, ValueError): except (IndexError, ValueError):
scoreStr = "unknown" score = "unknown"
else:
scoreStr = "%s (%s)" % (ircutils.bold(self._formatRating(score)),
score)
artists = resultNode.getElementsByTagName("artist") artists = resultNode.getElementsByTagName("artist")
artistNames = [ircutils.bold(el.getElementsByTagName("name")[0].firstChild.data) artistNames = [ircutils.bold(el.getElementsByTagName("name")[0].firstChild.data)
for el in artists] for el in artists]
s = ("Result of comparison between %s and %s: score: %s, common " s = ("Result of comparison between %s and %s: score: %s, common "
"artists: %s" % (ircutils.bold(user1), ircutils.bold(user2), "artists: %s" % (ircutils.bold(user1), ircutils.bold(user2),
scoreStr, ", ".join(artistNames))) score, ", ".join(artistNames)))
irc.reply(s) irc.reply(s)
compare = wrap(compareUsers, ["something", optional("something")]) compare = wrap(compareUsers, ["something", optional("something")])
@ -336,25 +334,6 @@ class LastFM(callbacks.Plugin):
if t > 0: if t > 0:
return "%i seconds ago" % (t) return "%i seconds ago" % (t)
def _formatRating(self, score):
"""<score>
Formats <score> values to text. <score> should be a float
between 0 and 1.
"""
if score >= 0.9:
return "Super"
elif score >= 0.7:
return "Very High"
elif score >= 0.5:
return "High"
elif score >= 0.3:
return "Medium"
elif score >= 0.1:
return "Low"
else:
return "Very Low"
dbfilename = conf.supybot.directories.data.dirize("LastFM.db") dbfilename = conf.supybot.directories.data.dirize("LastFM.db")
Class = LastFM Class = LastFM