X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/9771b4edcbb556927312f624de6263395f82e0ba..bf3f18ce9313f4929ff327fbf12803157de171cb:/apps/catalogue/urls.py?ds=inline diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py index dce1b8f10..b7c59a055 100644 --- a/apps/catalogue/urls.py +++ b/apps/catalogue/urls.py @@ -2,51 +2,80 @@ # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url +from django.db.models import Max +from django.views.generic import ListView, RedirectView from catalogue.feeds import AudiobookFeed -from catalogue.models import Book -from picture.models import Picture from catalogue.views import CustomPDFFormView +from catalogue.models import Book + + +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%s)/?$' % Picture.URLID_RE, 'picture_detail') - ) + \ - patterns('catalogue.views', + # pictures - currently pictures are coupled with catalogue, hence the url is here + url(r'^obraz/$', 'picture_list_thumb', name='picture_list_thumb'), + url(r'^obraz/(?P%s).html$' % SLUG, 'picture_viewer', name='picture_viewer'), + url(r'^obraz/(?P%s)/$' % SLUG, 'picture_detail'), + + url(r'^p/(?P\d+)/mini\.(?P.+)\.html', 'picture_mini', name='picture_mini'), + url(r'^p/(?P\d+)/short\.(?P.+)\.html', 'picture_short', name='picture_short'), + url(r'^pa/(?P\d+)/short\.(?P.+)\.html', 'picturearea_short', name='picture_area_short'), +) + +urlpatterns += patterns('', + # old search page - redirected + url(r'^szukaj/$', RedirectView.as_view( + url='/szukaj/', query_string=True, permanent=True)), +) + +urlpatterns += patterns('catalogue.views', url(r'^$', 'catalogue', name='catalogue'), - url(r'^polki/(?P[a-zA-Z0-9-]+)/formaty/$', 'shelf_book_formats', name='shelf_book_formats'), - url(r'^polki/(?P[a-zA-Z0-9-]+)/(?P%s)/usun$' % Book.URLID_RE, 'remove_from_shelf', name='remove_from_shelf'), - url(r'^polki/$', 'user_shelves', name='user_shelves'), - url(r'^polki/(?P[a-zA-Z0-9-]+)/usun/$', 'delete_shelf', name='delete_shelf'), - url(r'^polki/(?P[a-zA-Z0-9-]+)\.zip$', 'download_shelf', name='download_shelf'), - url(r'^lektury/', 'book_list', name='book_list'), + + url(r'^lektury/$', 'book_list', name='book_list'), + url(r'^lektury/(?P[a-zA-Z0-9-]+)/$', 'collection', name='collection'), url(r'^audiobooki/$', 'audiobook_list', name='audiobook_list'), url(r'^daisy/$', 'daisy_list', name='daisy_list'), - url(r'^lektura/(?P%s)/polki/' % Book.URLID_RE, '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'^szukaj/$', 'search', name='old_search'), + url(r'^jtags/?$', 'json_tags_starting_with', name='jhint'), + url(r'^nowe/$', ListView.as_view( + queryset=Book.objects.filter(parent=None).order_by('-created_at'), + template_name='catalogue/recent_list.html'), name='recent_list'), + url(r'^nowe/audiobooki/$', ListView.as_view( + queryset=Book.objects.filter(media__type='ogg').annotate(m=Max('media__uploaded_at')).order_by('-m'), + template_name='catalogue/recent_audiobooks_list.html'), name='recent_audiobooks_list'), + url(r'^nowe/daisy/$', ListView.as_view( + queryset=Book.objects.filter(media__type='daisy').annotate(m=Max('media__uploaded_at')).order_by('-m'), + template_name='catalogue/recent_daisy_list.html'), name='recent_daisy_list'), + + url(r'^custompdf/(?P%s)/$' % SLUG, CustomPDFFormView(), name='custom_pdf_form'), + + url(r'^audiobooki/(?Pmp3|ogg|daisy|all).xml$', AudiobookFeed(), name='audiobook_feed'), + # zip 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%s)\.zip' % Book.FILEID_RE, 'download_zip', {'format': 'mp3'}, 'download_zip_mp3'), - url(r'^zip/ogg/(?P%s)\.zip' % Book.FILEID_RE, 'download_zip', {'format': 'ogg'}, 'download_zip_ogg'), + url(r'^zip/mp3/(?P%s)\.zip' % SLUG, 'download_zip', {'format': 'mp3'}, 'download_zip_mp3'), + url(r'^zip/ogg/(?P%s)\.zip' % SLUG, 'download_zip', {'format': 'ogg'}, 'download_zip_ogg'), # Public interface. Do not change this URLs. - url(r'^lektura/(?P%s)\.html$' % Book.FILEID_RE, 'book_text', name='book_text'), - url(r'^lektura/(?P%s)/audiobook/$' % Book.URLID_RE, 'player', name='book_player'), - url(r'^lektura/(?P%s)/$' % Book.URLID_RE, 'book_detail', name='book_detail'), - url(r'^lektura/(?P%s)/motyw/(?P[a-zA-Z0-9-]+)/$' % Book.URLID_RE, + url(r'^lektura/(?P%s)\.html$' % SLUG, 'book_text', name='book_text'), + url(r'^lektura/(?P%s)/audiobook/$' % SLUG, 'player', name='book_player'), + url(r'^lektura/(?P%s)/$' % SLUG, 'book_detail', name='book_detail'), + url(r'^lektura/(?P%s)/motyw/(?P[a-zA-Z0-9-]+)/$' % SLUG, 'book_fragments', name='book_fragments'), - url(r'^(?P[a-zA-Z0-9-/]*)/$', 'tagged_object_list', name='tagged_object_list'), - - url(r'^audiobooki/(?Pmp3|ogg|daisy|all).xml$', AudiobookFeed(), name='audiobook_feed'), + # Includes. + url(r'^(?P[^/]+)\.json$', 'catalogue_json'), + url(r'^b/(?P\d+)/mini\.(?P.+)\.html', 'book_mini', name='catalogue_book_mini'), + url(r'^b/(?P\d+)/mini_nolink\.(?P.+)\.html', 'book_mini', {'with_link': False}, name='catalogue_book_mini_nolink'), + url(r'^b/(?P\d+)/short\.(?P.+)\.html', 'book_short', name='catalogue_book_short'), + url(r'^b/(?P\d+)/wide\.(?P.+)\.html', 'book_wide', name='catalogue_book_wide'), + url(r'^f/(?P\d+)/promo\.(?P.+)\.html', 'fragment_promo', name='catalogue_fragment_promo'), + url(r'^f/(?P\d+)/short\.(?P.+)\.html', 'fragment_short', name='catalogue_fragment_short'), - url(r'^custompdf/(?P%s).pdf' % Book.FILEID_RE, 'download_custom_pdf'), - url(r'^custompdf$', CustomPDFFormView(), name='custom_pdf_form') -) + # This should be the last pattern. + url(r'^(?P[a-zA-Z0-9-/]*)/$', 'tagged_object_list', name='tagged_object_list'), +)