few performance changes

This commit is contained in:
Nicolas Coevoet 2014-01-24 18:58:13 +01:00
parent 40eb6c0bd8
commit 031e94eca3

View File

@ -521,7 +521,7 @@ class Ircd (object):
(uid,full) = item (uid,full) = item
if ircutils.hostmaskPatternEqual(pattern,full): if ircutils.hostmaskPatternEqual(pattern,full):
bans[uid] = uid bans[uid] = uid
c.execute("""SELECT ban_id, full FROM nicks WHERE full GLOB ? OR full LIKE ? OR log GLOB ? OR log LIKE ? ORDER BY ban_id DESC""",(glob,like,glob,like)) c.execute("""SELECT ban_id, full FROM nicks WHERE full GLOB ? OR full LIKE ? ORDER BY ban_id DESC""",(glob,like))
items = c.fetchall() items = c.fetchall()
if len(items): if len(items):
for item in items: for item in items:
@ -839,7 +839,7 @@ class Chan (object):
ns = [] ns = []
if self.name in self.ircd.irc.state.channels: if self.name in self.ircd.irc.state.channels:
L = [] L = []
for nick in self.ircd.irc.state.channels[self.name].users: for nick in list(self.ircd.irc.state.channels[self.name].users):
L.append(nick) L.append(nick)
for nick in L: for nick in L:
n = self.ircd.getNick(self.ircd.irc,nick) n = self.ircd.getNick(self.ircd.irc,nick)
@ -1368,7 +1368,7 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
if ircutils.isUserHostmask(pattern) or pattern.find(self.getIrcdExtbansPrefix(irc)) != -1: if ircutils.isUserHostmask(pattern) or pattern.find(self.getIrcdExtbansPrefix(irc)) != -1:
results = [] results = []
i = self.getIrc(irc) i = self.getIrc(irc)
for nick in irc.state.channels[channel].users: for nick in list(irc.state.channels[channel].users):
if nick in i.nicks: if nick in i.nicks:
n = self.getNick(irc,nick) n = self.getNick(irc,nick)
m = match(pattern,n,irc) m = match(pattern,n,irc)
@ -2692,7 +2692,7 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
if info == 'Channel ban list is full': if info == 'Channel ban list is full':
if self.registryValue('logChannel',channel=channel) in irc.state.channels: if self.registryValue('logChannel',channel=channel) in irc.state.channels:
L = [] L = []
for user in irc.state.channels[self.registryValue('logChannel',channel=channel)].users: for user in list(irc.state.channels[self.registryValue('logChannel',channel=channel)].users):
L.append(user) L.append(user)
self._logChan(irc,channel,'[%s] %s : %s' % (channel,info,' '.join(L))) self._logChan(irc,channel,'[%s] %s : %s' % (channel,info,' '.join(L)))
self._tickle(irc) self._tickle(irc)
@ -2728,7 +2728,7 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
else: else:
results = [] results = []
i = self.getIrc(irc) i = self.getIrc(irc)
for nick in irc.state.channels[channel].users: for nick in list(irc.state.channels[channel].users):
if nick in i.nicks and nick != irc.nick: if nick in i.nicks and nick != irc.nick:
n = self.getNick(irc,nick) n = self.getNick(irc,nick)
m = match(mask,n,irc) m = match(mask,n,irc)
@ -2790,7 +2790,7 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
if limit == -1: if limit == -1:
return False return False
count = 0 count = 0
for user in irc.state.channels[channel].users: for user in list(irc.state.channels[channel].users):
count = count + message.count(user) count = count + message.count(user)
return count > limit return count > limit