use pathlib; .exists() check

This commit is contained in:
KuhnChris 2023-02-12 13:09:33 +01:00
parent b719fd5122
commit 598ee2bd0a
1 changed files with 18 additions and 13 deletions

View File

@ -1,8 +1,10 @@
import os
import json
from base64 import b64decode
import pathlib
import sys
from django.conf import settings
from django.http import FileResponse, Http404
from django.http import FileResponse, Http404, HttpResponseNotFound
from django.views.generic import TemplateView, ListView, DetailView
from django.views.generic.edit import (FormView, FormMixin, CreateView, UpdateView,
DeleteView)
@ -677,13 +679,8 @@ class MediaContent(DetailView):
def dispatch(self, request, *args, **kwargs):
self.object = self.get_object()
headers = {
'Content-Type': self.object.content_type,
'X-Accel-Redirect': self.object.media_file.url,
}
# development direct file stream - DO NOT USE PRODUCTIVLY
if settings.PROVIDE_FILES_DIRECTLY:
if settings.DEBUG and 'runserver' in sys.argv:
# get media URL
pth = self.object.media_file.url
# remove "/media-data/"
@ -697,14 +694,22 @@ class MediaContent(DetailView):
else:
pth = pth[0]
# build final path
filepth = str(settings.DOWNLOAD_ROOT) + "/" + pth
# return file
response = FileResponse(open(filepth,'rb'))
return response
# build final path
filepth = pathlib.Path(str(settings.DOWNLOAD_ROOT) + pth)
if filepth.exists():
# return file
response = FileResponse(open(filepth,'rb'))
return response
else:
return HttpResponseNotFound()
else:
headers = {
'Content-Type': self.object.content_type,
'X-Accel-Redirect': self.object.media_file.url,
}
return HttpResponse(headers=headers)