raoul/old-scribeengine
Archived
1
0
Fork 0
Code Issues 3 Pull Requests Projects 1 Releases Wiki Activity

Removed HTML from feeds, and reduced them just to the teaser.

Browse Source
This commit is contained in:
Raoul Snyman 2010-01-27 09:26:47 +02:00
parent e3cef7a4fd
commit 9ac86fc3e1
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scribeengine/controllers/feed.py
View File

@ -1,4 +1,6 @@
import logging import logging
import uuid
import re
from feedformatter import Feed from feedformatter import Feed
import time import time
@ -14,7 +16,8 @@ class FeedController(BaseController):
def _generate_feed(self): def _generate_feed(self):
blog_title = Session.query(Variable).get(u'blog title').value blog_title = Session.query(Variable).get(u'blog title').value
blog_slogan = Session.query(Variable).get(u'blog slogan').value blog_slogan = Session.query(Variable).get(u'blog slogan').value
blog_link = request.environ[u'HTTP_HOST'] blog_link = str('%s://%s' % (request.environ[u'wsgi.url_scheme'], \
request.environ[u'HTTP_HOST']))
if blog_link.endswith(u'/'): if blog_link.endswith(u'/'):
blog_link = blog_link[:-1] blog_link = blog_link[:-1]
posts = Session.query(Post)\ posts = Session.query(Post)\
@ -34,15 +37,15 @@ class FeedController(BaseController):
item[u'title'] = post.title item[u'title'] = post.title
item[u'link'] = blog_link + h.url_for_post(post) item[u'link'] = blog_link + h.url_for_post(post)
item[u'author'] = post.user.nick item[u'author'] = post.user.nick
item[u'description'] = post.body item[u'description'] = re.sub(r'<(.*?)>', u'', h.teaser(post.body))
item[u'pubDate'] = post.created.timetuple() item[u'pubDate'] = post.created.timetuple()
#item[u'guid'] = "1234567890" item[u'guid'] = str(uuid.uuid5(uuid.NAMESPACE_URL, blog_link + h.url_for_post(post)))
# Add item to feed # Add item to feed
feed.items.append(item) feed.items.append(item)
return feed return feed
def index(self): def index(self):
h.redirect_to('/') h.redirect_to(h.url_for(action=u'atom'))
def rss(self, id=u'2.0'): def rss(self, id=u'2.0'):
feed = self._generate_feed() feed = self._generate_feed()

1
scribeengine/lib/base.py
View File

@ -49,7 +49,6 @@ log = logging.getLogger(__name__)
class BaseController(WSGIController): class BaseController(WSGIController):
def __before__(self): def __before__(self):
#c.theme_name = Session.query(Configuration).get(u'theme').value
if session.get(u'REMOTE_USER'): if session.get(u'REMOTE_USER'):
c.current_user = Session.query(User).get(session[u'REMOTE_USER']) c.current_user = Session.query(User).get(session[u'REMOTE_USER'])
c.blog_title = Session.query(Variable).get(u'blog title').value c.blog_title = Session.query(Variable).get(u'blog title').value

2
scribeengine/lib/helpers.py
View File

@ -61,7 +61,7 @@ class Flash(object):
return message_type return message_type
def teaser(text, url): def teaser(text):
position = text.find(u'</p>') position = text.find(u'</p>')
if position > 0: if position > 0:
return text[:position + 4] return text[:position + 4]

2
scribeengine/templates/base.mako
View File

@ -6,6 +6,8 @@
<title>${c.page_title}</title> <title>${c.page_title}</title>
<meta name="keywords" content="" /> <meta name="keywords" content="" />
<meta name="description" content="" /> <meta name="description" content="" />
<link href="${h.url_for(controller=u'feed', action=u'atom')}" type="application/atom+xml" rel="alternate" title="Sitewide ATOM Feed" />
<link href="${h.url_for(controller=u'feed', action=u'rss')}" type="application/rss+xml" rel="alternate" title="Sitewide RSS Feed" />
<link href="${h.url_for('/styles/style.css')}" rel="stylesheet" type="text/css" media="screen" /> <link href="${h.url_for('/styles/style.css')}" rel="stylesheet" type="text/css" media="screen" />
% for script in c.scripts: % for script in c.scripts:
<script src="/scripts/${script}" type="text/javascript"></script> <script src="/scripts/${script}" type="text/javascript"></script>

2
scribeengine/templates/blog/index.mako
View File

@ -4,7 +4,7 @@
<div class="post"> <div class="post">
<h2 class="title"><a href="${h.url_for_post(post)}">${post.title}</a></h2> <h2 class="title"><a href="${h.url_for_post(post)}">${post.title}</a></h2>
<div class="entry"> <div class="entry">
${h.literal(h.teaser(post.body, h.url_for_post(post)))} ${h.literal(h.teaser(post.body))}
</div> </div>
<p class="meta"> <p class="meta">
<span class="byline">Posted by ${post.user.nick} on ${post.created.strftime('%B %d, %Y')}</span> <span class="byline">Posted by ${post.user.nick} on ${post.created.strftime('%B %d, %Y')}</span>