mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-06-02 09:20:31 +00:00
Code Issues Projects Releases Wiki Activity

User exports: handle files that no longer exist on file storage

Browse source
This commit is contained in:
Bart Schuurmans 2024-03-24 12:47:26 +01:00
parent 471233c1dc
commit ab7b0893e0
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
bookwyrm/views/preferences/export.py
View file

@ -6,16 +6,17 @@ import io
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.core.paginator import Paginator from django.core.paginator import Paginator
from django.db.models import Q from django.db.models import Q
from django.http import HttpResponse from django.http import HttpResponse, HttpResponseServerError, Http404
from django.template.response import TemplateResponse from django.template.response import TemplateResponse
from django.utils import timezone from django.utils import timezone
from django.views import View from django.views import View
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.utils.translation import gettext_lazy as _
from django.shortcuts import redirect from django.shortcuts import redirect
from storages.backends.s3boto3 import S3Boto3Storage from storages.backends.s3boto3 import S3Boto3Storage
from bookwyrm import models from bookwyrm import models, storage_backends
from bookwyrm.models.bookwyrm_export_job import BookwyrmExportJob from bookwyrm.models.bookwyrm_export_job import BookwyrmExportJob
from bookwyrm import settings from bookwyrm import settings
@ -187,7 +188,11 @@ class ExportUser(View):
else: else:
# for local storage export_data is the tar file # for local storage export_data is the tar file
export["size"] = job.export_data.size if job.export_data else 0 try:
export["size"] = job.export_data.size if job.export_data else 0
except FileNotFoundError:
# file no longer exists
export["size"] = 0
exports.append(export) exports.append(export)
@ -230,10 +235,15 @@ class ExportArchive(View):
def get(self, request, archive_id): def get(self, request, archive_id):
"""download user export file""" """download user export file"""
export = BookwyrmExportJob.objects.get(task_id=archive_id, user=request.user) export = BookwyrmExportJob.objects.get(task_id=archive_id, user=request.user)
return HttpResponse( if isinstance(export.export_data.storage, storage_backends.ExportsFileStorage):
export.export_data, try:
content_type="application/gzip", return HttpResponse(
headers={ export.export_data,
"Content-Disposition": 'attachment; filename="bookwyrm-account-export.tar.gz"' # pylint: disable=line-too-long content_type="application/gzip",
}, headers={
) "Content-Disposition": 'attachment; filename="bookwyrm-account-export.tar.gz"' # pylint: disable=line-too-long
},
)
except FileNotFoundError:
raise Http404()
return HttpResponseServerError()