From b7b4f7f92ccf6ec8b58d6e39229db726a21229ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= Date: Wed, 1 Apr 2020 21:00:11 +0200 Subject: [PATCH] split views for label and label with doc, restore sanity --- sdbs_pile/pile/models.py | 5 +- .../pile/templates/front_doc_detail.html | 4 +- .../pile/templates/front_doc_listing.html | 2 +- sdbs_pile/pile/urls.py | 3 +- sdbs_pile/pile/views.py | 55 ++++++++++--------- 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/sdbs_pile/pile/models.py b/sdbs_pile/pile/models.py index 5acabef..742e1c3 100644 --- a/sdbs_pile/pile/models.py +++ b/sdbs_pile/pile/models.py @@ -4,7 +4,6 @@ from django.core.exceptions import ValidationError from django.core.files.storage import FileSystemStorage from django.db import models from django.db.models import Count -from django.urls import reverse from model_utils.models import SoftDeletableModel @@ -67,8 +66,8 @@ class Document(SoftDeletableModel): @property def url(self): - if self.is_local_pdf: - return reverse("pile:label", args=[self.id]) + "?fallback=1" + if self.file: + return f"/docs/{self.file.url}" return self.external_url @property diff --git a/sdbs_pile/pile/templates/front_doc_detail.html b/sdbs_pile/pile/templates/front_doc_detail.html index c6eeb16..50a4248 100644 --- a/sdbs_pile/pile/templates/front_doc_detail.html +++ b/sdbs_pile/pile/templates/front_doc_detail.html @@ -39,12 +39,12 @@ {% if document.is_local_pdf %}
Access file as: - Entry #{{ document.id }} of /-\ pile + Entry #{{ document.id }} of /-\ pile
Get original document at: - {{ document.file.url }} + {{ document.url }}
{% else %}
diff --git a/sdbs_pile/pile/templates/front_doc_listing.html b/sdbs_pile/pile/templates/front_doc_listing.html index ec0c70a..c1493dd 100644 --- a/sdbs_pile/pile/templates/front_doc_listing.html +++ b/sdbs_pile/pile/templates/front_doc_listing.html @@ -21,7 +21,7 @@ {% for document in documents %}
- 🔗 + 🔗

{{ document.title }}

diff --git a/sdbs_pile/pile/urls.py b/sdbs_pile/pile/urls.py index 2b8b4dd..03a3542 100644 --- a/sdbs_pile/pile/urls.py +++ b/sdbs_pile/pile/urls.py @@ -7,6 +7,7 @@ urlpatterns = [ path('', views.IndexView.as_view(), name='index'), path('tag/', views.TagView.as_view(), name='tag'), path('item/', views.DocumentView.as_view(), name='document'), - path('label/', views.DocumentWithLabel.as_view(), name='label'), + path('label/', views.LabelView.as_view(), name='label'), + path('retrieve/', views.DocumentWithLabelView.as_view(), name='retrieve'), path('feed', views.RecentlyUploadedFeed()) ] diff --git a/sdbs_pile/pile/views.py b/sdbs_pile/pile/views.py index 25dfab3..828825e 100644 --- a/sdbs_pile/pile/views.py +++ b/sdbs_pile/pile/views.py @@ -8,7 +8,7 @@ import weasyprint from PyPDF2 import PdfFileWriter, PdfFileReader from django.contrib.syndication.views import Feed from django.core.exceptions import ObjectDoesNotExist -from django.http import Http404, FileResponse +from django.http import Http404, FileResponse, HttpRequest from django.shortcuts import redirect from django.template.loader import render_to_string from django.utils.text import slugify @@ -102,23 +102,39 @@ class DocumentView(BasePileView): } -class DocumentWithLabel(BasePileViewMixin): - def get(self, request, document_id: int): +class LabelView(BasePileViewMixin): + def get(self, request: HttpRequest, document_id: int): try: document = self.documents.get(pk=document_id) except ObjectDoesNotExist: raise Http404 + label_stream = self.get_label(request, document) + return FileResponse(label_stream, + filename=f"pile_{document.id}__label__{slugify(document.title)}.pdf", + content_type="application/pdf") + + @staticmethod + def get_label(request, document): label_html = render_to_string("label.html", {'document': document}) - label_stream = io.BytesIO() - weasyprint.HTML(base_url=request.build_absolute_uri(), string=label_html).write_pdf(label_stream) - label_stream.seek(0) + stream = io.BytesIO() + weasyprint.HTML(base_url=request.build_absolute_uri(), string=label_html).write_pdf(stream) + stream.seek(0) + return stream + + +class DocumentWithLabelView(BasePileViewMixin): + def get(self, request: HttpRequest, document_id: int): + try: + document = self.documents.get(pk=document_id) + except ObjectDoesNotExist: + raise Http404 - final_stream = None - concat_succeeded = False if document.is_local_pdf: try: + label_stream = LabelView.get_label(request, document) + with open(document.file.path, 'rb') as document_fp: writer = PdfFileWriter() for reader in map(PdfFileReader, (label_stream, document_fp)): @@ -127,26 +143,15 @@ class DocumentWithLabel(BasePileViewMixin): writer.addMetadata({u'/Title': f"/-\\ pile #{document.id}: {document.title}"}) final_stream = io.BytesIO() writer.write(final_stream) - final_stream.seek(0) - concat_succeeded = True + + final_stream.seek(0) + return FileResponse(final_stream, + filename=f"pile_{document.id}__label__{slugify(document.title)}.pdf", + content_type="application/pdf") except Exception as exc: logging.exception(exc) - if not concat_succeeded: - if self.request.GET.get("fallback"): - if document.is_local_pdf: - return FileResponse(document.file, - filename=f"pile_{document.id}__{slugify(document.title)}.pdf", - content_type="application/pdf") - else: - return redirect(document.external_url) - else: - label_stream.seek(0) - final_stream = label_stream - - return FileResponse(final_stream, - filename=f"pile_{document.id}__{slugify(document.title)}.pdf", - content_type="application/pdf") + return redirect(document.url) class RecentlyUploadedFeed(Feed):