Stream PDFs and docx fiels with FileResponse etc.

Author: frjo

hypha/apply/projects/views/project.py

@@ -11,7 +11,7 @@
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.db import transaction
 from django.db.models import Q
-from django.http import Http404, HttpResponse, HttpResponseRedirect
+from django.http import FileResponse, Http404, HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
 from django.template.loader import get_template
 from django.urls import reverse
@@ -1915,10 +1915,11 @@ def render_as_docx(self, context, template, filename):
         new_parser = HtmlToDocx()
         new_parser.add_html_to_document(html, document)
         document.save(buf)
+        buf.seek(0)
 
-        response = HttpResponse(buf.getvalue(), content_type="application/docx")
-        response["Content-Disposition"] = f"attachment; filename={filename}"
-        return response
+        return FileResponse(
+            buf, as_attachment=True, filename=filename, content_type="application/docx"
+        )
 
     def get_slugified_file_name(self, export_type):
         return f"{datetime.date.today().strftime('%Y%m%d')}-{slugify(self.object.title)}.{export_type}"
@@ -1983,10 +1984,11 @@ def render_as_docx(self, context, template, filename):
         new_parser = HtmlToDocx()
         new_parser.add_html_to_document(html, document)
         document.save(buf)
+        buf.seek(0)
 
-        response = HttpResponse(buf.getvalue(), content_type="application/docx")
-        response["Content-Disposition"] = f"attachment; filename={filename}"
-        return response
+        return FileResponse(
+            buf, as_attachment=True, filename=filename, content_type="application/docx"
+        )
 
     def get_slugified_file_name(self, export_type):
         return f"{datetime.date.today().strftime('%Y%m%d')}-{slugify(self.object.title)}.{export_type}"

hypha/apply/utils/pdfs.py

@@ -1,7 +1,7 @@
 from io import BytesIO
 
 from django.core.files import File
-from django.http import HttpResponse
+from django.http import FileResponse, HttpResponse
 from django.template.loader import render_to_string
 from django.utils import timezone
 from pypdf import PdfReader, PdfWriter
@@ -59,10 +59,9 @@ def render_as_pdf(
     )
     pdf = html_to_pdf(html)
 
-    response = HttpResponse(content_type="application/pdf")
-    response["Content-Disposition"] = f"attachment; filename={filename}"
-    response.write(pdf.read())
-    return response
+    return FileResponse(
+        pdf, as_attachment=True, filename=filename, content_type="application/pdf"
+    )
 
 
 def merge_pdf(origin_pdf: BytesIO, input_pdf: BytesIO) -> File:
@@ -76,7 +75,7 @@ def merge_pdf(origin_pdf: BytesIO, input_pdf: BytesIO) -> File:
         Return a File object containing the merged PDF and with the same name as the
         original PDF.
     """
-    merger = PdfWriter(clone_from=BytesIO(origin_pdf.read()))
+    merger = PdfWriter(clone_from=origin_pdf)
     merger.append(PdfReader(input_pdf))
 
     output_pdf = BytesIO()