fall back to siteposter

This commit is contained in:
j 2018-09-12 15:56:10 +02:00
parent e6ce812f1a
commit 2662a66aca
2 changed files with 19 additions and 1 deletions

View file

@ -1455,7 +1455,7 @@ class Item(models.Model):
self.clear_poster_cache(self.poster.path) self.clear_poster_cache(self.poster.path)
self.poster.delete() self.poster.delete()
if not self.poster: if not self.poster or not os.path.exists(self.poster.path):
poster = self.make_siteposter() poster = self.make_siteposter()
url = self.prefered_poster_url() url = self.prefered_poster_url()
if url: if url:

View file

@ -827,6 +827,20 @@ def poster_frame(request, id, position):
raise Http404 raise Http404
def image_path_to_response(image, size=None):
if size:
size = int(size)
path = image.replace('.jpg', '.%d.jpg' % size)
if not os.path.exists(path):
image_size = max(Image.open(image).size)
if size > image_size:
path = image
else:
extract.resize_image(image, path, size=size)
else:
path = image
return HttpFileResponse(path, content_type='image/jpeg')
def image_to_response(image, size=None): def image_to_response(image, size=None):
if size: if size:
size = int(size) size = int(size)
@ -883,8 +897,12 @@ def poster(request, id, size=None):
icon=item.icon.name, icon=item.icon.name,
cache=item.json() cache=item.json()
) )
siteposter = item.path('siteposter.jpg')
siteposter = os.path.abspath(os.path.join(settings.MEDIA_ROOT, siteposter))
if item.poster and os.path.exists(item.poster.path): if item.poster and os.path.exists(item.poster.path):
return image_to_response(item.poster, size) return image_to_response(item.poster, size)
elif os.path.exists(siteposter):
return image_path_to_response(siteposter, size)
else: else:
return temp_poster() return temp_poster()