X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/97d7b46edcc444cacafc2e4824618bfc322339c0..3cfabcc9207625d205bacdb169a0661d9579e849:/apps/catalogue/views.py
diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 732221018..7bb82fd4a 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -34,6 +34,8 @@ from catalogue import models
from catalogue import forms
from catalogue.utils import split_tags
from newtagging import views as newtagging_views
+from pdcounter import models as pdcounter_models
+from pdcounter import views as pdcounter_views
staff_required = user_passes_test(lambda user: user.is_staff)
@@ -45,6 +47,16 @@ class LazyEncoder(simplejson.JSONEncoder):
return force_unicode(obj)
return obj
+# shortcut for JSON reponses
+class JSONResponse(HttpResponse):
+ def __init__(self, data={}, callback=None, **kwargs):
+ # get rid of mimetype
+ kwargs.pop('mimetype', None)
+ data = simplejson.dumps(data)
+ if callback:
+ data = callback + "(" + data + ");"
+ super(JSONResponse, self).__init__(data, mimetype="application/json", **kwargs)
+
def main_page(request):
if request.user.is_authenticated():
@@ -63,12 +75,29 @@ def main_page(request):
def book_list(request):
- books = models.Book.objects.all()
form = forms.SearchForm()
- books_by_first_letter = SortedDict()
- for book in books:
- books_by_first_letter.setdefault(book.title[0], []).append(book)
+ books_by_parent = {}
+ for book in models.Book.objects.all().order_by('parent_number'):
+ books_by_parent.setdefault(book.parent, []).append(book)
+
+ orphans = []
+ books_by_author = SortedDict()
+ books_nav = SortedDict()
+ for tag in models.Tag.objects.filter(category='author'):
+ books_by_author[tag] = []
+ if books_nav.has_key(tag.sort_key[0]):
+ books_nav[tag.sort_key[0]].append(tag)
+ else:
+ books_nav[tag.sort_key[0]] = [tag]
+
+ for book in books_by_parent[None]:
+ authors = list(book.tags.filter(category='author'))
+ if authors:
+ for author in authors:
+ books_by_author[author].append(book)
+ else:
+ orphans.append(book)
return render_to_response('catalogue/book_list.html', locals(),
context_instance=RequestContext(request))
@@ -92,7 +121,11 @@ def tagged_object_list(request, tags=''):
try:
tags = models.Tag.get_tag_list(tags)
except models.Tag.DoesNotExist:
- raise Http404
+ chunks = tags.split('/')
+ if len(chunks) == 2 and chunks[0] == 'autor':
+ return pdcounter_views.author_detail(request, chunks[1])
+ else:
+ raise Http404
except models.Tag.MultipleObjectsReturned, e:
return differentiate_tags(request, e.tags, e.ambiguous_slugs)
@@ -110,7 +143,7 @@ def tagged_object_list(request, tags=''):
only_shelf = shelf_is_set and len(tags) == 1
only_my_shelf = only_shelf and request.user.is_authenticated() and request.user == tags[0].user
- objects = only_author = pd_counter = None
+ objects = only_author = None
categories = {}
if theme_is_set:
@@ -137,7 +170,7 @@ def tagged_object_list(request, tags=''):
objects = fragments
else:
# get relevant books and their tags
- objects = models.Book.tagged.with_all(tags).order_by()
+ objects = models.Book.tagged.with_all(tags)
if not shelf_is_set:
# eliminate descendants
l_tags = models.Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in objects])
@@ -163,7 +196,6 @@ def tagged_object_list(request, tags=''):
if not objects:
only_author = len(tags) == 1 and tags[0].category == 'author'
- pd_counter = only_author and tags[0].goes_to_pd()
objects = models.Book.objects.none()
return object_list(
@@ -174,7 +206,6 @@ def tagged_object_list(request, tags=''):
'categories': categories,
'only_shelf': only_shelf,
'only_author': only_author,
- 'pd_counter': pd_counter,
'only_my_shelf': only_my_shelf,
'formats_form': forms.DownloadFormatsForm(),
@@ -198,12 +229,19 @@ def book_detail(request, slug):
try:
book = models.Book.objects.get(slug=slug)
except models.Book.DoesNotExist:
- return book_stub_detail(request, slug)
+ return pdcounter_views.book_stub_detail(request, slug)
book_tag = book.book_tag()
tags = list(book.tags.filter(~Q(category='set')))
categories = split_tags(tags)
book_children = book.children.all().order_by('parent_number')
+
+ _book = book
+ parents = []
+ while _book.parent:
+ parents.append(_book.parent)
+ _book = _book.parent
+ parents = reversed(parents)
theme_counter = book.theme_counter
book_themes = models.Tag.objects.filter(pk__in=theme_counter.keys())
@@ -217,17 +255,10 @@ def book_detail(request, slug):
context_instance=RequestContext(request))
-def book_stub_detail(request, slug):
- book = get_object_or_404(models.BookStub, slug=slug)
- pd_counter = book.pd
- form = forms.SearchForm()
-
- return render_to_response('catalogue/book_stub_detail.html', locals(),
- context_instance=RequestContext(request))
-
-
def book_text(request, slug):
book = get_object_or_404(models.Book, slug=slug)
+ if not book.has_html_file():
+ raise Http404
book_themes = {}
for fragment in book.fragments.all():
for theme in fragment.tags.filter(category='theme'):
@@ -290,42 +321,49 @@ def _sqlite_word_starts_with(name, prefix):
return Q(**kwargs)
-if settings.DATABASE_ENGINE == 'sqlite3':
+if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.sqlite3':
_word_starts_with = _sqlite_word_starts_with
def _tags_starting_with(prefix, user=None):
prefix = prefix.lower()
- book_stubs = models.BookStub.objects.filter(_word_starts_with('title', prefix))
+ # PD counter
+ book_stubs = pdcounter_models.BookStub.objects.filter(_word_starts_with('title', prefix))
+ authors = pdcounter_models.Author.objects.filter(_word_starts_with('name', prefix))
+
books = models.Book.objects.filter(_word_starts_with('title', prefix))
- book_stubs = filter(lambda x: x not in books, book_stubs)
tags = models.Tag.objects.filter(_word_starts_with('name', prefix))
if user and user.is_authenticated():
tags = tags.filter(~Q(category='book') & (~Q(category='set') | Q(user=user)))
else:
tags = tags.filter(~Q(category='book') & ~Q(category='set'))
- return list(books) + list(tags) + list(book_stubs)
+ return list(books) + list(tags) + list(book_stubs) + list(authors)
def _get_result_link(match, tag_list):
- if isinstance(match, models.Book) or isinstance(match, models.BookStub):
- return match.get_absolute_url()
- else:
+ if isinstance(match, models.Tag):
return reverse('catalogue.views.tagged_object_list',
kwargs={'tags': '/'.join(tag.url_chunk for tag in tag_list + [match])}
)
+ else:
+ return match.get_absolute_url()
+
def _get_result_type(match):
- if isinstance(match, models.Book) or isinstance(match, models.BookStub):
+ if isinstance(match, models.Book) or isinstance(match, pdcounter_models.BookStub):
type = 'book'
else:
type = match.category
return type
+def books_starting_with(prefix):
+ prefix = prefix.lower()
+ return models.Book.objects.filter(_word_starts_with('title', prefix))
+
def find_best_matches(query, user=None):
- """ Finds a Book, Tag or Bookstub best matching a query.
+ """ Finds a Book, Tag, BookStub or Author best matching a query.
Returns a with:
- zero elements when nothing is found,
@@ -340,11 +378,21 @@ def find_best_matches(query, user=None):
raise ValueError("query must have at least two characters")
result = tuple(_tags_starting_with(query, user))
+ # remove pdcounter stuff
+ book_titles = set(match.pretty_title().lower() for match in result
+ if isinstance(match, models.Book))
+ authors = set(match.name.lower() for match in result
+ if isinstance(match, models.Tag) and match.category=='author')
+ result = (res for res in result if not (
+ (isinstance(res, pdcounter_models.BookStub) and res.pretty_title().lower() in book_titles)
+ or (isinstance(res, pdcounter_models.Author) and res.name.lower() in authors)
+ ))
+
exact_matches = tuple(res for res in result if res.name.lower() == query)
if exact_matches:
return exact_matches
else:
- return result[:1]
+ return tuple(result)[:1]
def search(request):
@@ -386,6 +434,22 @@ def tags_starting_with(request):
tags_list.append(tag.name)
return HttpResponse(result)
+def json_tags_starting_with(request, callback=None):
+ # Callback for JSONP
+ prefix = request.GET.get('q', '')
+ callback = request.GET.get('callback', '')
+ # Prefix must have at least 2 characters
+ if len(prefix) < 2:
+ return HttpResponse('')
+ tags_list = []
+ result = ""
+ for tag in _tags_starting_with(prefix, request.user):
+ if not tag.name in tags_list:
+ result += "\n" + tag.name
+ tags_list.append(tag.name)
+ dict_result = {"matches": tags_list}
+ return JSONResponse(dict_result, callback)
+
# ====================
# = Shelf management =
# ====================
@@ -399,13 +463,13 @@ def user_shelves(request):
@cache.never_cache
def book_sets(request, slug):
+ if not request.user.is_authenticated():
+ return HttpResponse(_('To maintain your shelves you need to be logged in.
'))
+
book = get_object_or_404(models.Book, slug=slug)
user_sets = models.Tag.objects.filter(category='set', user=request.user)
book_sets = book.tags.filter(category='set', user=request.user)
- if not request.user.is_authenticated():
- return HttpResponse(_('To maintain your shelves you need to be logged in.
'))
-
if request.method == 'POST':
form = forms.ObjectSetsForm(book, request.user, request.POST)
if form.is_valid():
@@ -478,19 +542,21 @@ def download_shelf(request, slug):
if form.is_valid():
formats = form.cleaned_data['formats']
if len(formats) == 0:
- formats = ['pdf', 'epub', 'odt', 'txt', 'mp3', 'ogg']
+ formats = ['pdf', 'epub', 'odt', 'txt', 'mp3', 'ogg', 'daisy']
# Create a ZIP archive
temp = tempfile.TemporaryFile()
archive = zipfile.ZipFile(temp, 'w')
+ already = set()
for book in collect_books(models.Book.tagged.with_all(shelf)):
if 'pdf' in formats and book.pdf_file:
filename = book.pdf_file.path
archive.write(filename, str('%s.pdf' % book.slug))
- if 'epub' in formats and book.epub_file:
- filename = book.epub_file.path
- archive.write(filename, str('%s.epub' % book.slug))
+ if book.root_ancestor not in already and 'epub' in formats and book.root_ancestor.epub_file:
+ filename = book.root_ancestor.epub_file.path
+ archive.write(filename, str('%s.epub' % book.root_ancestor.slug))
+ already.add(book.root_ancestor)
if 'odt' in formats and book.odt_file:
filename = book.odt_file.path
archive.write(filename, str('%s.odt' % book.slug))
@@ -503,6 +569,9 @@ def download_shelf(request, slug):
if 'ogg' in formats and book.ogg_file:
filename = book.ogg_file.path
archive.write(filename, str('%s.ogg' % book.slug))
+ if 'daisy' in formats and book.daisy_file:
+ filename = book.daisy_file.path
+ archive.write(filename, str('%s.daisy.zip' % book.slug))
archive.close()
response = HttpResponse(content_type='application/zip', mimetype='application/x-zip-compressed')
@@ -521,12 +590,12 @@ def shelf_book_formats(request, shelf):
"""
shelf = get_object_or_404(models.Tag, slug=shelf, category='set')
- formats = {'pdf': False, 'epub': False, 'odt': False, 'txt': False, 'mp3': False, 'ogg': False}
+ formats = {'pdf': False, 'epub': False, 'odt': False, 'txt': False, 'mp3': False, 'ogg': False, 'daisy': False}
for book in collect_books(models.Book.tagged.with_all(shelf)):
if book.pdf_file:
formats['pdf'] = True
- if book.epub_file:
+ if book.root_ancestor.epub_file:
formats['epub'] = True
if book.odt_file:
formats['odt'] = True
@@ -536,6 +605,8 @@ def shelf_book_formats(request, shelf):
formats['mp3'] = True
if book.ogg_file:
formats['ogg'] = True
+ if book.daisy_file:
+ formats['daisy'] = True
return HttpResponse(LazyEncoder().encode(formats))