X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/0f1b0f543695cc02b2587d22a7da223eeb705022..9592f8df376c7dacacd49bb7587ee494ad339035:/contrib/penfield/models.py diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py index f6c827a..6da87a6 100644 --- a/contrib/penfield/models.py +++ b/contrib/penfield/models.py @@ -1,11 +1,10 @@ from django.db import models from django.conf import settings -from philo.models import Tag, Titled, Entity, MultiView, Page, register_value_model +from philo.models import Tag, Titled, Entity, MultiView, Page, register_value_model, TemplateField from philo.exceptions import ViewCanNotProvideSubpath from django.conf.urls.defaults import url, patterns, include -from django.core.urlresolvers import reverse from django.http import Http404 -from datetime import datetime +from datetime import date, datetime from philo.utils import paginate from philo.contrib.penfield.validators import validate_pagination_count from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed @@ -65,7 +64,8 @@ class BlogView(MultiView, FeedMultiViewMixin): entry_permalink_base = models.CharField(max_length=255, blank=False, default='entries') tag_permalink_base = models.CharField(max_length=255, blank=False, default='tags') feed_suffix = models.CharField(max_length=255, blank=False, default=FeedMultiViewMixin.feed_suffix) - feeds_enabled = models.BooleanField() + feeds_enabled = models.BooleanField() + list_var = 'entries' def __unicode__(self): return u'BlogView for %s' % self.blog.title @@ -74,35 +74,27 @@ class BlogView(MultiView, FeedMultiViewMixin): def per_page(self): return self.entries_per_page - @property - def feed_title(self): - return self.blog.title - - def get_subpath(self, obj): + def get_reverse_params(self, obj): if isinstance(obj, BlogEntry): if obj.blog == self.blog: - entry_view_args = {'slug': obj.slug} + kwargs = {'slug': obj.slug} if self.entry_permalink_style in 'DMY': - entry_view_args.update({'year': str(obj.date.year).zfill(4)}) + kwargs.update({'year': str(obj.date.year).zfill(4)}) if self.entry_permalink_style in 'DM': - entry_view_args.update({'month': str(obj.date.month).zfill(2)}) + kwargs.update({'month': str(obj.date.month).zfill(2)}) if self.entry_permalink_style == 'D': - entry_view_args.update({'day': str(obj.date.day).zfill(2)}) - return reverse(self.entry_view, urlconf=self, kwargs=entry_view_args) + kwargs.update({'day': str(obj.date.day).zfill(2)}) + return self.entry_view, [], kwargs elif isinstance(obj, Tag): if obj in self.blog.entry_tags: - return reverse(self.tag_view, urlconf=self, kwargs={'tag_slugs': obj.slug}) - elif isinstance(obj, (str, unicode)): - split_obj = obj.split(':') - if len(split_obj) > 1: - entry_archive_view_args = {} - if split_obj[0].lower() == 'archives': - entry_archive_view_args.update({'year': str(int(split_obj[1])).zfill(4)}) - if len(split_obj) > 2: - entry_archive_view_args.update({'month': str(int(split_obj[2])).zfill(2)}) - if len(split_obj) > 3: - entry_archive_view_args.update({'day': str(int(split_obj[3])).zfill(2)}) - return reverse(self.entry_archive_view, urlconf=self, kwargs=entry_archive_view_args) + return 'entries_by_tag', [], {'tag_slugs': obj.slug} + elif isinstance(obj, (date, datetime)): + kwargs = { + 'year': str(obj.year).zfill(4), + 'month': str(obj.month).zfill(2), + 'day': str(obj.day).zfill(2) + } + return 'entries_by_day', [], kwargs raise ViewCanNotProvideSubpath def get_context(self): @@ -112,7 +104,8 @@ class BlogView(MultiView, FeedMultiViewMixin): def urlpatterns(self): urlpatterns = patterns('', url(r'^', include(self.feed_patterns(self.get_all_entries, self.index_page, 'index'))), - url((r'^(?:%s)/(?P[-\w]+[-+/\w]*)/' % self.tag_permalink_base), include(self.feed_patterns(self.get_entries_by_tag, self.tag_page, 'entries_by_tag'))) + url(r'^%s/(?P[-\w]+[-+/\w]*)/%s/' % (self.tag_permalink_base, self.feed_suffix), self.feed_view(self.get_entries_by_tag, 'entries_by_tag_feed'), name='entries_by_tag_feed'), + url(r'^%s/(?P[-\w]+[-+/\w]*)/' % self.tag_permalink_base, self.page_view(self.get_entries_by_tag, self.tag_page), name='entries_by_tag') ) if self.tag_archive_page: urlpatterns += patterns('', @@ -155,10 +148,10 @@ class BlogView(MultiView, FeedMultiViewMixin): ) return urlpatterns - def get_all_entries(self, request, node=None, extra_context=None): + def get_all_entries(self, request, extra_context=None): return self.blog.entries.all(), extra_context - def get_entries_by_ymd(self, request, year=None, month=None, day=None, node=None, extra_context=None): + def get_entries_by_ymd(self, request, year=None, month=None, day=None, extra_context=None): if not self.entry_archive_page: raise Http404 entries = self.blog.entries.all() @@ -173,7 +166,7 @@ class BlogView(MultiView, FeedMultiViewMixin): context.update({'year': year, 'month': month, 'day': day}) return entries, context - def get_entries_by_tag(self, request, node=None, extra_context=None): + def get_entries_by_tag(self, request, tag_slugs, extra_context=None): tags = [] for tag_slug in tag_slugs.replace('+', '/').split('/'): if tag_slug: # ignore blank slugs, handles for multiple consecutive separators (+ or /) @@ -188,15 +181,37 @@ class BlogView(MultiView, FeedMultiViewMixin): entries = self.blog.entries.all() for tag in tags: entries = entries.filter(tags=tag) - if entries.count() <= 0: - raise Http404 - return entries, extra_context + context = self.get_context() + context.update(extra_context or {}) + context.update({'tags': tags}) + + return entries, context - def get_obj_description(self, obj): - return obj.excerpt + def add_item(self, feed, obj, kwargs=None): + defaults = { + 'title': obj.title, + 'description': obj.excerpt or obj.content, + 'author_name': obj.author.get_full_name(), + 'pubdate': obj.date + } + defaults.update(kwargs or {}) + super(BlogView, self).add_item(feed, obj, defaults) + + def get_feed(self, feed_type, extra_context, kwargs=None): + tags = (extra_context or {}).get('tags', None) + title = self.blog.title + + if tags is not None: + title += " - %s" % ', '.join([tag.name for tag in tags]) + + defaults = { + 'title': title + } + defaults.update(kwargs or {}) + return super(BlogView, self).get_feed(feed_type, extra_context, defaults) - def entry_view(self, request, slug, year=None, month=None, day=None, node=None, extra_context=None): + def entry_view(self, request, slug, year=None, month=None, day=None, extra_context=None): entries = self.blog.entries.all() if year: entries = entries.filter(date__year=year) @@ -211,15 +226,15 @@ class BlogView(MultiView, FeedMultiViewMixin): context = self.get_context() context.update(extra_context or {}) context.update({'entry': entry}) - return self.entry_page.render_to_response(node, request, extra_context=context) + return self.entry_page.render_to_response(request, extra_context=context) - def tag_archive_view(self, request, node=None, extra_context=None): + def tag_archive_view(self, request, extra_context=None): if not self.tag_archive_page: raise Http404 context = {} context.update(extra_context or {}) context.update({'blog': self.blog}) - return self.tag_archive_page.render_to_response(node, request, extra_context=context) + return self.tag_archive_page.render_to_response(request, extra_context=context) class Newsletter(Entity, Titled): @@ -233,8 +248,9 @@ class NewsletterArticle(Entity, Titled): newsletter = models.ForeignKey(Newsletter, related_name='articles') authors = models.ManyToManyField(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='newsletterarticles') date = models.DateTimeField(default=datetime.now) - lede = models.TextField(null=True, blank=True) - full_text = models.TextField() + lede = TemplateField(null=True, blank=True, verbose_name='Summary') + full_text = TemplateField(db_index=True) + tags = models.ManyToManyField(Tag, related_name='newsletterarticles', blank=True, null=True) class Meta: get_latest_by = 'date' @@ -247,12 +263,12 @@ register_value_model(NewsletterArticle) class NewsletterIssue(Entity, Titled): newsletter = models.ForeignKey(Newsletter, related_name='issues') - number = models.PositiveIntegerField() + numbering = models.CharField(max_length=50, help_text='For example, 04.02 for volume 4, issue 2.') articles = models.ManyToManyField(NewsletterArticle, related_name='issues') class Meta: - ordering = ['-number'] - unique_together = (('newsletter', 'number'),) + ordering = ['-numbering'] + unique_together = (('newsletter', 'numbering'),) register_value_model(NewsletterIssue) @@ -280,32 +296,39 @@ class NewsletterView(MultiView, FeedMultiViewMixin): feed_suffix = models.CharField(max_length=255, blank=False, default=FeedMultiViewMixin.feed_suffix) feeds_enabled = models.BooleanField() + list_var = 'articles' - @property - def feed_title(self): - return self.newsletter.title + def __unicode__(self): + return self.newsletter.__unicode__() - def get_subpath(self, obj): + def get_reverse_params(self, obj): if isinstance(obj, NewsletterArticle): if obj.newsletter == self.newsletter: - article_view_args = {'slug': obj.slug} + kwargs = {'slug': obj.slug} if self.article_permalink_style in 'DMY': - article_view_args.update({'year': str(obj.date.year).zfill(4)}) + kwargs.update({'year': str(obj.date.year).zfill(4)}) if self.article_permalink_style in 'DM': - article_view_args.update({'month': str(obj.date.month).zfill(2)}) + kwargs.update({'month': str(obj.date.month).zfill(2)}) if self.article_permalink_style == 'D': - article_view_args.update({'day': str(obj.date.day).zfill(2)}) - return reverse(self.article_view, urlconf=self, kwargs=article_view_args) + kwargs.update({'day': str(obj.date.day).zfill(2)}) + return self.article_view, [], kwargs elif isinstance(obj, NewsletterIssue): if obj.newsletter == self.newsletter: - return reverse(self.issue_view, urlconf=self, kwargs={'number': str(obj.number)}) + return 'issue', [], {'numbering': obj.numbering} + elif isinstance(obj, (date, datetime)): + kwargs = { + 'year': str(obj.year).zfill(4), + 'month': str(obj.month).zfill(2), + 'day': str(obj.day).zfill(2) + } + return 'articles_by_day', [], kwargs raise ViewCanNotProvideSubpath @property def urlpatterns(self): urlpatterns = patterns('', url(r'^', include(self.feed_patterns(self.get_all_articles, self.index_page, 'index'))), - url(r'^(?:%s)/(?P\d+)/' % self.issue_permalink_base, include(self.feed_patterns(self.get_articles_by_issue, self.issue_page, 'articles_by_issue'))) + url(r'^(?:%s)/(?P.+)/' % self.issue_permalink_base, include(self.feed_patterns(self.get_articles_by_issue, self.issue_page, 'issue'))) ) if self.issue_archive_page: urlpatterns += patterns('', @@ -350,10 +373,10 @@ class NewsletterView(MultiView, FeedMultiViewMixin): def get_context(self): return {'newsletter': self.newsletter} - def get_all_articles(self, request, node, extra_context=None): + def get_all_articles(self, request, extra_context=None): return self.newsletter.articles.all(), extra_context - def get_articles_by_ymd(self, request, year, month=None, day=None, node=None, extra_context=None): + def get_articles_by_ymd(self, request, year, month=None, day=None, extra_context=None): articles = self.newsletter.articles.filter(dat__year=year) if month: articles = articles.filter(date__month=month) @@ -361,16 +384,16 @@ class NewsletterView(MultiView, FeedMultiViewMixin): articles = articles.filter(date__day=day) return articles - def get_articles_by_issue(self, request, number, node=None, extra_context=None): + def get_articles_by_issue(self, request, numbering, extra_context=None): try: - issue = self.newsletter.issues.get(number=number) + issue = self.newsletter.issues.get(numbering=numbering) except: raise Http404 context = extra_context or {} context.update({'issue': issue}) return issue.articles.all(), context - def article_view(self, request, slug, year=None, month=None, day=None, node=None, extra_context=None): + def article_view(self, request, slug, year=None, month=None, day=None, extra_context=None): articles = self.newsletter.articles.all() if year: articles = articles.filter(date__year=year) @@ -382,33 +405,35 @@ class NewsletterView(MultiView, FeedMultiViewMixin): article = articles.get(slug=slug) except: raise Http404 - context = {} - context.update(extra_context or {}) - context.update({'newsletter': self.newsletter, 'article': article}) - return self.article_page.render_to_response(node, request, extra_context=context) - - def article_archive_view(self, request, year=None, month=None, day=None, node=None, extra_context=None): - if not self.article_archive_page: - raise Http404 - articles = self.newsletter.articles.all() - if year: - articles = articles.filter(date__year=year) - if month: - articles = articles.filter(date__month=month) - if day: - articles = articles.filter(date__day=day) - context = {} + context = self.get_context() context.update(extra_context or {}) - context.update({'newsletter': self.newsletter, 'year': year, 'month': month, 'day': day, 'articles': articles}) - return self.article_archive_page.render_to_response(node, request, extra_context=context) + context.update({'article': article}) + return self.article_page.render_to_response(request, extra_context=context) - def issue_archive_view(self, request, node=None, extra_context=None): + def issue_archive_view(self, request, extra_context=None): if not self.issue_archive_page: raise Http404 context = {} context.update(extra_context or {}) context.update({'newsletter': self.newsletter}) - return self.issue_archive_page.render_to_response(node, request, extra_context=context) - - def get_obj_description(self, obj): - return obj.lede or obj.full_text \ No newline at end of file + return self.issue_archive_page.render_to_response(request, extra_context=context) + + def add_item(self, feed, obj, kwargs=None): + defaults = { + 'title': obj.title, + 'author_name': ', '.join(obj.authors), + 'pubdate': obj.date, + 'description': obj.lede or obj.full_text, + 'categories': [tag.name for tag in obj.tags.all()] + } + defaults.update(kwargs or {}) + super(NewsletterView, self).add_item(feed, obj, defaults) + + def get_feed(self, feed_type, extra_context, kwargs=None): + title = self.newsletter.title + + defaults = { + 'title': title + } + defaults.update(kwargs or {}) + return super(NewsletterView, self).get_feed(feed_type, extra_context, defaults) \ No newline at end of file