@@ -1,4 +1,5 @@ +8/27/08: adding demisauce support for non js comments, etc. 5/18/08: adding anchor tags to show comments for index page with more than one item to go to detail page 5/18/08: added preview capability to blog posts so you don't have to publish to preview 5/18/08: pushed large set of changes to include Demisauce comments in Potlatch Blog CHANGELOG @@ -10,6 +10,7 @@ from google.appengine.ext import webapp from google.appengine.ext import db from model import * +from demisaucepy import cache, cfg def rebuild_cache(blog): """ @@ -18,7 +19,7 @@ def rebuild_cache(blog): """ pages = Entry.all().filter("entrytype =", "page").filter("published =", True).fetch(20) archives = Archive.all().order('-date').fetch(10) - recententries = Entry.all().filter('entrytype =','post').filter("published", True).order('-date').fetch(10) + recententries = Entry.allpublished().fetch(10) links = Link.all().filter('linktype =','blogroll') template_vals = {'recententries':recententries,'pages':pages, 'links':links,'archives':archives} @@ -43,6 +44,7 @@ def requires_admin(method): return method(self, *args, **kwargs) return wrapper + def printinfo(method): @wraps(method) def wrapper(self, *args, **kwargs): @@ -59,8 +61,13 @@ class BaseController(webapp2.RequestHandler): def __init__(self): self.template = 'index.html' self.blog = Blog.all().fetch(1) + self.demisauce_url = 'http://www.demisauce.com' + if 'demisauce.url' in cfg.CFG: + self.demisauce_url = cfg.CFG['demisauce.url'] if self.blog == []: - pass + self.blog = Blog() + self.blog.initialsetup() + self.blog.save() else: self.blog = self.blog[0] current_userisadmin = False @@ -100,7 +107,8 @@ class BaseController(webapp2.RequestHandler): self.template_vals.update({'url':url, 'url_linktext':url_linktext, - 'blog':self.blog + 'blog':self.blog, + 'demisauce_url':self.demisauce_url }) self.template_vals.update(template_vals) path = os.path.join(os.path.dirname(__file__), template_file) @@ -121,8 +129,7 @@ class MainPage(BasePublicPage): def get(self,slug=None): entries = [] if slug == None: - entries = Entry.all().filter('entrytype =','post').\ - filter("published =", True).order('-date').fetch(10) + entries = Entry.allpublished().fetch(10) else: entries = Entry.all().filter('slug', slug).fetch(1) if not entries or len(entries) == 0: @@ -131,6 +138,11 @@ class MainPage(BasePublicPage): self.render('views/index.html',{'entries':entries,'slug':slug}) + def xget(self,slug=None): + for name in os.environ.keys(): + self.response.out.write("%s = %s<br />\n" % (name, os.environ[name])) + print 'aaron is here' + #ln -s ~/Dropbox/demisauce/demisaucepy/trunk/demisaucepy demisaucepy class PublicPage(BasePublicPage): def get(self,slug=None): @@ -140,20 +152,19 @@ class PublicPage(BasePublicPage): class ArchivePage(BasePublicPage): def get(self,monthyear=None): - entries = Entry.all().filter('monthyear', monthyear).\ - filter("published =", True).filter('entrytype','post').order('-date') + entries = Entry.allpublished().filter('monthyear', monthyear) self.render('views/index.html',{'entries':entries}) class TagPage(BasePublicPage): def get(self,tags=None): - entries = Entry.all().filter("tags =", tags).filter('entrytype =','post').order('-date') + entries = Entry.allpublished().filter("tags =", tags) self.render('views/index.html',{'entries':entries}) class FeedHandler(BaseController): def get(self,tags=None): - entries = Entry.all().filter('entrytype =','post').order('-date').fetch(10) + entries = Entry.allpublished().fetch(10) if entries and entries[0]: last_updated = entries[0].date last_updated = last_updated.strftime("%Y-%m-%dT%H:%M:%SZ") @@ -167,7 +178,6 @@ class AdminConfig(BaseController): @requires_admin def get(self): blogedit = Blog.all().fetch(1) - #blog = Blog.all() if blogedit: blogedit = blogedit[0] else: blog.py @@ -22,21 +22,39 @@ indexes: - name: date direction: desc -# Used 56 times in query history. +# Used 4 times in query history. - kind: Entry properties: - name: entrytype - name: date direction: desc -# Used 13 times in query history. +# Unused in query history -- copied from input. - kind: Entry properties: - name: entrytype + - name: monthyear - name: published - name: date direction: desc +# Used 8 times in query history. +- kind: Entry + properties: + - name: entrytype + - name: published + - name: date + direction: desc + +# Unused in query history -- copied from input. +- kind: Entry + properties: + - name: entrytype + - name: published + - name: tags + - name: date + direction: desc + # Unused in query history -- copied from input. - kind: Entry properties: index.yaml @@ -3,6 +3,17 @@ from google.appengine.ext import db from google.appengine.ext.db import Model as DBModel from datetime import datetime +from demisaucepy.django_helper import AggregatorMeta +from demisaucepy.declarative import has_a, has_many, \ + aggregator_callable, make_declarative +from demisaucepy import cfg + + + + +cfg.CFG['demisauce.apikey'] = '173726158347a26b3836d1c6c09e6c646461517a' +cfg.CFG['demisauce.url'] = 'http://localhost:4951' +cfg.CFG['demisauce.appname'] = 'djangodemo' class BaseModel(db.Model): def __init__(self, parent=None, key_name=None, _app=None, **kwds): @@ -24,6 +35,9 @@ class BaseModel(db.Model): getattr(self,attrname + '_onchange')(curval,value) DBModel.__setattr__(self,attrname,value) + + +class GAEMeta(BaseModel,AggregatorMeta): pass class Cache(db.Model): cachekey = db.StringProperty(multiline=False) @@ -82,6 +96,7 @@ class Link(db.Model): linktext = db.StringProperty(multiline=False,default='') class Entry(BaseModel): + #__metaclass__ = GAEMeta author = db.UserProperty() blog = db.ReferenceProperty(Blog) published = db.BooleanProperty(default=False) @@ -94,6 +109,8 @@ class Entry(BaseModel): entrytype = db.StringProperty(multiline=False,default='post',choices=[ 'post','page']) commentcount = db.IntegerProperty(default=0) + comments = has_many(name='comment',lazy=True,local_key='slug' ) + phphello = has_a(name='helloworld',app='phpdemo',lazy=True,local_key='slug' ) def published_onchange(self,curval,newval): if self.entrytype == 'post': @@ -170,4 +187,11 @@ class Entry(BaseModel): self.monthyear = my self.put() - + @classmethod + def allpublished(cls,type='post'): + return Entry.all().filter('entrytype =',type + ).filter("published =", True).order('-date') + +make_declarative(Entry.__dict__) +for attr in Entry.__dict__.keys(): + print 'attr %s, %s' % (attr,Entry.__dict__[attr]) model.py @@ -18,7 +18,7 @@ <li class="page_item page-item-2"><a href="/admin/entry/list/page" title="Pages">Pages</a></li> <li class="page_item page-item-2"><a href="/admin/setup" title="About">Configuration</a></li> <li class="page_item page-item-2" style="float:right;"><a href="{{ url }}" title="Admin">{{ url_linktext }}</a></li> - <li class="page_item page-item-2" style="float:right;font-size:1em"><a href="#" id="dshelp" rel="facebox" title="help">help</a></li> + <li class="page_item page-item-2" style="float:right;font-size:1em"><a href="#" id="dshelp" rel="facebox" title="help">feedback</a></li> <div class="clear"></div> </ul> views/admin_base.html @@ -6,6 +6,8 @@ <link rel="stylesheet" href="/static/{{ blog.theme }}" type="text/css" media="screen" /> <link rel="alternate" type="application/atom+xml" title="{{ blog.title }}" href="{{ blog.feedurl }}" /> <script type="text/javascript" src="/static/jquery-1.2.6.min.js"></script> + + <link rel="pingback" href="/pingback" /> {% block head_javascript %}{% endblock %} </head> views/base.html @@ -67,6 +67,7 @@ </div> <div class="commentmeta"> + {{ entry.comments.views.summary }} {% if entry.commentcount %} <a href="#comments" title="Comment on Demiauce Comment System">{{ entry.commentcount }} comments</a> {% else %} views/index.html webapp/__init__.pyc 7e590d2b52e39d12910c943b75bf27cb2c45ea5f Aaron Raddon araddon@yahoo.com http://github.com/araddon/potlatchblog/commit/b289ea8f3f111fb2f50bad4bae140bd5f12fefb7 b289ea8f3f111fb2f50bad4bae140bd5f12fefb7 2008-08-31T22:48:56-07:00 2008-08-31T22:48:56-07:00 support for demisauce on potlatchblog/gae, bug fix showing unpublished items in rss, empty blog bug 8776f171c6705975fb3346d0196396d43462c3af Aaron Raddon araddon@yahoo.com