Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-30 14:59:34 +01:00
Code Issues Projects Releases Wiki Activity

Anchored a regexp and fixed a bug or two.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-08-22 23:00:10 +00:00
parent 95f5abdda4
commit 05eabee767
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/Debian.py
View File

@ -38,6 +38,7 @@ from baseplugin import *
import gzip import gzip
import popen2 import popen2
import random import random
import os.path
import urllib2 import urllib2
import re, sre_constants import re, sre_constants
from itertools import imap, ifilter from itertools import imap, ifilter
@ -82,6 +83,7 @@ class Debian(callbacks.Privmsg, PeriodicFileDownloader):
'debian/dists/unstable/Contents-i386.gz', 'debian/dists/unstable/Contents-i386.gz',
86400, None) 86400, None)
} }
contents = os.path.join(conf.dataDir, 'Contents-i386.gz')
def __init__(self): def __init__(self):
callbacks.Privmsg.__init__(self) callbacks.Privmsg.__init__(self)
PeriodicFileDownloader.__init__(self) PeriodicFileDownloader.__init__(self)
@ -94,16 +96,20 @@ class Debian(callbacks.Privmsg, PeriodicFileDownloader):
def debfile(self, irc, msg, args): def debfile(self, irc, msg, args):
self.getFile('Contents-i386.gz') self.getFile('Contents-i386.gz')
regexp = privmsgs.getArgs(args).lstrip('/') # Make sure it's anchored, make sure it doesn't have a leading slash
# (the filenames don't have leading slashes, and people may not know
# that).
regexp = privmsgs.getArgs(args).lstrip('^/')
regexp = '^' + regexp
try: try:
r = re.compile(regexp, re.I) r = re.compile(regexp, re.I)
except sre_constants.error, e: except sre_constants.error, e:
irc.error(msg, e) irc.error(msg, e)
return return
if self.usePythonZegrep: if self.usePythonZegrep:
fd = gzip.open('Contents-i386.gz') fd = gzip.open(self.contents)
fd = ifilter(imap(lambda line: r.search(line), fd)) fd = ifilter(imap(lambda line: r.search(line), fd))
(fd, _) = popen2.popen2(['zegrep', regexp, 'Contents-i386.gz']) (fd, _) = popen2.popen2(['zegrep', regexp, self.contents])
packages = [] packages = []
for line in fd: for line in fd:
try: try: