Merge lp:~vhata/ibid/feeds-747635 into lp:~ibid-core/ibid/old-trunk-1.6

[Jonathan Hitchcock]

Adds the ability to specify 'headlines' or 'articles' when fetching a bunch (and fixes the syntax so that if you just say 'latest article' it only fetches one).

[Max Rabkin (max-rabkin)]

review: Approve

[Stefano Rivera (stefanor)]

We don't use "starting at" any where else, we use "from" or "#".

Should we not standardise a bit?

Otherwise I quite like it. My initial response was that this should have been fixed by changing article(), but this does seem more user-friendly.

review: Needs Fixing

[Jonathan Hitchcock (vhata)]

This syntax already has "from" in it - "latest articles from bbc from 3" is weird. Also, that's not how people speak, whether the other ibid plugins think so or not.

review: Needs Resubmitting

Unmerged revisions

1029. By Jonathan Hitchcock on 2011-04-05

Fix usage

1028. By Jonathan Hitchcock on 2011-04-05

More flexible feed syntax

=== modified file 'ibid/plugins/feeds.py'
--- ibid/plugins/feeds.py	2010-11-07 15:10:58 +0000
+++ ibid/plugins/feeds.py	2011-04-05 00:33:11 +0000
@@ -225,7 +225,7 @@
 broken_lock = Lock()
 
 class Retrieve(Processor):
-    usage = u"""latest [ <count> ] articles from <name> [ starting at <number> ]
+    usage = u"""latest [ <count> ] ( articles | headlines ) from <name> [ starting at <number> ]
     article ( <number> | /<pattern>/ ) from <name>"""
     features = ('feeds',)
 
@@ -236,10 +236,16 @@
         'The slowdown ratio to back off from broken feeds', 2.0)
 
 
-    @match(r'^(?:latest|last)\s+(?:(\d+)\s+)?articles\s+from\s+(.+?)'
+    @match(r'^(?:latest|last)\s+(?:(\d+)\s+)?(article|headline)(s)?\s+from\s+(.+?)'
            r'(?:\s+start(?:ing)?\s+(?:at\s+|from\s+)?(\d+))?$')
-    def list(self, event, number, name, start):
-        number = number and int(number) or 10
+    def list(self, event, number, full, plurality, name, start):
+        full = full == 'article'
+        if number:
+            number = int(number)
+        elif not plurality:
+            number = 1
+        else:
+            number = 10
         start = start and int(start) or 0
 
         feed = event.session.query(Feed).filter_by(name=name).first()
@@ -254,10 +260,27 @@
             return
 
         articles = feed.entries[start:number+start]
-        articles = [u'%s: "%s"' % (feed.entries.index(entry) + 1,
-                                   html2text_file(entry.title, None).strip())
-                    for entry in articles]
-        event.addresponse(u', '.join(articles))
+        entries = []
+        for article in articles:
+            if full:
+                if 'summary' in article:
+                    summary = html2text_file(article.summary, None)
+                else:
+                    if article.content[0].type in \
+                            ('application/xhtml+xml', 'text/html'):
+                        summary = html2text_file(article.content[0].value, None)
+                    else:
+                        summary = article.content[0].value
+
+                entries.append(u'%(number)s: "%(title)s"%(link)s : %(summary)s' % {
+                    'number': articles.index(article) + 1,
+                    'title': html2text_file(article.title, None).strip(),
+                    'link': get_link(article),
+                    'summary': summary,
+                })
+            else:
+                entries.append(u'%s: "%s"' % (feed.entries.index(article) + 1, html2text_file(article.title, None).strip()))
+        event.addresponse(u', '.join(entries))
 
     @match(r'^article\s+(?:(\d+)|/(.+?)/)\s+from\s+(.+?)$')
     def article(self, event, number, pattern, name):
@@ -269,7 +292,7 @@
 
         feed.update()
         if not feed.entries:
-            event.addresponse(u"I can't access that feed")
+            event.addresponse(u"I can't find any articles in that feed")
             return
         article = None