1
=== modified file 'ibid/config.ini'
2
--- ibid/config.ini	2009-03-17 07:19:20 +0000
3
+++ ibid/config.ini	2009-03-25 10:35:11 +0000
4
@@ -69,6 +69,9 @@
5
69
        source = atrum
69
        source = atrum
6
70
        channel = "#ibid"
70
        channel = "#ibid"
7
71
        server = localhost
71
        server = localhost
8
72
    [[url]]
9
73
        delicious_username = ibidtest
10
74
        delicious_password = a123456
11
72
75
12
73
[databases]
76
[databases]
13
74
    ibid = sqlite:///ibid.db
77
    ibid = sqlite:///ibid.db
14
75
78
15
=== modified file 'ibid/plugins/url.py'
16
--- ibid/plugins/url.py	2009-03-08 13:16:28 +0000
17
+++ ibid/plugins/url.py	2009-03-25 10:35:11 +0000
18
@@ -1,6 +1,7 @@
19
1
from datetime import datetime
1
from datetime import datetime
20
2
from urllib import urlencode
2
from urllib import urlencode
22
3
from urllib2 import urlopen, HTTPRedirectHandler, build_opener, HTTPError
3
from urllib2 import urlopen, HTTPRedirectHandler, build_opener, HTTPError, HTTPBasicAuthHandler, install_opener
23
4
import logging
24
4
import re
5
import re
25
5
6
26
6
from sqlalchemy import Column, Integer, Unicode, DateTime, UnicodeText, ForeignKey, Table
7
from sqlalchemy import Column, Integer, Unicode, DateTime, UnicodeText, ForeignKey, Table
27
@@ -9,8 +10,11 @@
28
9
from ibid.plugins import Processor, match, handler
10
from ibid.plugins import Processor, match, handler
29
10
from ibid.config import Option
11
from ibid.config import Option
30
11
from ibid.models import Base
12
from ibid.models import Base
33
12
13
from ibid.utils  import get_html_parse_tree
34
13
help = {'url': u'Captures URLs seen in channel, and shortens and lengthens URLs'}
14
35
15
help = {'url': u'Captures URLs seen in channel to database and/or to delicious, and shortens and lengthens URLs'}
36
16
37
17
log            = logging.getLogger('plugins.url')
38
14
18
39
15
class URL(Base):
19
class URL(Base):
40
16
    __table__ = Table('urls', Base.metadata,
20
    __table__ = Table('urls', Base.metadata,
41
@@ -27,10 +31,79 @@
42
27
        self.identity_id = identity_id
31
        self.identity_id = identity_id
43
28
        self.time = datetime.now()
32
        self.time = datetime.now()
44
29
33
45
34
class Delicious():
46
35
47
36
    at_re  = re.compile('@\S+?\.')
48
37
    ip_re  = re.compile('\.IP$')
49
38
50
39
    def add_post(self,username,password,event,url=None):
51
40
        "Posts a URL to delicious.com"
52
41
53
42
        date  = datetime.now()
54
43
        title = self._get_title(url)
55
44
56
45
        connection_body = event.sender['connection'].split('!')
57
46
        if len(connection_body) == 1:
58
47
            connection_body.append(event.sender['connection'])
59
48
60
49
        if self.ip_re.search(connection_body[1]) != None:
61
50
            connection_body[1] = ""
62
51
63
52
        if event.source == 'jabber':
64
53
            obfusc_conn = ""
65
54
            obfusc_chan = event.channel.replace('@', '^')
66
55
        else:
67
56
            obfusc_conn = self.at_re.sub('^', connection_body[1])
68
57
            obfusc_chan = self.at_re.sub('^', event.channel)
69
58
70
59
71
60
        tags = event.sender['nick'] + " " + obfusc_conn + " " + obfusc_chan \
72
61
               +  " " + event.source
73
62
74
63
        data = {
75
64
            'url' : url,
76
65
            'description' : title,
77
66
            'tags' : tags,
78
67
            'replace' : u"yes",
79
68
            'dt' : date,
80
69
            'extended' : event.message_raw
81
70
            }
82
71
83
72
        self._set_auth(username,password)
84
73
        posturl = "https://api.del.icio.us/v1/posts/add?" \
85
74
                  + urlencode(data, 'utf-8')
86
75
        resp = urlopen(posturl).read()
87
76
        if 'done' in resp:
88
77
            log.info(u"Successfully posted url %s to delicious, posted in channel %s by nick %s at time %s", \
89
78
                     url, event.channel, event.sender['nick'], date)
90
79
        else:
91
80
            log.error(u"Error posting url %s to delicious: %s", url, response)
92
81
93
82
    def _get_title(self,url):
94
83
        "Gets the title of a page"
95
84
        try:
96
85
            headers = {'User-Agent': 'Mozilla/5.0'}
97
86
            etree = get_html_parse_tree(url, None, headers, 'etree')
98
87
            title = etree.findtext("head/title")
99
88
            return title
100
89
        except Exception, e:
101
90
            log.exception(u"Delicious logic - error determining the title for url %s: %s", url, e.message)
102
91
            return url
103
92
104
93
    def _set_auth(self,username,password):
105
94
        "Provides HTTP authentication on username and password"
106
95
        auth_handler = HTTPBasicAuthHandler()
107
96
        auth_handler.add_password('del.icio.us API', 'https://api.del.icio.us', username, password)
108
97
        opener = build_opener(auth_handler)
109
98
        install_opener(opener)
110
99
111
30
class Grab(Processor):
100
class Grab(Processor):
112
31
101
113
32
    addressed = False
102
    addressed = False
114
33
    processed = True
103
    processed = True
115
104
    username  = Option('delicious_username', 'delicious account name')
116
105
    password  = Option('delicious_password', 'delicious account password')
117
106
    delicious = Delicious()
118
34
107
119
35
    @match(r'((?:\S+://|(?:www|ftp)\.)\S+|\S+\.(?:com|org|net|za)\S*)')
108
    @match(r'((?:\S+://|(?:www|ftp)\.)\S+|\S+\.(?:com|org|net|za)\S*)')
120
36
    def grab(self, event, url):
109
    def grab(self, event, url):
121
@@ -46,6 +119,9 @@
122
46
        session.flush()
119
        session.flush()
123
47
        session.close()
120
        session.close()
124
48
121
125
122
        if self.username != None:
126
123
            self.delicious.add_post(self.username, self.password, event, url)
127
124
128
49
class Shorten(Processor):
125
class Shorten(Processor):
129
50
    u"""shorten <url>"""
126
    u"""shorten <url>"""
130
51
    feature = 'url'
127
    feature = 'url'
131
@@ -75,7 +151,7 @@
132
75
151
133
76
    def setup(self):
152
    def setup(self):
134
77
        self.lengthen.im_func.pattern = re.compile(r'^((?:%s)\S+)$' % '|'.join([re.escape(service) for service in self.services]), re.I)
153
        self.lengthen.im_func.pattern = re.compile(r'^((?:%s)\S+)$' % '|'.join([re.escape(service) for service in self.services]), re.I)
136
78
    
154
137
79
    @handler
155
    @handler
138
80
    def lengthen(self, event, url):
156
    def lengthen(self, event, url):
139
81
        opener = build_opener(NullRedirect())
157
        opener = build_opener(NullRedirect())
140
@@ -88,5 +164,5 @@
141
88
164
142
89
        f.close()
165
        f.close()
143
90
        event.addresponse(u"No redirect")
166
        event.addresponse(u"No redirect")
145
91
                
167
146
92
# vi: set et sta sw=4 ts=4:
168
# vi: set et sta sw=4 ts=4:
Status:	Merged
Approved by:	Stefano Rivera on 2009-03-25
Approved revision:	582
Merged at revision:	591
Proposed branch:	lp:~jonathanjgster/ibid/jjg
Merge into:	lp:~ibid-core/ibid/old-trunk-pack-0.92
Diff against target:	None lines
To merge this branch:	bzr merge lp:~jonathanjgster/ibid/jjg
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michael Gorven			Approve on 2009-03-25
Jonathan Hitchcock			Approve on 2009-03-25
Stefano Rivera			Approve on 2009-03-25
Review via email: mp+4880@code.launchpad.net