from catalogue.feeds import AudiobookFeed
from catalogue.models import Book
from picture.models import Picture
+from catalogue.views import CustomPDFFormView
+
+ SLUG = r'[a-z0-9-]*'
+
urlpatterns = patterns('picture.views',
# pictures - currently pictures are coupled with catalogue, hence the url is here
url(r'^obraz/?$', 'picture_list'),
- url(r'^obraz/(?P<picture>%s)/?$' % Picture.URLID_RE, 'picture_detail')
+ url(r'^obraz/(?P<picture>%s)/?$' % SLUG, 'picture_detail')
) + \
patterns('catalogue.views',
url(r'^$', 'catalogue', name='catalogue'),
url(r'^polki/(?P<shelf>[a-zA-Z0-9-]+)/formaty/$', 'shelf_book_formats', name='shelf_book_formats'),
- url(r'^polki/(?P<shelf>[a-zA-Z0-9-]+)/(?P<book>%s)/usun$' % Book.URLID_RE, 'remove_from_shelf', name='remove_from_shelf'),
+ url(r'^polki/(?P<shelf>[a-zA-Z0-9-]+)/(?P<slug>%s)/usun$' % SLUG, 'remove_from_shelf', name='remove_from_shelf'),
url(r'^polki/$', 'user_shelves', name='user_shelves'),
url(r'^polki/(?P<slug>[a-zA-Z0-9-]+)/usun/$', 'delete_shelf', name='delete_shelf'),
url(r'^polki/(?P<slug>[a-zA-Z0-9-]+)\.zip$', 'download_shelf', name='download_shelf'),
url(r'^lektury/', 'book_list', name='book_list'),
url(r'^audiobooki/$', 'audiobook_list', name='audiobook_list'),
url(r'^daisy/$', 'daisy_list', name='daisy_list'),
- url(r'^lektura/(?P<book>%s)/polki/' % Book.URLID_RE, 'book_sets', name='book_shelves'),
+ url(r'^lektura/(?P<book>%s)/polki/' % SLUG, 'book_sets', name='book_shelves'),
url(r'^polki/nowa/$', 'new_set', name='new_set'),
url(r'^tags/$', 'tags_starting_with', name='hint'),
url(r'^jtags/$', 'json_tags_starting_with', name='jhint'),
url(r'^zip/pdf\.zip$', 'download_zip', {'format': 'pdf', 'slug': None}, 'download_zip_pdf'),
url(r'^zip/epub\.zip$', 'download_zip', {'format': 'epub', 'slug': None}, 'download_zip_epub'),
url(r'^zip/mobi\.zip$', 'download_zip', {'format': 'mobi', 'slug': None}, 'download_zip_mobi'),
- url(r'^zip/mp3/(?P<book>%s)\.zip' % Book.FILEID_RE, 'download_zip', {'format': 'mp3'}, 'download_zip_mp3'),
- url(r'^zip/ogg/(?P<book>%s)\.zip' % Book.FILEID_RE, 'download_zip', {'format': 'ogg'}, 'download_zip_ogg'),
+ url(r'^zip/mp3/(?P<slug>%s)\.zip' % SLUG, 'download_zip', {'format': 'mp3'}, 'download_zip_mp3'),
+ url(r'^zip/ogg/(?P<slug>%s)\.zip' % SLUG, 'download_zip', {'format': 'ogg'}, 'download_zip_ogg'),
# Public interface. Do not change this URLs.
- url(r'^lektura/(?P<book>%s)\.html$' % Book.FILEID_RE, 'book_text', name='book_text'),
- url(r'^lektura/(?P<book>%s)/audiobook/$' % Book.URLID_RE, 'player', name='book_player'),
- url(r'^lektura/(?P<book>%s)/$' % Book.URLID_RE, 'book_detail', name='book_detail'),
- url(r'^lektura/(?P<book>%s)/motyw/(?P<theme_slug>[a-zA-Z0-9-]+)/$' % Book.URLID_RE,
+ url(r'^lektura/(?P<slug>%s)\.html$' % SLUG, 'book_text', name='book_text'),
+ url(r'^lektura/(?P<slug>%s)/audiobook/$' % SLUG, 'player', name='book_player'),
+ url(r'^lektura/(?P<slug>%s)/$' % SLUG, 'book_detail', name='book_detail'),
+ url(r'^lektura/(?P<slug>%s)/motyw/(?P<theme_slug>[a-zA-Z0-9-]+)/$' % SLUG,
'book_fragments', name='book_fragments'),
url(r'^(?P<tags>[a-zA-Z0-9-/]*)/$', 'tagged_object_list', name='tagged_object_list'),
url(r'^audiobooki/(?P<type>mp3|ogg|daisy|all).xml$', AudiobookFeed(), name='audiobook_feed'),
- url(r'^custompdf/(?P<book_fileid>%s).pdf' % Book.FILEID_RE, 'download_custom_pdf'),
- url(r'^custompdf$', CustomPDFFormView(), name='custom_pdf_form')
++ url(r'^custompdf$', CustomPDFFormView(), name='custom_pdf_form'),
+ url(r'^custompdf/(?P<slug>%s).pdf' % SLUG, 'download_custom_pdf'),
+
)
from django.utils.translation import ugettext as _
from django.views.generic.list_detail import object_list
-from ajaxable.utils import LazyEncoder, JSONResponse
+from ajaxable.utils import LazyEncoder, JSONResponse, AjaxableFormView
+
from catalogue import models
from catalogue import forms
from catalogue.utils import (split_tags, AttachmentHttpResponse,
context_instance=RequestContext(request))
- def book_fragments(request, book, theme_slug):
- kwargs = models.Book.split_urlid(book)
- if kwargs is None:
- raise Http404
- book = get_object_or_404(models.Book, **kwargs)
+ def book_fragments(request, slug, theme_slug):
+ book = get_object_or_404(models.Book, slug=slug)
book_tag = book.book_tag()
theme = get_object_or_404(models.Tag, slug=theme_slug, category='theme')
context_instance=RequestContext(request))
- def book_detail(request, book):
- kwargs = models.Book.split_urlid(book)
- if kwargs is None:
- raise Http404
+ def book_detail(request, slug):
try:
- book = models.Book.objects.get(**kwargs)
+ book = models.Book.objects.get(slug=slug)
except models.Book.DoesNotExist:
return pdcounter_views.book_stub_detail(request, kwargs['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', 'sort_key')
-
+
_book = book
parents = []
while _book.parent:
context_instance=RequestContext(request))
- def player(request, book):
- kwargs = models.Book.split_urlid(book)
- if kwargs is None:
- raise Http404
- book = get_object_or_404(models.Book, **kwargs)
+ def player(request, slug):
+ book = get_object_or_404(models.Book, slug=slug)
if not book.has_media('mp3'):
raise Http404
context_instance=RequestContext(request))
- def book_text(request, book):
- kwargs = models.Book.split_fileid(book)
- if kwargs is None:
- raise Http404
- book = get_object_or_404(models.Book, **kwargs)
+ def book_text(request, slug):
+ book = get_object_or_404(models.Book, slug=slug)
if not book.has_html_file():
raise Http404
context_instance=RequestContext(request))
else:
form = PublishingSuggestForm(initial={"books": prefix + ", "})
- return render_to_response('catalogue/search_no_hits.html',
+ return render_to_response('catalogue/search_no_hits.html',
{'tags':tag_list, 'prefix':prefix, "pubsuggest_form": form},
context_instance=RequestContext(request))
if len(prefix) < 2:
return HttpResponse('')
tags_list = []
- result = ""
+ result = ""
for tag in _tags_starting_with(prefix, request.user):
if not tag.name in tags_list:
result += "\n" + tag.name
context_instance=RequestContext(request))
@cache.never_cache
- def book_sets(request, book):
+ def book_sets(request, slug):
if not request.user.is_authenticated():
return HttpResponse(_('<p>To maintain your shelves you need to be logged in.</p>'))
- kwargs = models.Book.split_urlid(book)
- if kwargs is None:
- raise Http404
- book = get_object_or_404(models.Book, **kwargs)
+ 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)
@login_required
@require_POST
@cache.never_cache
- def remove_from_shelf(request, shelf, book):
- kwargs = models.Book.split_urlid(book)
- if kwargs is None:
- raise Http404
- book = get_object_or_404(models.Book, **kwargs)
+ def remove_from_shelf(request, shelf, slug):
+ book = get_object_or_404(models.Book, slug=slug)
shelf = get_object_or_404(models.Tag, slug=shelf, category='set', user=request.user)
archive = zipfile.ZipFile(temp, 'w')
for book in collect_books(models.Book.tagged.with_all(shelf)):
- fileid = book.fileid()
for ebook_format in models.Book.ebook_formats:
if ebook_format in formats and book.has_media(ebook_format):
filename = book.get_media(ebook_format).path
- archive.write(filename, str('%s.%s' % (fileid, ebook_format)))
+ archive.write(filename, str('%s.%s' % (book.slug, ebook_format)))
archive.close()
response = HttpResponse(content_type='application/zip', mimetype='application/x-zip-compressed')
return HttpResponse(tag.description)
- def download_zip(request, format, book=None):
- kwargs = models.Book.split_fileid(book)
-
+ def download_zip(request, format, slug=None):
url = None
if format in models.Book.ebook_formats:
url = models.Book.zip_format(format)
- elif format in ('mp3', 'ogg') and kwargs is not None:
- book = get_object_or_404(models.Book, **kwargs)
+ elif format in ('mp3', 'ogg') and slug is not None:
+ book = get_object_or_404(models.Book, slug=slug)
url = book.zip_audiobooks(format)
else:
raise Http404('No format specified for zip package')
return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?='))
- def download_custom_pdf(request, book_fileid, method='GET'):
- kwargs = models.Book.split_fileid(book_fileid)
- if kwargs is None:
- raise Http404
- book = get_object_or_404(models.Book, **kwargs)
-def download_custom_pdf(request, slug):
++def download_custom_pdf(request, slug, method='GET'):
+ book = get_object_or_404(models.Book, slug=slug)
- if request.method == 'GET':
- form = forms.CustomPDFForm(request.GET)
+ if request.method == method:
+ form = forms.CustomPDFForm(method == 'GET' and request.GET or request.POST)
if form.is_valid():
cust = form.customizations
pdf_file = models.get_customized_pdf_path(book, cust)
-
+
if not path.exists(pdf_file):
result = async_build_pdf.delay(book.id, cust, pdf_file)
result.wait()
- return AttachmentHttpResponse(file_name=("%s.pdf" % book_fileid), file_path=pdf_file, mimetype="application/pdf")
+ return AttachmentHttpResponse(file_name=("%s.pdf" % book.slug), file_path=pdf_file, mimetype="application/pdf")
else:
raise Http404(_('Incorrect customization options for PDF'))
else:
raise Http404(_('Bad method'))
+
+
+class CustomPDFFormView(AjaxableFormView):
+ form_class = forms.CustomPDFForm
+ title = _('Download custom PDF')
+ submit = _('Download')
+
+ def __call__(self, request):
+ if request.method == 'POST':
+ return download_custom_pdf(request, request.GET['book_id'], method='POST')
+ else:
+ return super(CustomPDFFormView, self).__call__(request)
fnp / wolnelektury.git / commitdiff