bitsyblog: bitsyblog/bitsyblog.py comparison

comparison bitsyblog/bitsyblog.py @ 15:36698624435b

blog page mostly works

author	k0s <k0scist@gmail.com>
date	Sun, 25 Oct 2009 17:25:58 -0400
parents	645aa0f3279f
children	2bd6b2b543dc

comparison

equal deleted inserted replaced

-:645aa0f3279f
+:36698624435b
 import utils # local import
 from blog import FileBlog
 from cStringIO import StringIO
 from docutils.utils import SystemMessage
+from genshi.builder import Markup
 from genshi.template import TemplateLoader
 from lxml import etree
 from markup.form import Form
 from paste.fileapp import FileApp
 from pkg_resources import resource_filename
+from urlparse import urlparse
 from user import FilespaceUsers
 from webob import Request, Response, exc
 ### exceptions
 defaults = { 'date_format': '%H:%M %F',
 'file_dir': os.path.dirname(__file__),
 'subject': '[ %(date)s ]:',
 'n_links': 5, # number of links for navigation
 'site_name': 'bitsyblog',
-'auto_reload': 'False',
+'auto_reload': 'True',
 'help_file': None,
 }
+cooked_bodies = {}
 def __init__(self, **kw):
 for key in self.defaults:
 setattr(self, key, kw.get(key, self.defaults[key]))
 self.n_links = int(self.n_links) # could be a string from the .ini
 request.user = self.users[name]
 else:
 name = None
 return name, path
-def user_url(self, request, user, *args, **kw):
+### methods
-permalink = kw.get('permalink')
-if permalink:
+def link(self, request, path=(), permanant=False):
-_args = [ request.host_url, user ]
-else:
-_args = [ user ]
-_args.extend(args)
-return '/'.join([str(arg) for arg in _args])
-###
-def isentry(self, string): # TODO -> blog.py
-return (len(string) == len(''.join(utils.timeformat))) and string.isdigit()
-def permalink(self, request, blogentry):
-return self.user_url(request, blogentry.user, blogentry.datestamp(), permalink=True)
-def link(self, request, path, permanant=False):
 if isinstance(path, basestring):
 path = [ path ]
 path = [ i.strip('/') for i in path ]
 if permanant:
-path = [ request.application_url ] + list(path)
+application_url = request.application_url
-return '/'.join(path)
 else:
-if request.path:
-path = [ request.path ] + list(path)
+application_url = urlparse(request.application_url)[2]
-return '/%s' % ('/'.join(path))
+path = [ application_url ] + list(path)
+return '/'.join(path)
-### mangled URLs
+def user_url(self, request, user, *args, **kw):
+"""link to a user resource"""
+permalink = kw.get('permalink', False)
+path = [ user ]
+path.extend(args)
+return self.link(request, path, permalink)
+def permalink(self, request, blogentry):
+"""permalink for a blog entry"""
+return self.user_url(request, blogentry.user, blogentry.datestamp(), permalink=True)
 def mangledurl(self, request, blogentry):
+"""return a mangled url for obfuscated sharing"""
 return self.user_url(request, blogentry.user, 'x%x' % (int(blogentry.datestamp()) * self.users.secret(blogentry.user)), permalink=True)
 def unmangleurl(self, url, user):
+"""unmangle a url for obfuscated sharing"""
 url = url.strip('x')
 try:
 value = int(url, 16)
 except ValueError:
 return None
 entry = str(value)
 if self.isentry(entry):
 return self.blog.entry(user, entry, ['public', 'secret', 'private'])
 ### blog retrival methods
+def isentry(self, string): # TODO -> blog.py
+"""returns whether the string is a blog entry"""
+return (len(string) == len(''.join(utils.timeformat))) and string.isdigit()
 def number_of_posts(self, request, user=None):
 """return the number of blog posts to display"""
 # determine number of posts to display (None -> all)
 n_posts = request.GET.get('posts', None)
 n_posts = None
 return n_posts
 def number_of_links(self, request, user=None):
 """return the number of links to display in the navigation"""
-# determine number of navigation links to display
 n_links = request.GET.get('n')
 if n_links == 'all':
 return -1
 try:
 n_links = int(n_links)
 title = ' - '.join(_title)
 head_markup = ()
 if feedtitle:
 head_markup = ( '<link rel="alternate" type="application/atom+xml" title="%s" href="atom" />' % feedtitle,
 '<link rel="alternate" type="application/rss+xml" title="%s" href="rss" />' % feedtitle,)
 return markup.wrap(self.site_nav(request)+body, title, stylesheets, head_markup=head_markup)
 def site_nav(self, request):
 """returns HTML for site navigation"""
-links = [('/',), ]
+links = [(self.link(request), '/'), ]
 user = self.authenticated(request)
 if user:
-links.extend([('/%s' % user, user),
+links.extend([(self.user_url(request, user), user),
-('/%s/post' % user, 'post'),
+(self.user_url(request, user, 'post'), user),
-('/%s/preferences' % user, 'preferences'),
+(self.user_url(request, user, 'preferences'), 'preferences'),
-('/logout', 'logout')])
+(self.link(request, 'logout'), 'logout')])
 else:
-links.extend([('/login', 'login'), ('/join', 'join')])
+links.extend([(self.link(request, 'login'), 'login'),
+(self.link(request, 'join'), 'join')])
 if hasattr(self, 'help'):
-links.append(('/help', 'help'))
+links.append((self.link(request, 'help'), 'help'))
-links = [ markup.link(*i) for i in links ]
+request.environ['data']['links'] = links
-return markup.listify(links, ordered=False, **{ 'class': 'site-nav'})
 def index(self, n_links):
 retval = StringIO()
 print >> retval, '<h1><img src="bitsyblog.png" alt="bitsyblog"/></h1>'
 print >> retval, markup.listify(entries)
 print >> retval, more
 print >> retval, '</div>'
 return retval.getvalue()
-def blog_entry(self, request, user, entry):
+#     def blog_entry(self, request, user, entry):
-"""given the content string, return a marked-up blog entry"""
+#         """given the content string, return a marked-up blog entry"""
-# XXX no need to pass user
+#         # XXX no need to pass user
-# user preferences
+#         # user preferences
-prefs = request.user.settings
+#         prefs = request.user.settings
-format = prefs.get('Date format', self.date_format)
+#         format = prefs.get('Date format', self.date_format)
-subject = prefs.get('Subject', self.subject)
+#         subject = prefs.get('Subject', self.subject)
-role = self.role(user, request)
+#         role = self.role(user, request)
-subject = subject % { 'date' : entry.date.strftime(format) }
+#         subject = subject % { 'date' : entry.date.strftime(format) }
-subject = cgi.escape(subject)
+#         subject = cgi.escape(subject)
-html = StringIO()
+#         html = StringIO()
-blog_id = entry.datestamp()
+#         blog_id = entry.datestamp()
-print >> html, '<div id="%s" class="blog-entry">' % blog_id
+#         print >> html, '<div id="%s" class="blog-entry">' % blog_id
-print >> html, '<a name="%s" />' % blog_id
+#         print >> html, '<a name="%s" />' % blog_id
-print >> html, '<div class="subject">'
+#         print >> html, '<div class="subject">'
-print >> html, '<a href="/%s">%s</a>' % (self.user_url(request, user, blog_id), subject)
+#         print >> html, '<a href="/%s">%s</a>' % (self.user_url(request, user, blog_id), subject)
-if (entry.privacy == 'secret') and (role == 'friend'):
+#         if (entry.privacy == 'secret') and (role == 'friend'):
-print >> html, '<em>secret</em>'
+#             print >> html, '<em>secret</em>'
-print >> html, '</div>'
+#         print >> html, '</div>'
-print >> html, self.cooker(entry.body)
+#         print >> html, self.cooker(entry.body)
-if role == 'author':
+#         if role == 'author':
-print >> html, '<div><form action="/%s" method="post">' % self.user_url(request, entry.user, blog_id)
+#             print >> html, '<div><form action="/%s" method="post">' % self.user_url(request, entry.user, blog_id)
-print >> html, self.privacy_settings(entry.privacy)
+#             print >> html, self.privacy_settings(entry.privacy)
-print >> html, '<input type="submit" name="submit" value="Change Privacy" />'
+#             print >> html, '<input type="submit" name="submit" value="Change Privacy" />'
-print >> html, '</form></div>'
+#             print >> html, '</form></div>'
-if entry.privacy != 'public':
+#             if entry.privacy != 'public':
-title = "You can give this URL so people may see this %s post without logging in" % entry.privacy
+#                 title = "You can give this URL so people may see this %s post without logging in" % entry.privacy
-print >> html, '<div>'
+#                 print >> html, '<div>'
-print >> html, '<span title="%s">Mangled URL:</span>' % title
+#                 print >> html, '<span title="%s">Mangled URL:</span>' % title
-print >> html, markup.link(self.mangledurl(request, entry))
+#                 print >> html, markup.link(self.mangledurl(request, entry))
-print >> html, '</div>'
+#                 print >> html, '</div>'
-print >> html, '</div>'
+#         print >> html, '</div>'
-return html.getvalue()
+#         return html.getvalue()
 def write_blog(self, user, blog, path, n_links, request):
 """return the user's blog in HTML"""
-# XXX no need to pass path or user!
-retval = StringIO()
+# XXX probably should go elsewhere
-print >> retval,  self.navigation(user, blog, path, n_links, 0)
 for entry in blog:
-print >> retval, self.blog_entry(request, user, entry)
+if (user, entry.datestamp()) not in self.cooked_bodies:
-feedtitle=None
+self.cooked_bodies[(user, entry.datestamp())] = self.cooker(entry.body)
-if request.path_info.strip('/') == user:
+entry.cooked_body = Markup(self.cooked_bodies[(user, entry.datestamp())])
-feedtitle = "%s's blog" % user
-title = None
+# site nav
-if len(blog) == 1:
+# XXX def site_nav() puts directly in request.environ['data']
-format = request.user.settings.get('Date format', self.date_format)
+# should return instead
-title = blog[0].date.strftime(format)
+self.site_nav(request)
-return self.render(request, retval.getvalue(), title=title, feedtitle=feedtitle)
+# user data -> should be moved up the chain
+data = request.environ['data']
+data['user'] = user
+data['role'] = self.role(user, request)
+data['stylesheets'] = () # TODO
+data['subject'] = request.user.settings.get('Subject', self.subject)
+data['date_format'] = request.user.settings.get('Date format', self.date_format)
+data['user_url'] = self.user_url
+data['mangledurl'] = self.mangledurl
+# blog data
+data['blog'] = blog
+data['n_links'] = n_links
+# render the template
+template = self.loader.load('blog.html')
+return template.generate(**data).render()
+#         # XXX no need to pass path or user!
+#         retval = StringIO()
+#         print >> retval,  self.navigation(user, blog, path, n_links, 0)
+#         for entry in blog:
+#             print >> retval, self.blog_entry(request, user, entry)
+#         feedtitle=None
+#         if request.path_info.strip('/') == user:
+#             feedtitle = "%s's blog" % user
+#         title = None
+#         if len(blog) == 1:
+#             format = request.user.settings.get('Date format', self.date_format)
+#             title = blog[0].date.strftime(format)
+#         return self.render(request, retval.getvalue(), title=title, feedtitle=feedtitle)
 def restructuredText(self, string):
 origstring = string
 settings = { 'report_level': 5 }
 string = string.strip()
 print >> retval, '<input type="submit" name="submit" value="Post" />'
 print >> retval, '</form>'
 return self.render(request, retval.getvalue())
 def preferences_form(self, request, user):
-prefs = self.request.user.settings
+prefs = request.user.settings
 form = Form()
 # date format
 format = prefs.get('Date format', self.date_format)
 value = datetime.datetime.now().strftime(format)
 path = []
 request.user = self.users[self.user]
 return self.user, path
 def user_url(self, request, user, *args, **kw):
-permalink = kw.get('permalink')
+permalink = kw.get('permalink', False)
-if permalink:
+return self.link(request, args, permalink)
-_args = [ request.host_url ]
-else:
-_args = [ ]
-_args.extend(args)
-return '/'.join([str(arg) for arg in _args])
 def passwords(self):
 return { self.user: self.users.password(self.user) }
 def site_nav(self, request):
 """returns HTML for site navigation"""
-links = [('/', self.user), ]
+links = [(self.user_url(request, self.user), self.user), ]
 user = self.authenticated(request)
 if user:
-links.extend([
+links.extend([(self.user_url(request, user, 'post'), 'post'),
-('/post', 'post'),
+(self.user_url(request, user, 'preferences'), 'preferences'),
-('/preferences', 'preferences'),
+(self.link(request, 'logout'), 'logout')])
-('/logout', 'logout')])
 else:
-links.append(('/login', 'login'))
+links.append((self.link(request, 'login'), 'login'))
 if hasattr(self, 'help'):
-links.append(('/help', 'help'))
+links.append((self.link(request, 'help'), 'about'))
-links = [ markup.link(*i) for i in links ]
-return markup.listify(links, ordered=False, **{ 'class': 'site-nav'})
+request.environ['data']['links'] = links

Mercurial > hg > bitsyblog

comparison bitsyblog/bitsyblog.py @ 15:36698624435b