Merge branch 'master' of github.com:fnp/wolnelektury

[wolnelektury.git] / apps / opds / views.py

diff --git a/apps/opds/views.py b/apps/opds/views.py
index dc094bb..ec93da1 100644 (file)
--- a/apps/opds/views.py
+++ b/apps/opds/views.py
@@ -2,10 +2,8 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-from base64 import b64encode
 import os.path
 from urlparse import urljoin
-from urllib2 import unquote
 
 from django.contrib.syndication.views import Feed
 from django.core.urlresolvers import reverse
@@ -187,19 +185,19 @@ class AcquisitionFeed(Feed):
             return u''
 
     def item_enclosure_url(self, book):
-        return full_url(book.root_ancestor.epub_file.url)
+        return full_url(book.epub_file.url) if book.epub_file else None
 
     def item_enclosure_length(self, book):
-        return book.root_ancestor.epub_file.size
+        return book.epub_file.size if book.epub_file else None
 
 @piwik_track
 class RootFeed(Feed):
     feed_type = OPDSFeed
     title = u'Wolne Lektury'
-    link = u'http://www.wolnelektury.pl/'
+    link = u'http://wolnelektury.pl/'
     description = u"Spis utworów na stronie http://WolneLektury.pl"
     author_name = u"Wolne Lektury"
-    author_link = u"http://www.wolnelektury.pl/"
+    author_link = u"http://wolnelektury.pl/"
 
     def items(self):
         return _root_feeds
@@ -216,10 +214,10 @@ class RootFeed(Feed):
 @piwik_track
 class ByCategoryFeed(Feed):
     feed_type = OPDSFeed
-    link = u'http://www.wolnelektury.pl/'
+    link = u'http://wolnelektury.pl/'
     description = u"Spis utworów na stronie http://WolneLektury.pl"
     author_name = u"Wolne Lektury"
-    author_link = u"http://www.wolnelektury.pl/"
+    author_link = u"http://wolnelektury.pl/"
 
     def get_object(self, request, category):
         feed = [feed for feed in _root_feeds if feed['category']==category]
@@ -261,7 +259,7 @@ class ByTagFeed(AcquisitionFeed):
 
     def items(self, tag):
         books = Book.tagged.with_any([tag])
-        l_tags = Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in books])
+        l_tags = Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in books.iterator()])
         descendants_keys = [book.pk for book in Book.tagged.with_any(l_tags)]
         if descendants_keys:
             books = books.exclude(pk__in=descendants_keys)
@@ -276,7 +274,7 @@ class UserFeed(Feed):
     link = u'http://www.wolnelektury.pl/'
     description = u"Półki użytkownika na stronie http://WolneLektury.pl"
     author_name = u"Wolne Lektury"
-    author_link = u"http://www.wolnelektury.pl/"
+    author_link = u"http://wolnelektury.pl/"
 
     def get_object(self, request):
         return request.user
@@ -372,6 +370,11 @@ class SearchFeed(AcquisitionFeed):
             author = request.GET.get('author', '')
             title = request.GET.get('title', '')
             translator = request.GET.get('translator', '')
+
+            # Our client didn't handle the opds placeholders
+            if author == '{atom:author}': author = ''       
+            if title == '{atom:title}': title = ''
+            if translator == '{atom:contributor}': translator = ''
             categories = None
             fuzzy = False
 
@@ -386,7 +389,7 @@ class SearchFeed(AcquisitionFeed):
 
             if author:
                 print "narrow to author %s" % author
-                hint.tags(srch.search_tags(author, filter=srch.term_filter(Term('tag_category', 'author'))))
+                hint.tags(srch.search_tags(author, filt=srch.term_filter(Term('tag_category', 'author'))))
 
             if translator:
                 print "filter by translator %s" % translator
@@ -403,7 +406,7 @@ class SearchFeed(AcquisitionFeed):
             if title:
                 print "hint by book title %s" % title
                 q = srch.make_phrase(srch.get_tokens(title, field='title'), field='title')
-                hint.books(*srch.search_books(q, filter=flt))
+                hint.books(*srch.search_books(q, filt=flt))
 
             toks = srch.get_tokens(query)
             print "tokens: %s" % toks
@@ -430,7 +433,7 @@ class SearchFeed(AcquisitionFeed):
                         srch.make_phrase(srch.get_tokens(q, field=fld), field=fld)))
 
             flt = srch.chain_filters(filters)
-            books = srch.search_books(TermQuery(Term('is_book', 'true')), filter=flt)
+            books = srch.search_books(TermQuery(Term('is_book', 'true')), filt=flt)
             return books
 
     def get_link(self, query):