1
=== modified file 'INSTALL'
2
--- INSTALL	2009-02-24 16:03:17 +0000
3
+++ INSTALL	2009-03-07 13:40:14 +0000
4
@@ -1,32 +1,26 @@
5
1
Installation Instructions for Debian/Ubuntu Systems:
1
Installation Instructions for Debian/Ubuntu Systems:
6
2
2
7
3
Add the Ibid PPA to your APT sources:
3
Add the Ibid PPA to your APT sources:
9
4
# echo deb http://ppa.launchpad.net/ibid-dev/ppa/ubuntu `lsb_release -c | cut -f2` main > /etc/apt/sources.list.d/ibid
4
# echo deb http://ppa.launchpad.net/ibid-core/ppa/ubuntu `lsb_release -c | cut -f2` main > /etc/apt/sources.list.d/ibid.list
10
5
# apt-key adv --recv-keys --keyserver keyserver.ubuntu.com c2d0f8531bba37930c0d85e3d59f9e8dfd1c44ba
11
6
# aptitude update
12
5
7
13
6
Install required modules:
8
Install required modules:
15
7
# apt-get install python-virtualenv python-soappy python-twisted \
9
# aptitude install python-virtualenv python-soappy python-twisted \
16
8
   python-configobj python-sqllite2 python-feedparser \
10
   python-configobj python-sqllite2 python-feedparser \
18
9
   python-httplib2 python-beautifulsoup python-dictclient \
11
   python-httplib2 python-html5lib python-dictclient \
19
10
   python-imdbpy python-dns python-simplejson \
12
   python-imdbpy python-dns python-simplejson \
21
11
   python-jinja pysilc python-pinder
13
   python-jinja python-pysilc python-pinder
22
12
14
23
13
Switch to the user ibid will be running as.
15
Switch to the user ibid will be running as.
33
14
Set up a virtual Python environment
16
$ export PYTHONPATH=.
25
15
(this will create a directory called ibid):
26
16
$ virtualenv ibid
27
17
$ source ibid/bin/activate
28
18
29
19
Change directory to where you extracted Ibid.
30
20
31
21
Set up any dependancies:
32
22
$ ./setup.py install
34
23
17
35
24
Set up your bot:
18
Set up your bot:
37
25
$ ibid-setup
19
$ scripts/ibid-setup
38
26
$ mkdir logs
20
$ mkdir logs
39
27
21
40
28
Run your bot:
22
Run your bot:
42
29
$ ibid
23
$ scripts/ibid
43
30
24
44
31
Other things we recommend:
25
Other things we recommend:
45
32
* Install a dictd on localhost for the dict plugin (debian/ubuntu package "dictd")
26
* Install a dictd on localhost for the dict plugin (debian/ubuntu package "dictd")
46
33
27
47
=== modified file 'ibid/plugins/lookup.py'
48
--- ibid/plugins/lookup.py	2009-03-02 09:21:35 +0000
49
+++ ibid/plugins/lookup.py	2009-03-07 13:40:04 +0000
50
@@ -3,10 +3,11 @@
51
3
from time import time
3
from time import time
52
4
from datetime import datetime
4
from datetime import datetime
53
5
from simplejson import loads
5
from simplejson import loads
54
6
import cgi
55
6
import re
7
import re
56
7
8
57
8
import feedparser
9
import feedparser
59
9
from BeautifulSoup import BeautifulSoup
10
from html5lib import HTMLParser, treebuilders
60
10
11
61
11
from ibid.plugins import Processor, match, handler
12
from ibid.plugins import Processor, match, handler
62
12
from ibid.config import Option
13
from ibid.config import Option
63
@@ -14,6 +15,25 @@
64
14
15
65
15
help = {}
16
help = {}
66
16
17
67
18
def get_soup(url, data=None, headers={}):
68
19
    "Request a URL and create a BeautifulSoup parse tree from it"
69
20
70
21
    req = Request(url, data, headers)
71
22
    f = urlopen(req)
72
23
    data = f.read()
73
24
    f.close()
74
25
75
26
    encoding = None
76
27
    contentType = f.headers.get('content-type')
77
28
    if contentType:
78
29
        (mediaType, params) = cgi.parse_header(contentType)
79
30
        encoding = params.get('charset')
80
31
81
32
    treebuilder = treebuilders.getTreeBuilder("beautifulsoup")
82
33
    parser = HTMLParser(tree=treebuilder)
83
34
84
35
    return parser.parse(data, encoding = encoding)
85
36
86
17
help['bash'] = u'Retrieve quotes from bash.org.'
37
help['bash'] = u'Retrieve quotes from bash.org.'
87
18
class Bash(Processor):
38
class Bash(Processor):
88
19
    u"bash[.org] (random|<number>)"
39
    u"bash[.org] (random|<number>)"
89
@@ -22,15 +42,13 @@
90
22
42
91
23
    @match(r'^bash(?:\.org)?\s+(random|\d+)$')
43
    @match(r'^bash(?:\.org)?\s+(random|\d+)$')
92
24
    def bash(self, event, quote):
44
    def bash(self, event, quote):
96
25
        f = urlopen('http://bash.org/?%s' % quote.lower())
45
        soup = get_soup('http://bash.org/?%s' % quote.lower())
94
26
        soup = BeautifulSoup(f.read(), convertEntities=BeautifulSoup.HTML_ENTITIES)
95
27
        f.close()
97
28
46
98
29
        if quote.lower() == "random":
47
        if quote.lower() == "random":
100
30
            number = u"".join(soup.find('p', attrs={'class': 'quote'}).find('b').contents)
48
            number = u"".join(soup.find('p', 'quote').find('b').contents)
101
31
            event.addresponse(u"%s:" % number)
49
            event.addresponse(u"%s:" % number)
102
32
50
104
33
        quote = soup.find('p', attrs={'class': 'qt'})
51
        quote = soup.find('p', 'qt')
105
34
        if not quote:
52
        if not quote:
106
35
            event.addresponse(u"There's no such quote, but if you keep talking like that maybe there will be.")
53
            event.addresponse(u"There's no such quote, but if you keep talking like that maybe there will be.")
107
36
        else:
54
        else:
108
@@ -100,12 +118,14 @@
109
100
    feature = "fml"
118
    feature = "fml"
110
101
119
111
102
    def remote_get(self, id):
120
    def remote_get(self, id):
115
103
        f = urlopen('http://www.fmylife.com/' + str(id))
121
        soup = get_soup('http://www.fmylife.com/' + str(id))
113
104
        soup = BeautifulSoup(f.read())
114
105
        f.close()
116
106
122
117
107
        quote = soup.find('div', id='wrapper').div.p
123
        quote = soup.find('div', id='wrapper').div.p
119
108
        return quote and u'"%s"' % (quote.contents[0],) or None
124
        if quote:
120
125
            url = u"http://www.fmylife.com" + quote.find('a', 'fmllink')['href']
121
126
            quote = u"".join(tag.contents[0] for tag in quote.findAll(True))
122
127
123
128
            return u'%s: "%s"' % (url, quote)
124
109
129
125
110
    @match(r'^(?:fml\s+|http://www\.fmylife\.com/\S+/)(\d+|random)$')
130
    @match(r'^(?:fml\s+|http://www\.fmylife\.com/\S+/)(\d+|random)$')
126
111
    def fml(self, event, id):
131
    def fml(self, event, id):
127
@@ -170,14 +190,12 @@
128
170
    currencies = []
190
    currencies = []
129
171
191
130
172
    def _load_currencies(self):
192
    def _load_currencies(self):
135
173
        request = Request('http://www.xe.com/iso4217.php', '', self.headers)
193
        soup = get_soup('http://www.xe.com/iso4217.php', headers=self.headers)
132
174
        f = urlopen(request)
133
175
        soup = BeautifulSoup(f.read())
134
176
        f.close()
136
177
194
137
178
        self.currencies = []
195
        self.currencies = []
139
179
        for tr in soup.find('table', attrs={'class': 'tbl_main'}).table.findAll('tr'):
196
        for tr in soup.find('table', 'tbl_main').table.findAll('tr'):
140
180
            code, place = tr.findAll('td')
197
            code, place = tr.findAll('td')
141
198
            code = code.contents[0]
142
181
            place = ''.join(place.findAll(text=True))
199
            place = ''.join(place.findAll(text=True))
143
182
            place, name = place.find(',') != -1 and place.split(',', 1) or place.split(' ', 1)
200
            place, name = place.find(',') != -1 and place.split(',', 1) or place.split(' ', 1)
144
183
            self.currencies.append((code.string, place.strip(), name.strip()))
201
            self.currencies.append((code.string, place.strip(), name.strip()))
145
@@ -185,12 +203,9 @@
146
185
    @match(r'^(?:exchange|convert)\s+([0-9.]+)\s+(\S+)\s+(?:for|to|into)\s+(\S+)$')
203
    @match(r'^(?:exchange|convert)\s+([0-9.]+)\s+(\S+)\s+(?:for|to|into)\s+(\S+)$')
147
186
    def exchange(self, event, amount, frm, to):
204
    def exchange(self, event, amount, frm, to):
148
187
        data = {'Amount': amount, 'From': frm, 'To': to}
205
        data = {'Amount': amount, 'From': frm, 'To': to}
153
188
        request = Request('http://www.xe.com/ucc/convert.cgi', urlencode(data), self.headers)
206
        soup = get_soup('http://www.xe.com/ucc/convert.cgi', urlencode(data), self.headers)
150
189
        f = urlopen(request)
151
190
        soup = BeautifulSoup(f.read())
152
191
        f.close()
154
192
207
156
193
        event.addresponse(soup.findAll('span', attrs={'class': 'XEsmall'})[1].contents[0])
208
        event.addresponse(u" ".join(tag.contents[0] for tag in soup.findAll('h2', 'XE')))
157
194
209
158
195
    @match(r'^(?:currency|currencies)\s+for\s+(?:the\s+)?(.+)$')
210
    @match(r'^(?:currency|currencies)\s+for\s+(?:the\s+)?(.+)$')
159
196
    def currency(self, event, place):
211
    def currency(self, event, place):
160
@@ -238,9 +253,7 @@
161
238
        if place.lower() in self.places:
253
        if place.lower() in self.places:
162
239
            place = self.places[place.lower()]
254
            place = self.places[place.lower()]
163
240
255
167
241
        f = urlopen('http://m.wund.com/cgi-bin/findweather/getForecast?brand=mobile_metric&query=' + quote(place))
256
        soup = get_soup('http://m.wund.com/cgi-bin/findweather/getForecast?brand=mobile_metric&query=' + quote(place))
165
242
        soup = BeautifulSoup(f.read(), convertEntities=BeautifulSoup.HTML_ENTITIES)
166
243
        f.close()
168
244
257
169
245
        if soup.body.center and soup.body.center.b.string == 'Search not found:':
258
        if soup.body.center and soup.body.center.b.string == 'Search not found:':
170
246
            raise Weather.WeatherException(u'City not found')
259
            raise Weather.WeatherException(u'City not found')
171
@@ -257,7 +270,7 @@
172
257
        soup = self._get_page(place)
270
        soup = self._get_page(place)
173
258
        tds = soup.table.table.findAll('td')
271
        tds = soup.table.table.findAll('td')
174
259
272
176
260
        values = {'place': tds[0].findAll('b')[1].string, 'time': tds[0].findAll('b')[0].string}
273
        values = {'place': tds[0].findAll('b')[1].contents[0], 'time': tds[0].findAll('b')[0].contents[0]}
177
261
        for index, td in enumerate(tds[2::2]):
274
        for index, td in enumerate(tds[2::2]):
178
262
            values[self.labels[index]] = self._text(td)
275
            values[self.labels[index]] = self._text(td)
179
263
276
180
@@ -268,7 +281,7 @@
181
268
        forecasts = []
281
        forecasts = []
182
269
282
183
270
        for td in soup.findAll('table')[2].findAll('td', align='left'):
283
        for td in soup.findAll('table')[2].findAll('td', align='left'):
185
271
            day = td.b.string
284
            day = td.b.contents[0]
186
272
            forecast = td.contents[2]
285
            forecast = td.contents[2]
187
273
            forecasts.append('%s: %s' % (day, self._text(forecast)))
286
            forecasts.append('%s: %s' % (day, self._text(forecast)))
188
274
287
Reviewer	Date Requested	Status
Michael Gorven		Approve on 2009-03-10
Jonathan Hitchcock	2009-03-07	Approve on 2009-03-08
Review via email: mp+4267@code.launchpad.net