Ticket #336: tracblog-rss-0.2.patch

blog/web_ui.py

@@ -24 +24 @@
-from pkg_resources import resource_filename
-from trac.core import *
-from trac.web import IRequestHandler
-
+, add_link
-from trac.web.chrome import INavigationContributor 
-
-
+
+
+
-from trac.wiki.model import WikiPage
-from trac.wiki.api import IWikiMacroProvider
-from trac.perm import IPermissionRequestor
@@ -35 +36 @@
-from tractags.api import TagEngine
-from tractags.parseargs import parseargs
-
+_title_split_match = re.compile(r'^=+\s+([^\n\r=]+?)\s+=+\s+(.+)$',
+                                re.DOTALL).match
+
-BOOLS_TRUE = ['true', 'yes', 'ok', 'on', 'enabled', '1']
-
-__all__ = ['TracBlogPlugin']
@@ -105 +109 @@
-    '''delta''' - How many days of posts should be shown.[[br]]
-    '''mark_update''' - Specify whether to show "Updated on" for posts that
-    have been updated.[[br]]
+    '''format''' - Show as RSS feed ('rss') or HTML (else).[[br]]
-
-    If specifying dates with {{{year}}}, {{{month}}}, and/or {{{day}}}, the
-    current value is specified if missing.  For example, if {{{day}}} is 
@@ -196 +201 @@
-        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 +211 @@
-            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.
@@ -260 +271 @@
-                time_format = self.env.config.get('blog', 'date_format') \
-                              or '%x %X'
-                timeStr = format_datetime(post_time, format=time_format) 
+                fulltext = page.text
+                # remove comments in blog view:
+                del_comments = re.compile('==== Comment.*\Z', re.DOTALL)
+                fulltext = del_comments.sub('', fulltext)
+                # remove the [[AddComment...]] tag, otherwise it would appeare
+                # more than one and crew up the blog view:
+                del_addcomment  = re.compile('\[\[AddComment.*\Z', re.DOTALL)
+                fulltext = del_addcomment.sub('', fulltext)
+                # limit length of preview:
-                post_size = self._choose_value('post_size', req, kwargs, int)
-                if not post_size and (not isinstance(post_size, int)):
-                    post_size = int(self.env.config.get('blog', 'post_size', 
-                                    1024))
-page.
+full
-                pagetags = [x for x in tags.get_name_tags(blog_entry) if x not in tlist]
-                tagtags = []
-                for i, t in enumerate(pagetags[:3]):
@@ -274 +294 @@
-                        }
-                    tagtags.append(d)
-                    continue
+                # extract title from text:
+                match = _title_split_match(fulltext)
+                if match:
+                    title = match.group(1)
+                    fulltext = match.group(2)
+                else: 
+                    title = blog_entry
+                html_text = wiki_to_html(fulltext, self.env, req)
+                rss_text = Markup.escape(to_unicode(html_text))
-                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'  : rss_text,
-                        'comment'   : wiki_to_oneliner(comment, self.env),
-                        'tags'      : {
-                                        'present' : len(pagetags),
@@ -290 +323 @@
-                                        '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 +352 @@
-        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 ?><?cs 
+      if bentry.tags.present != 0 ?>
+        &lt;p&gt;Posted in: <?cs
+        each:tag=bentry.tags.tags ?>
+          &lt;a href="<?cs var:cgi_location ?>/tags/<?cs var:tag.link ?>"&gt;
+            <?cs var:tag.name ?>&lt;/a&gt;<?cs
+          if ! tag.last ?>,<?cs 
+          /if ?><?cs
+        /each ?><?cs
+      /if ?>
+    </description>
+   </item><?cs
+  /each ?>
+ </channel>
+</rss>