X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/fa491172e51c164fd620f73859788dfce2ebc9ac..ac5de8695878cb6aabf9161930af189cf5d15316:/src/documents/views.py diff --git a/src/documents/views.py b/src/documents/views.py index e87dc6db..1fe7b054 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -11,7 +11,7 @@ import os from urllib.parse import quote_plus, unquote, urlsplit, urlunsplit from django.conf import settings -from django.contrib import auth +from django.contrib import auth, messages from django.contrib.auth.models import User from django.contrib.auth.decorators import login_required, permission_required from django.urls import reverse @@ -264,7 +264,11 @@ def book_html(request, slug): return HttpResponseForbidden("Not authorized.") doc = book.wldocument(parse_dublincore=False) - html = doc.as_html(options={'gallery': "'%s'" % book.gallery_url()}) + html = doc.as_html( + gallery_url='%stmp/html/' % settings.MEDIA_URL, + gallery_path='%s/tmp/html/' % settings.MEDIA_ROOT, + base_url=request.build_absolute_uri(book.gallery_url()), + options={'gallery': "'%s'" % book.gallery_url()}) html = html.get_bytes().decode('utf-8') if html is not None else '' # response = http.HttpResponse(html, content_type='text/html') @@ -290,7 +294,7 @@ def book_pdf(request, slug, mobile=False): doc = book.wldocument() # TODO: error handling customizations = ['26pt', 'nothemes', 'nomargins', 'notoc'] if mobile else None - pdf_file = doc.as_pdf(cover=True, base_url=request.build_absolute_uri(book.gallery_path()), customizations=customizations) + pdf_file = doc.as_pdf(cover=True, base_url=request.build_absolute_uri(book.gallery_url()), customizations=customizations) from .ebook_utils import serve_file return serve_file(pdf_file.get_filename(), book.slug + '.pdf', 'application/pdf') @@ -414,9 +418,14 @@ def book(request, slug): cbook_by_slug = None if book.dc_slug: - audio_items = requests.get(f'https://audio.wolnelektury.pl/archive/book/{book.dc_slug}.json').json()['items'] - has_audio = bool(audio_items) - can_sell_audio = has_audio and all(x['project']['can_sell'] for x in audio_items) + try: + audio_items = requests.get(f'https://audio.wolnelektury.pl/archive/book/{book.dc_slug}.json').json()['items'] + except: + has_audio = None + can_sell_audio = None + else: + has_audio = bool(audio_items) + can_sell_audio = has_audio and all(x['project']['can_sell'] for x in audio_items) if book.catalogue_book is None or book.dc_slug != book.catalogue_book.slug: cbook_by_slug = catalogue.models.Book.objects.filter(slug=book.dc_slug).first() @@ -676,6 +685,22 @@ def publish(request, slug): return http.HttpResponseRedirect(book.get_absolute_url()) +@require_POST +@login_required +def fix_ilustr(request, slug): + from .ilustr import IlustrFixer + book = get_object_or_404(Book, slug=slug) + protocol = 'https://' if request.is_secure() else 'http://' + fixer = IlustrFixer(protocol + request.get_host(), author=request.user) + with transaction.atomic(): + fixer.fix_book(book) + if fixer.stats['unresolved'] or fixer.stats['conflicts']: + messages.warning(request, 'Nie wszystkie ilustracje udało się naprawić.') + elif fixer.stats['fixed']: + messages.success(request, 'Naprawiono adresy ilustracji.') + return http.HttpResponseRedirect(book.get_absolute_url()) + + @require_POST @login_required def publish_image(request, slug):