1
=== modified file 'ibid/plugins/google.py'
2
--- ibid/plugins/google.py	2009-03-01 23:01:30 +0000
3
+++ ibid/plugins/google.py	2009-03-03 22:52:47 +0000
4
@@ -1,53 +1,81 @@
5
1
import htmlentitydefs
6
2
import re
7
3
import simplejson
8
1
from urllib import quote
4
from urllib import quote
9
2
from urllib2 import urlopen, Request
5
from urllib2 import urlopen, Request
10
6
11
3
from BeautifulSoup import BeautifulSoup
7
from BeautifulSoup import BeautifulSoup
12
4
8
13
5
from ibid.plugins import Processor, match
9
from ibid.plugins import Processor, match
14
6
from ibid.config import Option
10
from ibid.config import Option
15
11
from ibid.utils import ibid_version
16
7
12
17
8
help = {'google': u'Retrieves results from Google and Google Calculator.'}
13
help = {'google': u'Retrieves results from Google and Google Calculator.'}
18
9
14
19
10
user_agent = 'Mozilla/5.0'
15
user_agent = 'Mozilla/5.0'
20
11
16
21
12
class Search(Processor):
17
class Search(Processor):
23
13
    u"""google [for] <term>"""
18
    u"""google [for] <term>
24
19
    gcalc <expression>
25
20
    gdefine <term>
26
21
    google cmp [for] <term> and <term>"""
27
14
    feature = 'google'
22
    feature = 'google'
28
15
23
38
16
    user_agent = Option('user_agent', 'HTTP user agent to present to Google', user_agent)
24
    api_key = Option('api_key', 'Your Google API Key (optional)', None)
39
17
25
    referrer = Option('referrer', 'The referrer string to use (API searches)', "http://ibid.omnia.za.net/")
40
18
    @match(r'^google\s+(?:(za)\s+)?(?:for\s+)?(.+?)$')
26
    user_agent = Option('user_agent', 'HTTP user agent to present to Google (for non-API searches)', user_agent)
41
19
    def search(self, event, country, query):
27
42
20
        url = 'http://www.google.com/search?num=3&q=%s' % quote(query)
28
    google_api_url = "http://ajax.googleapis.com/ajax/services/search/web?v=1.0&q=%s"
43
21
        if country:
29
    google_scrape_url = "http://www.google.com/search?num=1&q=%s"
44
22
            url = url + '&meta=cr%%3Dcountry%s' % country.upper()
30
45
23
31
    def _google_api_search(self, query, resultsize="large"):
46
24
        f = urlopen(Request(url, headers={'user-agent': self.user_agent}))
32
        url = self.google_api_url % quote(query)
47
33
        url += "&rsz=%s" % resultsize
48
34
        if self.api_key:
49
35
            url += '&key=%s' % quote(key)
50
36
        req = Request(url, headers={
51
37
            'user-agent': "Ibid/%s" % ibid_version() or "dev",
52
38
            'referrer': self.referrer,
53
39
        })
54
40
        f = urlopen(req)
55
41
        result = f.readlines()
56
42
        f.close()
57
43
        result = "".join(result)
58
44
        result = simplejson.loads(result)
59
45
        return result
60
46
61
47
    def _google_scrape_search(self, query):
62
48
        f = urlopen(Request(self.google_scrape_url % quote(query), headers={'user-agent': self.user_agent}))
63
25
        soup = BeautifulSoup(f.read())
49
        soup = BeautifulSoup(f.read())
64
26
        f.close()
50
        f.close()
66
27
51
        return soup
67
52
68
53
    @match(r'^google\s+(?:for\s+)?(.+?)$')
69
54
    def search(self, event, query):
70
55
71
56
        # Clashing regexs:
72
57
        if self.compare.im_func.pattern.match(event.message):
73
58
            return
74
59
75
60
        items = self._google_api_search(query)
76
28
        results = []
61
        results = []
86
29
        items = soup.findAll('li')[:10]
62
        for item in items["responseData"]["results"]:
87
30
        for item in items:
63
88
31
            try:
64
            title = item["titleNoFormatting"]
89
32
                url = item.a['href']
65
90
33
                title = u''.join([e.string for e in item.a.contents])
66
            replace = lambda match: unichr(int(match.group(1)))
91
34
                results.append(u'"%s" %s' % (title, url))
67
            title = re.sub("&#(\d+);", replace, title)
92
35
            except Exception:
68
93
36
                pass
69
            replace = lambda match: unichr(htmlentitydefs.name2codepoint[match.group(1)])
94
37
70
            title = re.sub("&(\w+);", replace, title)
95
71
96
72
            results.append(u'"%s" %s' % (title, item["unescapedUrl"]))
97
38
        event.addresponse(u', '.join(results))
73
        event.addresponse(u', '.join(results))
98
39
74
99
40
class Calc(Processor):
100
41
    u"""gcalc <expression>"""
101
42
    feature = 'google'
102
43
103
44
    user_agent = Option('user_agent', 'HTTP user agent to present to Google', user_agent)
104
45
105
46
    @match(r'^gcalc\s+(.+)$')
75
    @match(r'^gcalc\s+(.+)$')
106
47
    def calc(self, event, expression):
76
    def calc(self, event, expression):
110
48
        f = urlopen(Request('http://www.google.com/search?num=1&q=%s' % quote(expression), headers={'user-agent': self.user_agent}))
77
111
49
        soup = BeautifulSoup(f.read())
78
        soup = self._google_scrape_search(expression)
109
50
        f.close()
112
51
79
113
52
        font = soup.find('font', size='+1')
80
        font = soup.find('font', size='+1')
114
53
        if not font:
81
        if not font:
115
@@ -55,51 +83,25 @@
116
55
        else:
83
        else:
117
56
            event.addresponse(font.b.string)
84
            event.addresponse(font.b.string)
118
57
85
119
58
class Define(Processor):
120
59
    u"""gdefine <term>"""
121
60
    feature = 'google'
122
61
123
62
    user_agent = Option('user_agent', 'HTTP user agent to present to Google', user_agent)
124
63
125
64
    @match(r'^gdefine\s+(.+)$')
86
    @match(r'^gdefine\s+(.+)$')
126
65
    def define(self, event, term):
87
    def define(self, event, term):
130
66
        f = urlopen(Request('http://www.google.com/search?num=1&q=define:%s' % quote(term), headers={'user-agent': self.user_agent}))
88
131
67
        soup = BeautifulSoup(f.read())
89
        soup = self._google_scrape_search("define:%s" % term)
129
68
        f.close()
132
69
90
133
70
        definitions = []
91
        definitions = []
134
71
        for li in soup.findAll('li'):
92
        for li in soup.findAll('li'):
136
72
            definitions.append('"%s"' % li.contents[0].strip())
93
            definitions.append(li.contents[0].strip())
137
73
94
138
74
        if definitions:
95
        if definitions:
140
75
            event.addresponse(', '.join(definitions))
96
            event.addresponse(u' :: '.join(definitions))
141
76
        else:
97
        else:
142
77
            event.addresponse(u"Are you making up words again?")
98
            event.addresponse(u"Are you making up words again?")
143
78
99
144
79
class Compare(Processor):
145
80
    u"""google cmp [for] <term> and <term>"""
146
81
    feature = 'google'
147
82
148
83
    user_agent = Option('user_agent', 'HTTP user agent to present to Google', user_agent)
149
84
150
85
151
86
    def results(self, term):
152
87
        f = urlopen(Request('http://www.google.com/search?num=1&q=%s' % quote(term), headers={'user-agent': self.user_agent}))
153
88
        soup = BeautifulSoup(f.read())
154
89
        f.close()
155
90
156
91
        noresults = soup.findAll('div', attrs={'class': 'med'})
157
92
        if noresults and len(noresults) > 1 and noresults[1].find('did not match any documents') != -1:
158
93
            return 0
159
94
        else:
160
95
            results = soup.find('div', id='prs').nextSibling.contents[5].string.replace(',', '')
161
96
            if results:
162
97
                return int(results)
163
98
164
99
    @match(r'^google\s+cmp\s+(?:for\s+)?(.+?)\s+and\s+(.+?)$')
100
    @match(r'^google\s+cmp\s+(?:for\s+)?(.+?)\s+and\s+(.+?)$')
165
100
    def compare(self, event, term1, term2):
101
    def compare(self, event, term1, term2):
170
101
        count1 = self.results(term1)
102
        count1 = int(self._google_api_search(term1, "small")["responseData"]["cursor"]["estimatedResultCount"])
171
102
        count2 = self.results(term2)
103
        count2 = int(self._google_api_search(term2, "small")["responseData"]["cursor"]["estimatedResultCount"])
172
103
        event.addresponse(u'%s wins with %s hits, %s had %s hits' % (count1 > count2 and term1 or term2, count1 > count2 and count1 or count2, count1 > count2 and term2 or term1, count1 > count2 and count2 or count1))
104
        event.addresponse(u'%s wins with %i hits, %s had %i hits' % 
173
104
105
            (count1 > count2 and (term1, count1, term2, count2) or (term2, count2, term1, count1))
174
106
        )
175
105
# vi: set et sta sw=4 ts=4:
107
# vi: set et sta sw=4 ts=4:
176
106
108
177
=== modified file 'ibid/plugins/misc.py'
178
--- ibid/plugins/misc.py	2009-03-02 09:21:35 +0000
179
+++ ibid/plugins/misc.py	2009-03-03 22:52:47 +0000
180
@@ -1,9 +1,8 @@
181
1
from time import sleep
1
from time import sleep
182
2
2
183
3
from pkg_resources import resource_exists, resource_string
184
4
185
5
from ibid.plugins import Processor, match
3
from ibid.plugins import Processor, match
186
6
from ibid.config import IntOption
4
from ibid.config import IntOption
187
5
from ibid.utils import ibid_version
188
7
6
189
8
help = {}
7
help = {}
190
9
8
191
@@ -41,8 +40,6 @@
192
41
            self.pot.append(event.sender['nick'])
40
            self.pot.append(event.sender['nick'])
193
42
            event.addresponse(True)
41
            event.addresponse(True)
194
43
42
195
44
version = resource_exists(__name__, '../.version') and resource_string(__name__, '../.version') or None
196
45
197
46
help['version'] = u"Show the Ibid version currently running"
43
help['version'] = u"Show the Ibid version currently running"
198
47
class Version(Processor):
44
class Version(Processor):
199
48
    u"""version"""
45
    u"""version"""
200
@@ -50,7 +47,7 @@
201
50
47
202
51
    @match(r'^version$')
48
    @match(r'^version$')
203
52
    def show_version(self, event):
49
    def show_version(self, event):
205
53
        event.addresponse(version and u"I am version %s" % version or u"I don't know what version I am :-(")
50
        event.addresponse(ibid_version() and u"I am version %s" % ibid_version() or u"I don't know what version I am :-(")
206
54
51
207
55
help['dvorak'] = u"Makes text typed on a QWERTY keyboard as if it was Dvorak work, and vice-versa"
52
help['dvorak'] = u"Makes text typed on a QWERTY keyboard as if it was Dvorak work, and vice-versa"
208
56
class Dvorak(Processor):
53
class Dvorak(Processor):
209
57
54
210
=== modified file 'ibid/utils.py'
211
--- ibid/utils.py	2009-03-01 19:58:06 +0000
212
+++ ibid/utils.py	2009-03-03 22:52:47 +0000
213
@@ -1,6 +1,7 @@
214
1
from htmlentitydefs import name2codepoint
1
from htmlentitydefs import name2codepoint
215
2
import os
2
import os
216
3
import os.path
3
import os.path
217
4
from pkg_resources import resource_exists, resource_string
218
4
import re
5
import re
219
5
6
220
6
def ago(delta, units=None):
7
def ago(delta, units=None):
221
@@ -43,3 +44,6 @@
222
43
	except:
44
	except:
223
44
		encoding = "ascii"
45
		encoding = "ascii"
224
45
	return unicode(output, encoding, errors)
46
	return unicode(output, encoding, errors)
225
47
226
48
def ibid_version():
227
49
	return resource_exists(__name__, '.version') and resource_string(__name__, '.version').strip() or None
Reviewer	Date Requested	Status
Jonathan Hitchcock		Approve on 2009-03-05
Michael Gorven	2009-03-03	Approve on 2009-03-05
Review via email: mp+4120@code.launchpad.net