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

fix ProgVal/Limnoria#522

Browse Source
This commit is contained in:
Rico Dittrich 2014-05-02 21:36:03 +02:00
parent e7169e9143
commit 37ac14e747
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/Google/plugin.py
View File

@ -296,12 +296,6 @@ class Google(callbacks.PluginRegexp):
(self.registryValue('baseUrl', channel), s) (self.registryValue('baseUrl', channel), s)
return url return url
def _googleUrlIG(self, s, channel):
s = urllib.quote_plus(s)
url = r'http://%s/ig/calculator?hl=en&q=%s' % \
(self.registryValue('baseUrl', channel), s)
return url
_calcRe1 = re.compile(r'<span class="cwcot".*?>(.*?)</span>', re.I) _calcRe1 = re.compile(r'<span class="cwcot".*?>(.*?)</span>', re.I)
_calcRe2 = re.compile(r'<div class="vk_ans.*?>(.*?)</div>', re.I | re.S) _calcRe2 = re.compile(r'<div class="vk_ans.*?>(.*?)</div>', re.I | re.S)
_calcRe3 = re.compile(r'<div class="side_div" id="rhs_div">.*?<input class="ucw_data".*?value="(.*?)"', re.I) _calcRe3 = re.compile(r'<div class="side_div" id="rhs_div">.*?<input class="ucw_data".*?value="(.*?)"', re.I)
@ -314,9 +308,9 @@ class Google(callbacks.PluginRegexp):
channel = msg.args[0] channel = msg.args[0]
if not ircutils.isChannel(channel): if not ircutils.isChannel(channel):
channel = None channel = None
urlig = self._googleUrlIG(expr, channel) url = self._googleUrl(expr, channel)
h = {"User-Agent":"Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1667.0 Safari/537.36"} h = {"User-Agent":"Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1667.0 Safari/537.36"}
html = utils.web.getUrl(urlig, headers=h).decode('utf8') html = utils.web.getUrl(url, headers=h).decode('utf8')
match = self._calcRe1.search(html) match = self._calcRe1.search(html)
if not match: if not match:
match = self._calcRe2.search(html) match = self._calcRe2.search(html)