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

Google: use google ig api for the calc. no more web scraping. let's hope this stays alive.

Browse Source
This commit is contained in:
Daniel Folkinshteyn 2011-12-12 12:59:27 -05:00
parent 05adad617d
commit 4fe8fe4b10
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/Google/plugin.py
View File

@ -316,33 +316,24 @@ class Google(callbacks.PluginRegexp):
def _googleUrl(self, s): def _googleUrl(self, s):
s = s.replace('+', '%2B') s = s.replace('+', '%2B')
s = s.replace(' ', '+') s = s.replace(' ', '+')
url = r'http://google.com/search?q=' + s url = r'http://www.google.com/ig/calculator?hl=en&q=' + s
return url return url
_calcRe1 = re.compile(r'<table.*class="?obcontainer"?[^>]*>(.*?)</table>', re.I)
_calcRe2 = re.compile(r'<h\d class="?r"?.*?<b>(.*?)</b>', re.I)
_calcSupRe = re.compile(r'<sup>(.*?)</sup>', re.I)
_calcFontRe = re.compile(r'<font size=-2>(.*?)</font>')
_calcTimesRe = re.compile(r'&(?:times|#215);')
def calc(self, irc, msg, args, expr): def calc(self, irc, msg, args, expr):
"""<expression> """<expression>
Uses Google's calculator to calculate the value of <expression>. Uses Google's calculator to calculate the value of <expression>.
""" """
url = self._googleUrl(expr) url = self._googleUrl(expr)
html = utils.web.getUrl(url) js = utils.web.getUrl(url)
match = self._calcRe1.search(html) # fix bad google json
if match is None: js = js.replace('lhs:','"lhs":').replace('rhs:','"rhs":').replace('error:','"error":').replace('icc:','"icc":')
match = self._calcRe2.search(html) js = simplejson.loads(js)
if match is not None:
s = match.group(1) if js['error'] == '':
s = self._calcSupRe.sub(r'^(\1)', s) irc.reply("%s = %s" % (js['lhs'], js['rhs'],))
s = self._calcFontRe.sub(r',', s)
s = self._calcTimesRe.sub(r'*', s)
s = utils.web.htmlToText(s)
irc.reply(s)
else: else:
irc.reply('Google\'s calculator didn\'t come up with anything.') irc.reply('Google says: Error: %s.' % (js['error'],))
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')