1
=== modified file 'ibid/plugins/url.py'
2
--- ibid/plugins/url.py	2009-03-25 10:35:11 +0000
3
+++ ibid/plugins/url.py	2009-03-25 15:45:16 +0000
4
@@ -34,7 +34,8 @@
5
34
class Delicious():
34
class Delicious():
6
35
35
7
36
    at_re  = re.compile('@\S+?\.')
36
    at_re  = re.compile('@\S+?\.')
9
37
    ip_re  = re.compile('\.IP$')
37
    ip_re  = re.compile('\.IP$|unaffiliated')
10
38
    con_re = re.compile('!n=|!')
11
38
39
12
39
    def add_post(self,username,password,event,url=None):
40
    def add_post(self,username,password,event,url=None):
13
40
        "Posts a URL to delicious.com"
41
        "Posts a URL to delicious.com"
14
@@ -42,14 +43,14 @@
15
42
        date  = datetime.now()
43
        date  = datetime.now()
16
43
        title = self._get_title(url)
44
        title = self._get_title(url)
17
44
45
19
45
        connection_body = event.sender['connection'].split('!')
46
        connection_body = self.con_re.split(event.sender['connection'])
20
46
        if len(connection_body) == 1:
47
        if len(connection_body) == 1:
21
47
            connection_body.append(event.sender['connection'])
48
            connection_body.append(event.sender['connection'])
22
48
49
23
49
        if self.ip_re.search(connection_body[1]) != None:
50
        if self.ip_re.search(connection_body[1]) != None:
24
50
            connection_body[1] = ""
51
            connection_body[1] = ""
25
51
52
27
52
        if event.source == 'jabber':
53
        if ibid.sources[event.source].type == 'jabber':
28
53
            obfusc_conn = ""
54
            obfusc_conn = ""
29
54
            obfusc_chan = event.channel.replace('@', '^')
55
            obfusc_chan = event.channel.replace('@', '^')
30
55
        else:
56
        else:
31
@@ -77,7 +78,7 @@
32
77
            log.info(u"Successfully posted url %s to delicious, posted in channel %s by nick %s at time %s", \
78
            log.info(u"Successfully posted url %s to delicious, posted in channel %s by nick %s at time %s", \
33
78
                     url, event.channel, event.sender['nick'], date)
79
                     url, event.channel, event.sender['nick'], date)
34
79
        else:
80
        else:
36
80
            log.error(u"Error posting url %s to delicious: %s", url, response)
81
            log.error(u"Error posting url %s to delicious: %s", url, resp)
37
81
82
38
82
    def _get_title(self,url):
83
    def _get_title(self,url):
39
83
        "Gets the title of a page"
84
        "Gets the title of a page"
40
@@ -86,8 +87,8 @@
41
86
            etree = get_html_parse_tree(url, None, headers, 'etree')
87
            etree = get_html_parse_tree(url, None, headers, 'etree')
42
87
            title = etree.findtext("head/title")
88
            title = etree.findtext("head/title")
43
88
            return title
89
            return title
46
89
        except Exception, e:
90
        except Exception:
47
90
            log.exception(u"Delicious logic - error determining the title for url %s: %s", url, e.message)
91
            log.exception(u"Delicious logic - error determining the title for url %s", url)
48
91
            return url
92
            return url
49
92
93
50
93
    def _set_auth(self,username,password):
94
    def _set_auth(self,username,password):
Status:	Merged
Approved by:	Stefano Rivera on 2009-04-15
Approved revision:	583
Merged at revision:	593
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	Date Requested	Status
Stefano Rivera		Approve on 2009-04-15
Michael Gorven		Approve on 2009-03-26
Jonathan Hitchcock	2009-03-25	Approve on 2009-03-26
Review via email: mp+4911@code.launchpad.net