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

Google: Stop output when there are no result.

Browse Source
This commit is contained in:
Terje Hoås 2012-08-17 17:16:26 +02:00
parent b5e965c48a
commit e1adc011c3
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/Google/plugin.py
View File

@ -269,7 +269,7 @@ class Google(callbacks.PluginRegexp):
""" """
urlig = self._googleUrlIG(expr) urlig = self._googleUrlIG(expr)
js = utils.web.getUrl(urlig).decode('utf8') js = utils.web.getUrl(urlig).decode('utf8')
# fix bad google json # Convert JavaScript to JSON. Ouch.
js = js \ js = js \
.replace('lhs:','"lhs":') \ .replace('lhs:','"lhs":') \
.replace('rhs:','"rhs":') \ .replace('rhs:','"rhs":') \
@ -278,11 +278,6 @@ class Google(callbacks.PluginRegexp):
.replace('\\', '\\\\') .replace('\\', '\\\\')
js = json.loads(js) js = json.loads(js)
# Currency conversion
if js['icc'] == True:
irc.reply("%s = %s" % (js['lhs'], js['rhs'],))
return
url = self._googleUrl(expr) url = self._googleUrl(expr)
html = utils.web.getUrl(url).decode('utf8') html = utils.web.getUrl(url).decode('utf8')
match = self._calcRe1.search(html) match = self._calcRe1.search(html)
@ -294,10 +289,15 @@ class Google(callbacks.PluginRegexp):
s = self._calcFontRe.sub(r',', s) s = self._calcFontRe.sub(r',', s)
s = self._calcTimesRe.sub(r'*', s) s = self._calcTimesRe.sub(r'*', s)
s = utils.web.htmlToText(s) s = utils.web.htmlToText(s)
irc.reply(s) if ' = ' in s: # Extra check, since the regex seems to fail.
else: irc.reply(s)
irc.reply(_('Google says: Error: %s.') % (js['error'],)) return
irc.reply('Google\'s calculator didn\'t come up with anything.') elif js['lhs'] and js['rhs']:
# Outputs the original result. Might look ugly.
irc.reply("%s = %s" % (js['lhs'], js['rhs'],))
return
irc.reply(_('Google says: Error: %s.') % (js['error'],))
irc.reply('Google\'s calculator didn\'t come up with anything.')
calc = wrap(calc, ['text']) calc = wrap(calc, ['text'])
_phoneRe = re.compile(r'Phonebook.*?<font size=-1>(.*?)<a href') _phoneRe = re.compile(r'Phonebook.*?<font size=-1>(.*?)<a href')