1
=== modified file 'ibid/plugins/dict.py'
2
--- ibid/plugins/dict.py	2009-03-18 11:36:41 +0000
3
+++ ibid/plugins/dict.py	2009-03-20 20:29:56 +0000
4
@@ -1,3 +1,5 @@
5
1
from socket import error
6
2
7
1
from dictclient import Connection
3
from dictclient import Connection
8
2
4
9
3
from ibid.plugins import Processor, match
5
from ibid.plugins import Processor, match
10
@@ -6,7 +8,8 @@
11
6
help = {'dict': u'Defines words and checks spellings.'}
8
help = {'dict': u'Defines words and checks spellings.'}
12
7
9
13
8
class Dict(Processor):
10
class Dict(Processor):
15
9
    u"""(spell|define) <word> [using (<dictionary>|<strategy>)]
11
    u"""spell <word> [using <dictionary>]
16
12
    define <word> [using <strategy>]
17
10
    (dictionaries|strategies)
13
    (dictionaries|strategies)
18
11
    (dictionary|strategy) <name>"""
14
    (dictionary|strategy) <name>"""
19
12
    feature = 'dict'
15
    feature = 'dict'
20
@@ -14,48 +17,84 @@
21
14
    server = Option('server', 'Dictionary server hostname', 'localhost')
17
    server = Option('server', 'Dictionary server hostname', 'localhost')
22
15
    port = IntOption('port', 'Dictionary server port number', 2628)
18
    port = IntOption('port', 'Dictionary server port number', 2628)
23
16
19
24
17
    def setup(self):
25
18
        self.connection = Connection(self.server, self.port)
26
19
        self.dictionaries = self.connection.getdbdescs()
27
20
        self.strategies = self.connection.getstratdescs()
28
21
29
22
    @match(r'^define\s+(.+?)(?:\s+using\s+(.+))?$')
20
    @match(r'^define\s+(.+?)(?:\s+using\s+(.+))?$')
30
23
    def define(self, event, word, dictionary):
21
    def define(self, event, word, dictionary):
33
24
        definitions = self.connection.define(dictionary or '*', word)
22
        try:
34
25
        event.addresponse(u'%s', u', '.join([d.getdefstr() for d in definitions]))
23
            connection = Connection(self.server, self.port)
35
24
            definitions = connection.define(dictionary or '*', word)
36
25
            if definitions:
37
26
                event.addresponse(u'%s', u', '.join([d.getdefstr() for d in definitions]))
38
27
            else:
39
28
                event.addresponse(u"I don't have a definition for that. Is it even a word?")
40
29
        except error:
41
30
            event.addresponse(u'Unable to connect to dictionary server')
42
31
            raise
43
32
        except Exception, e:
44
33
            event.addresponse(u'The dictionary complained: %s' % unicode(e))
45
26
34
46
27
    @match(r'^spell\s+(.+?)(?:\s+using\s+(.+))?$')
35
    @match(r'^spell\s+(.+?)(?:\s+using\s+(.+))?$')
47
28
    def handle_spell(self, event, word, strategy):
36
    def handle_spell(self, event, word, strategy):
57
29
        correct = self.connection.match('*', 'exact', word)
37
        try:
58
30
        if correct:
38
            connection = Connection(self.server, self.port)
59
31
            event.addresponse(u'That seems correct. Carry on')
39
            correct = connection.match('*', 'exact', word)
60
32
            return
40
            if correct:
61
33
        suggestions = self.connection.match('*', strategy or 'lev', word)
41
                event.addresponse(u'That seems correct. Carry on')
62
34
        if suggestions:
42
                return
63
35
            event.addresponse(u'Suggestions: %s', u', '.join([d.getword() for d in suggestions]))
43
            suggestions = connection.match('*', strategy or 'lev', word)
64
36
        else:
44
            if suggestions:
65
37
            event.addresponse(u"That doesn't seem correct, but I can't find anything to suggest")
45
                event.addresponse(u'Suggestions: %s', u', '.join([d.getword() for d in suggestions]))
66
46
            else:
67
47
                event.addresponse(u"That doesn't seem correct, but I can't find anything to suggest")
68
48
        except error:
69
49
            event.addresponse(u'Unable to connect to dictionary server')
70
50
            raise
71
51
        except Exception, e:
72
52
            event.addresponse(u'The dictionary complained: %s' % unicode(e))
73
38
53
74
39
    @match(r'^dictionaries$')
54
    @match(r'^dictionaries$')
75
40
    def handle_dictionaries(self, event):
55
    def handle_dictionaries(self, event):
77
41
        event.addresponse(u'Dictionaries: %s', u', '.join(sorted(self.dictionaries.keys())))
56
        try:
78
57
            connection = Connection(self.server, self.port)
79
58
            dictionaries = connection.getdbdescs()
80
59
            event.addresponse(u'Dictionaries: %s', u', '.join(sorted(dictionaries.keys())))
81
60
        except error:
82
61
            event.addresponse(u'Unable to connect to dictionary server')
83
62
            raise
84
42
63
85
43
    @match(r'^strater?gies$')
64
    @match(r'^strater?gies$')
86
44
    def handle_strategies(self, event):
65
    def handle_strategies(self, event):
88
45
        event.addresponse(u'Strategies: %s', u', '.join(sorted(self.strategies.keys())))
66
        try:
89
67
            connection = Connection(self.server, self.port)
90
68
            strategies = connection.getstratdescs()
91
69
            event.addresponse(u'Strategies: %s', u', '.join(sorted(strategies.keys())))
92
70
        except error:
93
71
            event.addresponse(u'Unable to connect to dictionary server')
94
72
            raise
95
46
73
96
47
    @match(r'^dictionary\s+(.+?)$')
74
    @match(r'^dictionary\s+(.+?)$')
97
48
    def handle_dictionary(self, event, dictionary):
75
    def handle_dictionary(self, event, dictionary):
102
49
        if dictionary in self.dictionaries:
76
        try:
103
50
            event.addresponse(u'%s', self.dictionaries[dictionary])
77
            connection = Connection(self.server, self.port)
104
51
        else:
78
            dictionaries = connection.getdbdescs()
105
52
            event.addresponse(u"I don't have that dictionary")
79
            if dictionary in dictionaries:
106
80
                event.addresponse(u'%s', dictionaries[dictionary])
107
81
            else:
108
82
                event.addresponse(u"I don't have that dictionary")
109
83
        except error:
110
84
            event.addresponse(u'Unable to connect to dictionary server')
111
85
            raise
112
53
86
113
54
    @match(r'^strater?gy\s+(.+?)$')
87
    @match(r'^strater?gy\s+(.+?)$')
114
55
    def handle_strategy(self, event, strategy):
88
    def handle_strategy(self, event, strategy):
119
56
        if strategy in self.strategies:
89
        try:
120
57
            event.addresponse(u'%s', self.strategies[strategy])
90
            connection = Connection(self.server, self.port)
121
58
        else:
91
            strategies = connection.getstratdescs()
122
59
            event.addresponse(u"I don't have that strategy")
92
            if strategy in strategies:
123
93
                event.addresponse(u'%s', strategies[strategy])
124
94
            else:
125
95
                event.addresponse(u"I don't have that strategy")
126
96
        except error:
127
97
            event.addresponse(u'Unable to connect to dictionary server')
128
98
            raise
129
60
99
130
61
# vi: set et sta sw=4 ts=4:
100
# vi: set et sta sw=4 ts=4:
Reviewer	Date Requested	Status
Jonathan Hitchcock	2009-03-20	Approve on 2009-03-22
Michael Gorven		Approve on 2009-03-22
Review via email: mp+4733@code.launchpad.net