Ticket #336: tracblog-rss.patch

blog/web_ui.py

@@ -26 +26 @@
-from trac.web import IRequestHandler
-from trac.web.chrome import ITemplateProvider, add_stylesheet
-from trac.web.chrome import INavigationContributor 
-
-
+
+
+
+
-from trac.wiki.model import WikiPage
-from trac.wiki.api import IWikiMacroProvider
-from trac.perm import IPermissionRequestor
@@ -35 +37 @@
-from tractags.api import TagEngine
-from tractags.parseargs import parseargs
-
+import re
+
+title_split_match = re.compile(r'^=+\s+([^\n\r=]+?)\s+=+\s+(.+)$', re.DOTALL).match
+
-BOOLS_TRUE = ['true', 'yes', 'ok', 'on', 'enabled', '1']
-
-__all__ = ['TracBlogPlugin']
@@ -196 +202 @@
-        add_stylesheet(req, 'blog/css/blog.css')
-        add_stylesheet(req, 'common/css/wiki.css')
-        tags = req.args.getlist('tag')
+        format = req.args.get('format')
-        kwargs = {}
-        for key in req.args.keys():
-            if key != 'tag':
@@ -205 +212 @@
-            tstr = self.env.config.get('blog', 'default_tag', 'blog')
-            tags = [t.strip() for t in _tag_split.split(tstr) if t.strip()]
-        self._generate_blog(req, *tags, **kwargs)
-
+
+
+
+
+
+
-
-    def _generate_blog(self, req, *args, **kwargs):
-        """Extract the blog pages and fill the HDF.
@@ -274 +286 @@
-                        }
-                    tagtags.append(d)
-                    continue
+                match = title_split_match(page.text)
+                if match:
+                    title = match.group(1)
+                    fulltext = match.group(2)
+                else: 
+                    title = blog_entry
+                    fulltext = page.text
+                del_comments = re.compile('==== Comment.*\Z', re.DOTALL)
+                del_addcomm  = re.compile('\[\[AddComment.*\Z', re.DOTALL)
+                text = del_comments.sub('', text)
+                fulltext = del_comments.sub('', fulltext)
+                text = del_addcomm.sub('', text)
+                fulltext = del_addcomm.sub('', fulltext)
-                data = {
-                        'name'      : blog_entry,
+                        'title'     : title,
+                        'href'      : self.env.href.wiki(blog_entry),
-                        'wiki_link' : wiki_to_oneliner(read_post % 
-                                                       blog_entry,
-                                                       self.env),
-                        'time'      : timeStr,
+                        'date'      : http_date(page.time),
-                        'author'    : author,
-                        'wiki_text' : wiki_to_nofloat_html(text, self.env, req,
-                                                   macro_blacklist=macro_bl),
+                        'rss_text'  : Markup.escape(to_unicode(wiki_to_html(fulltext, self.env, req))),
-                        'comment'   : wiki_to_oneliner(comment, self.env),
-                        'tags'      : {
-                                        'present' : len(pagetags),
@@ -290 +319 @@
-                                        'more'    : len(pagetags) > 3 or 0,
-                                      },
-                       }
+                if author:
+                    # For RSS, author must be an email address
+                    if author.find('@') != -1:
+                        data['author.email'] = author
+                    elif self._user2email(author) is not None:
+                        data['author.email'] = self._user2email(author)
+
+                
-                if (modified != post_time) and mark_updated:
-                    data['modified'] = 1
-                    mod_str = format_datetime(modified, format=time_format)
@@ -312 +349 @@
-        req.hdf['blog.hidecal'] = hidecal
-        pass
-
+    def _user2email(self, user):
+        for username, name, email in self.env.get_known_users():
+            if email:
+                return email
+        return None
+
-    def _generate_calendar(self, req, tallies):
-        """Generate data necessary for the calendar
-

blog/templates/blog_rss.cs

@@ +1 @@
+<?xml version="1.0"?>
+<rss version="2.0">
+ <channel><?cs
+  if:project.name_encoded ?>
+   <title><?cs var:project.name_encoded ?>: <?cs var:title ?></title><?cs
+  else ?>
+   <title><?cs var:title ?></title><?cs
+  /if ?>
+  <link><?cs var:base_host ?><?cs var:trac.href.blog ?></link>
+  <description>Trac Blog</description>
+  <language>en-us</language>
+  <generator>Trac v<?cs var:trac.version ?></generator><?cs
+  if:chrome.logo.src ?>
+   <image>
+    <title><?cs var:project.name_encoded ?></title>
+    <url><?cs if:!chrome.logo.src_abs ?><?cs var:base_host ?><?cs /if ?><?cs
+     var:chrome.logo.src ?></url>
+    <link><?cs var:base_host ?><?cs var:trac.href.blog ?></link>
+   </image><?cs
+  /if ?><?cs
+  each:bentry = blog.entries ?>
+   <item>
+    <title><?cs var:bentry.title ?></title><?cs
+    if:bentry.author.email ?>
+     <author><?cs var:bentry.author.email ?></author><?cs
+    else ?>
+     <author><?cs var:bentry.author ?></author><?cs
+    /if ?>
+    <pubDate><?cs var:bentry.date ?></pubDate>
+    <link><?cs var:base_host ?><?cs var:bentry.href ?></link>
+    <guid><?cs var:base_host ?><?cs var:bentry.href ?></guid>
+    <description><?cs var:bentry.rss_text ?></description>
+   </item><?cs
+  /each ?>
+ </channel>
+</rss>