Small refactor in messaging.

[wolnelektury.git] / src / catalogue / feeds.py

diff --git a/src/catalogue/feeds.py b/src/catalogue/feeds.py
index f0305e7..8658c8c 100644 (file)
--- a/src/catalogue/feeds.py
+++ b/src/catalogue/feeds.py
@@ -39,6 +39,7 @@ class AudiobookFeed(Feed):
 
     def items(self, args):
         objects = models.BookMedia.objects.order_by('-uploaded_at')
 
     def items(self, args):
         objects = models.BookMedia.objects.order_by('-uploaded_at')

+        objects = objects.filter(book__findable=True)

         if type == 'all':
             objects = objects.filter(type__in=('mp3', 'ogg', 'daisy'))
         else:
         if type == 'all':
             objects = objects.filter(type__in=('mp3', 'ogg', 'daisy'))
         else:


@@ -55,13 +56,14 @@ class AudiobookFeed(Feed):
 
     def item_description(self, item):
         lines = []
 
     def item_description(self, item):
         lines = []

-        artist = item.extra_info.get('artist_name', None)
+        extra_info = item.get_extra_info_json()
+        artist = extra_info.get('artist_name', None)

         if artist is not None:
         if artist is not None:

-            lines.append(u'Czyta: %s' % artist)
-        director = item.extra_info.get('director_name', None)
+            lines.append('Czyta: %s' % artist)
+        director = extra_info.get('director_name', None)

         if director is not None:
         if director is not None:

-            lines.append(u'Reżyseria: %s' % director)
-        return u'<br/>\n'.join(lines)
+            lines.append('Reżyseria: %s' % director)
+        return '<br/>\n'.join(lines)

 
     def item_link(self, item):
         return item.book.get_absolute_url()
 
     def item_link(self, item):
         return item.book.get_absolute_url()