mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-02 17:29:22 +01:00
All in the name of case insensitivity.
This commit is contained in:
parent
0194abff28
commit
ec0dd27960
@ -59,6 +59,8 @@ conf.registerChannelValue(conf.supybot.plugins.WordStats,
|
|||||||
|
|
||||||
nonAlphaNumeric = filter(lambda s: not s.isalnum(), string.ascii)
|
nonAlphaNumeric = filter(lambda s: not s.isalnum(), string.ascii)
|
||||||
|
|
||||||
|
WordDict = utils.InsensitivePreservingDict
|
||||||
|
|
||||||
class WordStatsDB(plugins.ChannelUserDB):
|
class WordStatsDB(plugins.ChannelUserDB):
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
self.channelWords = ircutils.IrcDict()
|
self.channelWords = ircutils.IrcDict()
|
||||||
@ -71,19 +73,18 @@ class WordStatsDB(plugins.ChannelUserDB):
|
|||||||
return L
|
return L
|
||||||
|
|
||||||
def deserialize(self, channel, id, L):
|
def deserialize(self, channel, id, L):
|
||||||
d = {}
|
d = WordDict()
|
||||||
for s in L:
|
for s in L:
|
||||||
(word, count) = s.split(':')
|
(word, count) = s.split(':')
|
||||||
count = int(count)
|
count = int(count)
|
||||||
d[word] = count
|
d[word] = count
|
||||||
if channel not in self.channelWords:
|
if channel not in self.channelWords:
|
||||||
self.channelWords[channel] = {}
|
self.channelWords[channel] = WordDict()
|
||||||
self.channelWords[channel].setdefault(word, 0)
|
self.channelWords[channel].setdefault(word, 0)
|
||||||
self.channelWords[channel][word] += count
|
self.channelWords[channel][word] += count
|
||||||
return d
|
return d
|
||||||
|
|
||||||
def getWordCount(self, channel, id, word):
|
def getWordCount(self, channel, id, word):
|
||||||
word = word.lower()
|
|
||||||
return self[channel, id][word]
|
return self[channel, id][word]
|
||||||
|
|
||||||
def getUserWordCounts(self, channel, id):
|
def getUserWordCounts(self, channel, id):
|
||||||
@ -102,14 +103,13 @@ class WordStatsDB(plugins.ChannelUserDB):
|
|||||||
def getNumUsers(self, channel):
|
def getNumUsers(self, channel):
|
||||||
i = 0
|
i = 0
|
||||||
for ((chan, _), _) in self.iteritems():
|
for ((chan, _), _) in self.iteritems():
|
||||||
if chan == channel:
|
if ircutils.nickEqual(chan, channel):
|
||||||
i += 1
|
i += 1
|
||||||
return i
|
return i
|
||||||
|
|
||||||
def getTopUsers(self, channel, word, n):
|
def getTopUsers(self, channel, word, n):
|
||||||
word = word.lower()
|
|
||||||
L = [(id, d[word]) for ((chan, id), d) in self.iteritems()
|
L = [(id, d[word]) for ((chan, id), d) in self.iteritems()
|
||||||
if channel == chan and word in d]
|
if ircutils.nickEqual(channel, chan) and word in d]
|
||||||
utils.sortBy(lambda (_, i): i, L)
|
utils.sortBy(lambda (_, i): i, L)
|
||||||
L = L[-n:]
|
L = L[-n:]
|
||||||
L.reverse()
|
L.reverse()
|
||||||
@ -125,21 +125,19 @@ class WordStatsDB(plugins.ChannelUserDB):
|
|||||||
raise KeyError
|
raise KeyError
|
||||||
|
|
||||||
def addWord(self, channel, word):
|
def addWord(self, channel, word):
|
||||||
word = word.lower()
|
|
||||||
if channel not in self.channelWords:
|
if channel not in self.channelWords:
|
||||||
self.channelWords[channel] = {}
|
self.channelWords[channel] = {}
|
||||||
self.channelWords[channel][word] = 0
|
self.channelWords[channel][word] = 0
|
||||||
for ((chan, id), d) in self.iteritems():
|
for ((chan, id), d) in self.iteritems():
|
||||||
if channel == chan:
|
if ircutils.nickEqual(chan, channel):
|
||||||
if word not in d:
|
if word not in d:
|
||||||
d[word] = 0
|
d[word] = 0
|
||||||
|
|
||||||
def delWord(self, channel, word):
|
def delWord(self, channel, word):
|
||||||
word = word.lower()
|
|
||||||
if word in self.channelWords[channel]:
|
if word in self.channelWords[channel]:
|
||||||
del self.channelWords[channel][word]
|
del self.channelWords[channel][word]
|
||||||
for ((chan, id), d) in self.iteritems():
|
for ((chan, id), d) in self.iteritems():
|
||||||
if channel == chan:
|
if ircutils.nickEqual(chan, channel):
|
||||||
if word in d:
|
if word in d:
|
||||||
del d[word]
|
del d[word]
|
||||||
|
|
||||||
@ -157,6 +155,7 @@ class WordStatsDB(plugins.ChannelUserDB):
|
|||||||
if channel not in self.channelWords:
|
if channel not in self.channelWords:
|
||||||
self.channelWords[channel] = {}
|
self.channelWords[channel] = {}
|
||||||
for word in self.channelWords[channel]:
|
for word in self.channelWords[channel]:
|
||||||
|
word = word.lower()
|
||||||
for msgword in msgwords:
|
for msgword in msgwords:
|
||||||
if msgword == word:
|
if msgword == word:
|
||||||
self.channelWords[channel][word] += 1
|
self.channelWords[channel][word] += 1
|
||||||
@ -196,7 +195,6 @@ class WordStats(callbacks.Privmsg):
|
|||||||
if word.strip(nonAlphaNumeric) != word:
|
if word.strip(nonAlphaNumeric) != word:
|
||||||
irc.error('<word> must not contain non-alphanumeric chars.')
|
irc.error('<word> must not contain non-alphanumeric chars.')
|
||||||
return
|
return
|
||||||
word = word.lower()
|
|
||||||
self.db.addWord(channel, word)
|
self.db.addWord(channel, word)
|
||||||
irc.replySuccess()
|
irc.replySuccess()
|
||||||
|
|
||||||
@ -265,7 +263,7 @@ class WordStats(callbacks.Privmsg):
|
|||||||
irc.reply(s)
|
irc.reply(s)
|
||||||
else:
|
else:
|
||||||
irc.error('%s has never said %r.' % (user, word))
|
irc.error('%s has never said %r.' % (user, word))
|
||||||
elif arg1 in self.db.getWords(channel):
|
elif arg1 in WordDict.fromkeys(self.db.getWords(channel)):
|
||||||
word = arg1
|
word = arg1
|
||||||
total = self.db.getTotalWordCount(channel, word)
|
total = self.db.getTotalWordCount(channel, word)
|
||||||
n = self.registryValue('rankingDisplay', channel)
|
n = self.registryValue('rankingDisplay', channel)
|
||||||
@ -283,11 +281,11 @@ class WordStats(callbacks.Privmsg):
|
|||||||
rank = None
|
rank = None
|
||||||
try:
|
try:
|
||||||
username = ircdb.users.getUser(userid).name
|
username = ircdb.users.getUser(userid).name
|
||||||
except KeyError:
|
|
||||||
irc.error('Odd, I have a user in my WordStats database '
|
|
||||||
'that doesn\'t exist in the user database.')
|
|
||||||
return
|
|
||||||
L.append('%s: %s' % (username, count))
|
L.append('%s: %s' % (username, count))
|
||||||
|
except KeyError:
|
||||||
|
self.log.warning('Odd, I have a user in my WordStats '
|
||||||
|
'database that doesn\'t exist in my '
|
||||||
|
'user database: #%s.', userid)
|
||||||
ret = 'Top %s (out of a total of %s seen):' % \
|
ret = 'Top %s (out of a total of %s seen):' % \
|
||||||
(utils.nItems(ers, len(L)), utils.nItems(repr(word), total))
|
(utils.nItems(ers, len(L)), utils.nItems(repr(word), total))
|
||||||
users = self.db.getNumUsers(channel)
|
users = self.db.getNumUsers(channel)
|
||||||
|
@ -591,6 +591,13 @@ class InsensitivePreservingDict(UserDict.DictMixin, object):
|
|||||||
if dict is not None:
|
if dict is not None:
|
||||||
self.update(dict)
|
self.update(dict)
|
||||||
|
|
||||||
|
def fromkeys(cls, keys, s=None, dict=None, key=None):
|
||||||
|
d = cls(dict=dict, key=key)
|
||||||
|
for key in keys:
|
||||||
|
d[key] = s
|
||||||
|
return d
|
||||||
|
fromkeys = classmethod(fromkeys)
|
||||||
|
|
||||||
def __getitem__(self, k):
|
def __getitem__(self, k):
|
||||||
return self.data[self.key(k)][1]
|
return self.data[self.key(k)][1]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user