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

Changed error message in the case of no license key.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-02-12 00:23:24 +00:00
parent 1f9d794943
commit dda081b302
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/Google.py
View File

@ -114,10 +114,14 @@ totalSearches = 0
totalTime = 0 totalTime = 0
last24hours = structures.queue() last24hours = structures.queue()
def search(log, *args, **kwargs): def search(log, queries, **kwargs):
assert not isinstance(queries, basestring), 'Old code: queries is a list.'
try: try:
global totalSearches, totalTime, last24hours global totalSearches, totalTime, last24hours
data = google.doGoogleSearch(*args, **kwargs) for (i, query) in enumerate(queries):
if len(query.split(None, 1)) > 1:
queries[i] = repr(query)
data = google.doGoogleSearch(' '.join(query), **kwargs)
now = time.time() now = time.time()
totalSearches += 1 totalSearches += 1
totalTime += data.meta.searchTime totalTime += data.meta.searchTime
@ -218,11 +222,17 @@ class Google(callbacks.PrivmsgCommandAndRegexp):
kwargs['filter'] = False kwargs['filter'] = False
else: else:
kwargs[option[2:]] = argument kwargs[option[2:]] = argument
searchString = privmsgs.getArgs(rest) for (i, arg) in args:
if len(arg.split()) > 1:
args[i] = repr(arg)
try: try:
data = search(self.log, searchString, **kwargs) data = search(self.log, rest, **kwargs)
except google.NoLicenseKey, e: except google.NoLicenseKey, e:
irc.error(str(e)) irc.error('You must have a free Google web services license key '
'in order to use this command. You can get one at '
'<http://google.com/apis/>. Once you have one, you can '
'set it with the command '
'"config supybot.plugins.Google.licenseKey <key>".')
return return
bold = self.registryValue('bold', msg.args[0]) bold = self.registryValue('bold', msg.args[0])
max = self.registryValue('maximumResults', msg.args[0]) max = self.registryValue('maximumResults', msg.args[0])
@ -245,8 +255,7 @@ class Google(callbacks.PrivmsgCommandAndRegexp):
kwargs['filter'] = False kwargs['filter'] = False
else: else:
kwargs[option[2:]] = argument kwargs[option[2:]] = argument
searchString = privmsgs.getArgs(rest) data = search(self.log, rest, **kwargs)
data = search(self.log, searchString, **kwargs)
meta = data.meta meta = data.meta
categories = [d['fullViewableName'] for d in meta.directoryCategories] categories = [d['fullViewableName'] for d in meta.directoryCategories]
categories = [utils.dqrepr(s.replace('_', ' ')) for s in categories] categories = [utils.dqrepr(s.replace('_', ' ')) for s in categories]
@ -287,7 +296,7 @@ class Google(callbacks.PrivmsgCommandAndRegexp):
results = [] results = []
for arg in args: for arg in args:
data = search(self.log, arg) data = search(self.log, [arg])
results.append((data.meta.estimatedTotalResultsCount, arg)) results.append((data.meta.estimatedTotalResultsCount, arg))
results.sort() results.sort()
results.reverse() results.reverse()
@ -325,7 +334,7 @@ class Google(callbacks.PrivmsgCommandAndRegexp):
return return
searchString = match.group(1) searchString = match.group(1)
try: try:
data = search(self.log, searchString, safeSearch=1) data = search(self.log, [searchString], safeSearch=1)
except google.NoLicenseKey: except google.NoLicenseKey:
return return
if data.results: if data.results: