From: Radek Czajka Date: Thu, 10 Feb 2011 14:16:43 +0000 (+0100) Subject: author as category in audiobook feeds X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/b103db94b4180538b3bc7015192bff97542dc929?ds=sidebyside;hp=1c07de888eadc1333264d627ffdff1066a5f01b9 author as category in audiobook feeds --- diff --git a/apps/catalogue/feeds.py b/apps/catalogue/feeds.py index c79e05809..eadfa2fa6 100644 --- a/apps/catalogue/feeds.py +++ b/apps/catalogue/feeds.py @@ -5,6 +5,7 @@ from django.contrib.sites.models import Site from django.contrib.syndication.views import Feed from django.core.urlresolvers import reverse +from django.db.models import Q from catalogue import models @@ -29,25 +30,34 @@ class AudiobookFeed(Feed): } def get_object(self, request, type): - return type + return {'type': type, 'all': 'all' in request.GET} - def title(self, type): - return self.titles[type] + def title(self, args): + return self.titles[args['type']] - def link(self, type): - return reverse('audiobook_feed', args=(type,)) + def link(self, args): + return reverse('audiobook_feed', args=(args['type'],)) - def items(self, type): + def items(self, args): objects = models.BookMedia.objects.order_by('-uploaded_at') if type == 'all': objects = objects.filter(type__in=('mp3', 'ogg', 'daisy')) else: - objects = objects.filter(type=type)[:20] + objects = objects.filter(type=args['type']) + if not args['all']: + objects = objects[:50] return objects def item_title(self, item): return item.name + def item_categories(self, item): + authors = set() + for book in item.book_set.all(): + for author in book.tags.filter(category='author'): + authors.add(author.name) + return sorted(authors) + def item_description(self, item): lines = [] artist = item.get_extra_info_value().get('artist_name', None)