Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-02 17:29:22 +01:00
Code Issues Projects Releases Wiki Activity

Made info persistent as well as allowed reloading without resetting the license key.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-08-31 14:45:01 +00:00
parent 5a43c3718b
commit 1f9979073c
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/Google.py
View File

@ -91,14 +91,9 @@ def configure(advanced):
You can apply for a key at http://www.google.com/apis/""") You can apply for a key at http://www.google.com/apis/""")
totalSearches = 0
totalTime = 0
last24hours = structures.queue()
def search(log, queries, **kwargs): def search(log, queries, **kwargs):
assert not isinstance(queries, basestring), 'Old code: queries is a list.' assert not isinstance(queries, basestring), 'Old code: queries is a list.'
try: try:
global totalSearches, totalTime, last24hours
for (i, query) in enumerate(queries): for (i, query) in enumerate(queries):
if len(query.split(None, 1)) > 1: if len(query.split(None, 1)) > 1:
queries[i] = repr(query) queries[i] = repr(query)
@ -106,12 +101,6 @@ def search(log, queries, **kwargs):
if proxy: if proxy:
kwargs['http_proxy'] = proxy kwargs['http_proxy'] = proxy
data = google.doGoogleSearch(' '.join(queries), **kwargs) data = google.doGoogleSearch(' '.join(queries), **kwargs)
now = time.time()
totalSearches += 1
totalTime += data.meta.searchTime
last24hours.enqueue(now)
while last24hours and now - last24hours.peek() > 86400:
last24hours.dequeue()
return data return data
except socket.error, e: except socket.error, e:
if e.args[0] == 110: if e.args[0] == 110:
@ -184,7 +173,7 @@ conf.registerGlobalValue(conf.supybot.plugins.Google, 'licenseKey',
conf.registerGroup(conf.supybot.plugins.Google, 'state') conf.registerGroup(conf.supybot.plugins.Google, 'state')
conf.registerGlobalValue(conf.supybot.plugins.Google.state, 'searches', conf.registerGlobalValue(conf.supybot.plugins.Google.state, 'searches',
registry.Float(0.0, """Used to keep the total number of searches Google has registry.Integer(0, """Used to keep the total number of searches Google has
done for this bot. You shouldn't modify this.""")) done for this bot. You shouldn't modify this."""))
conf.registerGlobalValue(conf.supybot.plugins.Google.state, 'time', conf.registerGlobalValue(conf.supybot.plugins.Google.state, 'time',
registry.Float(0.0, """Used to keep the total amount of time Google has registry.Float(0.0, """Used to keep the total amount of time Google has
@ -195,14 +184,25 @@ class Google(callbacks.PrivmsgCommandAndRegexp):
regexps = sets.Set(['googleSnarfer', 'googleGroups']) regexps = sets.Set(['googleSnarfer', 'googleGroups'])
def __init__(self): def __init__(self):
callbacks.PrivmsgCommandAndRegexp.__init__(self) callbacks.PrivmsgCommandAndRegexp.__init__(self)
self.total = 0 self.total = self.registryValue('state.searches')
self.totalTime = 0 self.totalTime = self.registryValue('state.time')
self.last24hours = structures.queue() self.last24hours = structures.queue()
google.setLicense(self.registryValue('licenseKey'))
def die(self):
self.setRegistryValue('state.searches', self.total)
self.setRegistryValue('state.time', self.totalTime)
def formatData(self, data, bold=True, max=0): def formatData(self, data, bold=True, max=0):
if isinstance(data, basestring): if isinstance(data, basestring):
return data return data
time = 'Search took %s seconds' % data.meta.searchTime self.total += 1
self.totalTime += data.meta.searchTime
now = time.time()
while self.last24hours and now - self.last24hours.peek() > 86400:
self.last24hours.dequeue()
self.last24hours.enqueue(now)
t = 'Search took %s seconds' % data.meta.searchTime
results = [] results = []
if max: if max:
data.results = data.results[:max] data.results = data.results[:max]
@ -216,9 +216,9 @@ class Google(callbacks.PrivmsgCommandAndRegexp):
else: else:
results.append(url) results.append(url)
if not results: if not results:
return 'No matches found (%s)' % time return 'No matches found (%s)' % t
else: else:
return '%s: %s' % (time, '; '.join(results)) return '%s: %s' % (t, '; '.join(results))
def lucky(self, irc, msg, args): def lucky(self, irc, msg, args):
"""<search> """<search>
@ -359,12 +359,12 @@ class Google(callbacks.PrivmsgCommandAndRegexp):
Returns interesting information about this Google module. Mostly Returns interesting information about this Google module. Mostly
useful for making sure you don't go over your 1000 requests/day limit. useful for making sure you don't go over your 1000 requests/day limit.
""" """
recent = len(last24hours) recent = len(self.last24hours)
irc.reply('This google module has been called %s total; ' irc.reply('This google module has been called %s total; '
'%s in the past 24 hours. ' '%s in the past 24 hours. '
'Google has spent %s seconds searching for me.' % 'Google has spent %s seconds searching for me.' %
(utils.nItems('time', totalSearches), (utils.nItems('time', self.total),
utils.nItems('time', recent), totalTime)) utils.nItems('time', recent), self.totalTime))
def googleSnarfer(self, irc, msg, match): def googleSnarfer(self, irc, msg, match):
r"^google\s+(.*)$" r"^google\s+(.*)$"