comparison bitsyblog/bitsyblog.py @ 83:666f3051ce31

move cook_entry to its own function
author Jeff Hammel <jhammel@mozilla.com>
date Thu, 17 Nov 2011 12:15:43 -0800
parents 9e5dd802ba95
children e5a23f5ea14e
comparison
equal deleted inserted replaced
82:9e5dd802ba95 83:666f3051ce31
601 users.sort(key=lambda user: blogs[user][0].date, reverse=True) 601 users.sort(key=lambda user: blogs[user][0].date, reverse=True)
602 602
603 data['blogs'] = blogs 603 data['blogs'] = blogs
604 data['users'] = users 604 data['users'] = users
605 data['date_formats'] = dict([(user, self.users[user].settings.get('Date format', self.date_format)) for user in users]) 605 data['date_formats'] = dict([(user, self.users[user].settings.get('Date format', self.date_format)) for user in users])
606 606
607 # render the template 607 # render the template
608 template = self.loader.load('index.html') 608 template = self.loader.load('index.html')
609 return template.generate(**request.environ['data']).render() 609 return template.generate(**request.environ['data']).render()
610 610
611 611 def cooked_entry(self, entry):
612 """cook the entry"""
613 if (entry.user, entry.datestamp()) not in self.cooked_bodies:
614 self.cooked_bodies[(entry.user, entry.datestamp())] = self.cooker(entry.body)
615 return self.cooked_bodies[(entry.user, entry.datestamp())]
616
612 def write_blog(self, user, blog, path, n_links, request): 617 def write_blog(self, user, blog, path, n_links, request):
613 """return the user's blog in HTML""" 618 """return the user's blog in HTML"""
614 619
615 # XXX probably should go elsewhere 620 # cook the entry
616 for entry in blog: 621 for entry in blog:
617 if (user, entry.datestamp()) not in self.cooked_bodies: 622 entry.cooked_body = Markup(self.cooked_entry(entry))
618 self.cooked_bodies[(user, entry.datestamp())] = self.cooker(entry.body) 623
619 entry.cooked_body = Markup(self.cooked_bodies[(user, entry.datestamp())]) 624 # site nav
620
621 # site nav
622 # XXX def site_nav() puts directly in request.environ['data'] 625 # XXX def site_nav() puts directly in request.environ['data']
623 # should return instead 626 # should return instead
624 self.site_nav(request) 627 self.site_nav(request)
625 628
626 # user data -> should be moved up the chain 629 # user data -> should be moved up the chain