Merge lp:~stefanor/ibid/url-output-404159 into lp:~ibid-core/ibid/old-trunk-pack-0.92

[Stefano Rivera]

[Michael Gorven (mgorven)]

 review approve

review: Approve

[Jonathan Hitchcock (vhata)]

This is a tad ugly, isn't it? Do we need to do it for all of them?

[Stefano Rivera (stefanor)]

> This is a tad ugly, isn't it? Do we need to do it for all of them?

I call it consistent, but no it's not necessary for all of them.

[lp:~stefanor/ibid/url-output-404159]

726. By Stefano Rivera on 2009-08-20

Correctly grab the URLs we are now producing

727. By Stefano Rivera on 2009-08-20

Correctly grab lookup-style URLs too

728. By Stefano Rivera on 2009-08-20

Minor formatting tweaks

[Jonathan Hitchcock (vhata)]

<3 <>

review: Approve

=== modified file 'ibid/plugins/feeds.py'
--- ibid/plugins/feeds.py	2009-07-11 16:52:17 +0000
+++ ibid/plugins/feeds.py	2009-07-24 15:41:23 +0000
@@ -183,7 +183,7 @@
             else:
                 summary = article.content[0].value
 
-        event.addresponse(u'"%(title)s" %(link)s : %(summary)s', {
+        event.addresponse(u'"%(title)s" <%(link)s> %(summary)s', {
             'title': html2text_file(article.title, None).strip(),
             'link': article.link,
             'summary': summary,

=== modified file 'ibid/plugins/google.py'
--- ibid/plugins/google.py	2009-07-10 13:34:44 +0000
+++ ibid/plugins/google.py	2009-07-24 15:41:23 +0000
@@ -52,7 +52,7 @@
 
             title = item["titleNoFormatting"]
 
-            results.append(u'"%s" %s' % (decode_htmlentities(title), item["unescapedUrl"]))
+            results.append(u'%s <%s>' % (decode_htmlentities(title), item["unescapedUrl"]))
             
         if results:
             event.addresponse(u', '.join(results))
@@ -141,7 +141,7 @@
                 title = u''.join([e.string for e in item.a.contents])
                 if title.startswith("Image results for"):
                     continue
-                results.append(u'"%s" %s' % (decode_htmlentities(title), url))
+                results.append(u'%s <%s>' % (decode_htmlentities(title), url))
             except Exception:
                 pass
             if len(results) >= 8:

=== modified file 'ibid/plugins/lookup.py'
--- ibid/plugins/lookup.py	2009-07-18 08:09:39 +0000
+++ ibid/plugins/lookup.py	2009-07-24 15:41:23 +0000
@@ -168,7 +168,7 @@
             )
             text = item.find('text').text
 
-            return u'%s : %s' % (url, text)
+            return u'<%s>: %s' % (url, text)
 
     @match(r'^(?:fml\s+|http://www\.fmylife\.com/\S+/)(\d+|random|flop|top|last|love|money|kids|work|health|sex|miscellaneous)$')
     def fml(self, event, id):
@@ -249,11 +249,11 @@
 
         id, body = message
         if len(body) > 1:
-            event.addresponse(u'http://textsfromlastnight.com/view/%i :', id)
+            event.addresponse(u'<http://textsfromlastnight.com/view/%i>:', id)
             for line in body:
                 event.addresponse(line)
         else:
-            event.addresponse(u'http://textsfromlastnight.com/view/%(id)i : %(body)s', {
+            event.addresponse(u'<http://textsfromlastnight.com/view/%(id)i>: %(body)s', {
                 'id': id,
                 'body': body[0],
             })
@@ -327,7 +327,7 @@
                 return
 
         id, body = story
-        event.addresponse(u'%(url)sstory.php?id=%(id)i : %(body)s', {
+        event.addresponse(u'<%(url)sstory.php?id=%(id)i>: %(body)s', {
             'url': url,
             'id': id,
             'body': body,
@@ -404,7 +404,7 @@
     def latest(self, event, service_name, user):
         service = self.services[service_name.lower()]
         try:
-            event.addresponse(u'"%(text)s" %(ago)s ago, %(url)s', self.remote_latest(service, user))
+            event.addresponse(u'"%(text)s" %(ago)s ago, <%(url)s>', self.remote_latest(service, user))
         except HTTPError, e:
             if e.code in (401, 403):
                 event.addresponse(u"Sorry, %s's feed is private", user)
@@ -809,7 +809,7 @@
         message = u'Show: %(Show Name)s. Premiered: %(Premiered)s. ' \
                     u'Latest Episode: %(Latest Episode)s. Next Episode: %(Next Episode)s. ' \
                     u'Airtime: %(Airtime)s on %(Network)s. Genres: %(Genres)s. ' \
-                    u'Status: %(Status)s. - %(Show URL)s'
+                    u'Status: %(Status)s. <%(Show URL)s>'
                     
         if not retr_info:
             event.addresponse(u"I can't find anything out about '%s'", show)

=== modified file 'ibid/plugins/rfc.py'
--- ibid/plugins/rfc.py	2009-07-10 13:34:44 +0000
+++ ibid/plugins/rfc.py	2009-07-24 15:41:23 +0000
@@ -156,7 +156,7 @@
 
         number = int(number)
         if number in rfcs:
-            event.addresponse(u"%(record)s http://www.rfc-editor.org/rfc/rfc%(number)i.txt", {
+            event.addresponse(u"%(record)s <http://www.rfc-editor.org/rfc/rfc%(number)i.txt>", {
                 'record': rfcs[number].record,
                 'number': number,
             })

=== modified file 'ibid/plugins/trac.py'
--- ibid/plugins/trac.py	2009-07-09 14:50:37 +0000
+++ ibid/plugins/trac.py	2009-07-24 15:41:23 +0000
@@ -48,7 +48,7 @@
         if not ticket:
             raise Exception(u"No such ticket")
 
-        message = u'New %s in %s reported by %s: "%s" %sticket/%s' % (ticket.type, ticket.component, ticket.reporter, ticket.summary, self.url, ticket.id)
+        message = u'New %s in %s reported by %s: "%s" <%sticket/%s>' % (ticket.type, ticket.component, ticket.reporter, ticket.summary, self.url, ticket.id)
         ibid.dispatcher.send({'reply': message, 'source': self.source, 'target': self.channel})
         self.log.info(u'Ticket %s created', id)
         return True
@@ -79,7 +79,7 @@
 
         if ticket:
             event.addresponse(u'Ticket %(id)s (%(status)s %(priority)s %(type)s in %(component)s for %(milestone)s) '
-                u'reported %(ago)s ago assigned to %(owner)s: "%(summary)s" %(url)sticket/%(id)s', {
+                u'reported %(ago)s ago assigned to %(owner)s: "%(summary)s" <%(url)sticket/%(id)s>', {
                 'id': ticket.id,
                 'status': ticket.status,
                 'priority': ticket.priority,