Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-23 19:19:32 +01:00
Code Issues Projects Releases Wiki Activity

Time to *really* finish up the stuff in the RFE and not just close it without

Browse Source 
completely finishing it off ;)
This commit is contained in:
Daniel DiPaolo 2003-12-03 03:14:40 +00:00
parent 31de7d0cf8
commit 42afa12765
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/ChannelDB.py
View File

@ -72,7 +72,10 @@ class ChannelDB(plugins.ChannelDBHandler,
[('self-stats', plugins.ConfigurableBoolType, True, [('self-stats', plugins.ConfigurableBoolType, True,
"""Determines whether the bot will keep channel statistics on itself, """Determines whether the bot will keep channel statistics on itself,
possibly skewing the channel stats (especially in cases where he's possibly skewing the channel stats (especially in cases where he's
relaying between channels on a network.""")] relaying between channels on a network."""),
('wordstats-top-n', plugins.ConfigurableIntType, 3,
"""Determines the maximum number of top users to show for a given
wordstat when you request the wordstats for a particular word.""")]
) )
def __init__(self): def __init__(self):
callbacks.Privmsg.__init__(self) callbacks.Privmsg.__init__(self)
@ -564,21 +567,32 @@ class ChannelDB(plugins.ChannelDBHandler,
else: else:
# It's a word, not a user # It's a word, not a user
word = arg1 word = arg1
numUsers = self.configurables.get('wordstats-top-n',
msg.args[0])
cursor.execute("""SELECT word_stats.count, cursor.execute("""SELECT word_stats.count,
word_stats.user_id word_stats.user_id
FROM words, word_stats FROM words, word_stats
WHERE words.word=%s AND WHERE words.word=%s AND
words.id=word_stats.word_id words.id=word_stats.word_id
ORDER BY word_stats.count DESC""", word) ORDER BY word_stats.count DESC""",
word)
if cursor.rowcount == 0: if cursor.rowcount == 0:
irc.error(msg, 'No one has said %r' % word) irc.error(msg, 'No one has said %r' % word)
return return
results = cursor.fetchall() results = cursor.fetchall()
maxResults = 3 numResultsShown = min(cursor.rowcount, numUsers)
cursor.execute("""SELECT sum(word_stats.count)
FROM words, word_stats
WHERE words.word=%s AND
words.id=word_stats.word_id""",
word)
total = int(cursor.fetchone()[0])
ers = '%rer' % word ers = '%rer' % word
ret = 'Top %s: ' % utils.nItems(maxResults, ers) ret = 'Top %s ' % utils.nItems(numResultsShown, ers)
ret += '(out of a total of %s seen):' % \
utils.nItems(total, repr(word))
L = [] L = []
for (count, id) in results[:maxResults]: for (count, id) in results[:numResultsShown]:
username = ircdb.users.getUser(id).name username = ircdb.users.getUser(id).name
L.append('%s: %s' % (username, count)) L.append('%s: %s' % (username, count))
try: try:

5
test/test_ChannelDB.py
View File

@ -130,6 +130,11 @@ if sqlite is not None:
self.assertRegexp('wordstats lol', self.assertRegexp('wordstats lol',
'3.*%s: 10.*%s: 5.*foo: 3' % '3.*%s: 10.*%s: 5.*foo: 3' %
(userNick2, userNick1)) (userNick2, userNick1))
# Check for the extra-swanky stuff too
self.assertRegexp('wordstats lol',
'total.*19 \'lol\'s.*%s: 10.*%s: 5.*foo: 4.*'
'ranked 3 out of 3 \'lol\'ers' % \
(userNick2, userNick1))
def testWordStatsUserWord(self): def testWordStatsUserWord(self):
self.assertNotError('addword lol') self.assertNotError('addword lol')