← Back to branch summary

~stefanor/ibid/timeout-344882

« back to all changes in this revision

Viewing changes to ibid/plugins/url.py

  • Committer: Stefano Rivera
  • Date: 2009-04-15 17:29:45 UTC
  • mfrom: (573.2.10 jjg)
  • Revision ID: stefano@rivera.za.net-20090415172945-knk9kks67r2fte8b
Merged https://code.edge.launchpad.net/~jonathanjgster/ibid/jjg/+merge/4911

Miscellaneous bug fixes to url plugin

Show diffs side-by-side

added added

removed removed

Lines of Context:
ibid/plugins/url.py
33
33
 
34
34
class Delicious():
35
35
 
36
 
    at_re = re.compile('@\S+?\.')
37
 
    ip_re = re.compile('\.IP$')
 
36
    at_re  = re.compile(r'@\S+?\.')
 
37
    ip_re  = re.compile(r'\.IP$|unaffiliated')
 
38
    con_re = re.compile(r'!n=|!')
38
39
 
39
40
    def add_post(self, username, password, event, url=None):
40
41
        "Posts a URL to delicious.com"
42
43
        date  = datetime.now()
43
44
        title = self._get_title(url)
44
45
 
45
 
        connection_body = event.sender['connection'].split('!')
 
46
        connection_body = self.con_re.split(event.sender['connection'])
46
47
        if len(connection_body) == 1:
47
48
            connection_body.append(event.sender['connection'])
48
49
 
75
76
            log.info(u"Successfully posted url %s to delicious, posted in channel %s by nick %s at time %s",
76
77
                     url, event.channel, event.sender['nick'], date)
77
78
        else:
78
 
            log.error(u"Error posting url %s to delicious: %s", url, response)
 
79
            log.error(u"Error posting url %s to delicious: %s", url, resp)
79
80
 
80
81
    def _get_title(self, url):
81
82
        "Gets the title of a page"
84
85
            etree = get_html_parse_tree(url, None, headers, 'etree')
85
86
            title = etree.findtext('head/title')
86
87
            return title
87
 
        except Exception, e:
 
88
        except Exception:
88
89
            log.exception(u"Delicious logic - error determining the title for url %s", url)
89
90
            return url
90
91