X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/4e290186955957b103282f78036b344e7e38d279..8a94a61284f8af5f1b3aa42b2679bf4273d68169:/apps/catalogue/views.py
diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 102b38ee5..2a11f4bb5 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -45,16 +45,27 @@ 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():
shelves = models.Tag.objects.filter(category='set', user=request.user)
new_set_form = forms.NewSetForm()
- extra_where = "NOT catalogue_tag.category = 'set'"
- tags = models.Tag.objects.usage_for_model(models.Book, counts=True, extra={'where': [extra_where]})
- fragment_tags = models.Tag.objects.usage_for_model(models.Fragment, counts=True,
- extra={'where': ["catalogue_tag.category = 'theme'"] + [extra_where]})
+
+ tags = models.Tag.objects.exclude(category__in=('set', 'book'))
+ for tag in tags:
+ tag.count = tag.get_count()
categories = split_tags(tags)
+ fragment_tags = categories.get('theme', [])
form = forms.SearchForm()
return render_to_response('catalogue/main_page.html', locals(),
@@ -62,12 +73,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))
@@ -119,7 +147,7 @@ def tagged_object_list(request, tags=''):
if shelf_tags:
books = models.Book.tagged.with_all(shelf_tags).order_by()
- l_tags = [book.book_tag() for book in books]
+ l_tags = models.Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in books])
fragments = models.Fragment.tagged.with_any(l_tags, fragments)
# newtagging goes crazy if we just try:
@@ -136,10 +164,10 @@ 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 = [book.book_tag() for book in objects]
+ l_tags = models.Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in objects])
descendants_keys = [book.pk for book in models.Book.tagged.with_any(l_tags)]
if descendants_keys:
objects = objects.exclude(pk__in=descendants_keys)
@@ -203,8 +231,19 @@ def book_detail(request, slug):
tags = list(book.tags.filter(~Q(category='set')))
categories = split_tags(tags)
book_children = book.children.all().order_by('parent_number')
- extra_where = "catalogue_tag.category = 'theme'"
- book_themes = models.Tag.objects.related_for_model(book_tag, models.Fragment, counts=True, extra={'where': [extra_where]})
+
+ _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())
+ for tag in book_themes:
+ tag.count = theme_counter[tag.pk]
+
extra_info = book.get_extra_info_value()
form = forms.SearchForm()
@@ -223,6 +262,8 @@ def book_stub_detail(request, slug):
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'):
@@ -285,7 +326,7 @@ 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
@@ -299,7 +340,6 @@ def _tags_starting_with(prefix, user=None):
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)
@@ -316,9 +356,13 @@ def _get_result_type(match):
type = 'book'
else:
type = match.category
- return dict(models.TAG_CATEGORIES)[type]
+ 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.
@@ -374,8 +418,29 @@ def tags_starting_with(request):
# Prefix must have at least 2 characters
if len(prefix) < 2:
return HttpResponse('')
-
- return HttpResponse('\n'.join(tag.name for tag in _tags_starting_with(prefix, request.user)))
+ 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)
+ 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 =
@@ -390,13 +455,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():
@@ -404,11 +469,11 @@ def book_sets(request, slug):
new_shelves = [models.Tag.objects.get(pk=id) for id in form.cleaned_data['set_ids']]
for shelf in [shelf for shelf in old_shelves if shelf not in new_shelves]:
- shelf.book_count -= 1
+ shelf.book_count = None
shelf.save()
for shelf in [shelf for shelf in new_shelves if shelf not in old_shelves]:
- shelf.book_count += 1
+ shelf.book_count = None
shelf.save()
book.tags = new_shelves + list(book.tags.filter(~Q(category='set') | ~Q(user=request.user)))
@@ -434,7 +499,7 @@ def remove_from_shelf(request, shelf, book):
if shelf in book.tags:
models.Tag.objects.remove_tag(book, shelf)
- shelf.book_count -= 1
+ shelf.book_count = None
shelf.save()
return HttpResponse(_('Book was successfully removed from the shelf'))
@@ -469,19 +534,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))
@@ -494,6 +561,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')
@@ -512,12 +582,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
@@ -527,6 +597,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))
@@ -614,7 +686,6 @@ def import_book(request):
info = sys.exc_info()
exception = pprint.pformat(info[1])
tb = '\n'.join(traceback.format_tb(info[2]))
- _('Today is %(month)s, %(day)s.') % {'month': m, 'day': d}
return HttpResponse(_("An error occurred: %(exception)s\n\n%(tb)s") % {'exception':exception, 'tb':tb}, mimetype='text/plain')
return HttpResponse(_("Book imported successfully"))
else: