import traceback
import re
import itertools
-from operator import itemgetter
from datetime import datetime
from django.conf import settings
from django.template import RequestContext
from django.shortcuts import render_to_response, get_object_or_404
-from django.http import HttpResponse, HttpResponseRedirect, Http404
+from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect
from django.core.urlresolvers import reverse
from django.db.models import Q
from django.contrib.auth.decorators import login_required, user_passes_test
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
from slughifi import slughifi
books_by_parent = {}
books = models.Book.objects.all().order_by('parent_number', 'title').only('title', 'parent', 'slug')
if filter:
- books = books.filter(filter)
+ books = books.filter(filter).distinct()
book_ids = set((book.pk for book in books))
for book in books:
parent = book.parent_id
def audiobook_list(request):
- return book_list(request, ~Q(mp3_file='') | ~Q(ogg_file=''),
+ return book_list(request, Q(medias__type='mp3') | Q(medias__type='ogg'),
template_name='catalogue/audiobook_list.html')
def daisy_list(request):
- return book_list(request, ~Q(daisy_file=''),
+ return book_list(request, Q(medias__type='daisy'),
template_name='catalogue/daisy_list.html')
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)
+ except models.Tag.UrlDeprecationWarning, e:
+ return HttpResponsePermanentRedirect(reverse('tagged_object_list', args=['/'.join(tag.url_chunk for tag in e.tags)]))
try:
if len(tags) > settings.MAX_TAG_LIST:
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:
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(
'categories': categories,
'only_shelf': only_shelf,
'only_author': only_author,
- 'pd_counter': pd_counter,
'only_my_shelf': only_my_shelf,
'formats_form': forms.DownloadFormatsForm(),
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_children = book.children.all().order_by('parent_number', 'title')
_book = book
parents = []
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():
return Q(**kwargs)
+def _word_starts_with_regexp(prefix):
+ prefix = _no_diacritics_regexp(unicode_re_escape(prefix))
+ return ur"(^|(?<=[^\wąćęłńóśźżĄĆĘŁŃÓŚŹŻ]))%s" % prefix
+
+
def _sqlite_word_starts_with(name, prefix):
""" version of _word_starts_with for SQLite
SQLite in Django uses Python re module
"""
kwargs = {}
- prefix = _no_diacritics_regexp(unicode_re_escape(prefix))
- kwargs['%s__iregex' % name] = ur"(^|(?<=[^\wąćęłńóśźżĄĆĘŁŃÓŚŹŻ]))%s" % prefix
+ kwargs['%s__iregex' % name] = _word_starts_with_regexp(prefix)
return Q(**kwargs)
-if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.sqlite3':
+if hasattr(settings, 'DATABASES'):
+ if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.sqlite3':
+ _word_starts_with = _sqlite_word_starts_with
+elif settings.DATABASE_ENGINE == 'sqlite3':
_word_starts_with = _sqlite_word_starts_with
+class App():
+ def __init__(self, name, view):
+ self.name = name
+ self._view = view
+ self.lower = name.lower()
+ self.category = 'application'
+ def view(self):
+ return reverse(*self._view)
+
+_apps = (
+ App(u'Leśmianator', (u'lesmianator', )),
+ )
+
+
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)
+
+ prefix_regexp = re.compile(_word_starts_with_regexp(prefix))
+ return list(books) + list(tags) + [app for app in _apps if prefix_regexp.search(app.lower)] + 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])}
)
+ elif isinstance(match, App):
+ return match.view()
+ 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
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,
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 = tuple(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):
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)
+ if request.GET.get('mozhint', ''):
+ result = [prefix, tags_list]
+ else:
+ result = {"matches": tags_list}
+ return JSONResponse(result, callback)
# ====================
# = Shelf management =
if form.is_valid():
formats = form.cleaned_data['formats']
if len(formats) == 0:
- formats = ['pdf', 'epub', 'odt', 'txt', 'mp3', 'ogg', 'daisy']
+ formats = ['pdf', 'epub', 'odt', 'txt']
# Create a ZIP archive
temp = tempfile.TemporaryFile()
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))
+ if 'odt' in formats and book.has_media("odt"):
+ for file in book.get_media("odt"):
+ filename = file.file.path
+ archive.write(filename, str('%s.odt' % slughifi(file.name)))
if 'txt' in formats and book.txt_file:
filename = book.txt_file.path
archive.write(filename, str('%s.txt' % book.slug))
- if 'mp3' in formats and book.mp3_file:
- filename = book.mp3_file.path
- archive.write(filename, str('%s.mp3' % book.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')
"""
shelf = get_object_or_404(models.Tag, slug=shelf, category='set')
- formats = {'pdf': False, 'epub': False, 'odt': False, 'txt': False, 'mp3': False, 'ogg': False, 'daisy': False}
+ formats = {'pdf': False, 'epub': False, 'odt': False, 'txt': False}
for book in collect_books(models.Book.tagged.with_all(shelf)):
if book.pdf_file:
formats['pdf'] = True
if book.root_ancestor.epub_file:
formats['epub'] = True
- if book.odt_file:
- formats['odt'] = True
if book.txt_file:
formats['txt'] = True
- if book.mp3_file:
- formats['mp3'] = True
- if book.ogg_file:
- formats['ogg'] = True
- if book.daisy_file:
- formats['daisy'] = True
+ for format in ('odt',):
+ if book.has_media(format):
+ formats[format] = True
return HttpResponse(LazyEncoder().encode(formats))
def xmls(request):
""""
Create a zip archive with all XML files.
+ This should be removed when we have real API.
"""
temp = tempfile.TemporaryFile()
archive = zipfile.ZipFile(temp, 'w')
temp.seek(0)
response.write(temp.read())
return response
-
-
-@cache.never_cache
-def epubs(request):
- """"
- Create a tar archive with all EPUB files, segregated to directories.
- """
-
- temp = tempfile.TemporaryFile()
- archive = tarfile.TarFile(fileobj=temp, mode='w')
-
- for book in models.Book.objects.exclude(epub_file=''):
- archive.add(book.epub_file.path, (u'%s/%s.epub' % (book.get_extra_info_value()['author'], book.slug)).encode('utf-8'))
- archive.close()
-
- response = HttpResponse(content_type='application/tar', mimetype='application/x-tar')
- response['Content-Disposition'] = 'attachment; filename=epubs.tar'
- response['Content-Length'] = temp.tell()
-
- temp.seek(0)
- response.write(temp.read())
- return response
fnp / wolnelektury.git / blobdiff