mirrors/takahe
1
1
Fork 0
mirror of https://github.com/jointakahe/takahe.git synced 2024-11-25 00:30:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Set the content type and disposition of webp files uploaded to S3

Browse source
This commit is contained in:
Tyler Kennedy 2022-12-14 01:26:19 -05:00 committed by GitHub
parent 3404b155de
commit 0d8b7db272
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
activities/views/compose.py
View file

@ -216,6 +216,7 @@ class ImageUpload(FormView):
name=form.cleaned_data.get("description"), name=form.cleaned_data.get("description"),
state=PostAttachmentStates.fetched, state=PostAttachmentStates.fetched,
) )
attachment.file.save( attachment.file.save(
main_file.name, main_file.name,
main_file, main_file,

12
core/uploads.py
View file

@ -2,6 +2,7 @@ import os
import secrets import secrets
from django.utils import timezone from django.utils import timezone
from storages.backends.s3boto3 import S3Boto3Storage
def upload_namer(prefix, instance, filename): def upload_namer(prefix, instance, filename):
@ -12,3 +13,14 @@ def upload_namer(prefix, instance, filename):
_, old_extension = os.path.splitext(filename) _, old_extension = os.path.splitext(filename)
new_filename = secrets.token_urlsafe(20) new_filename = secrets.token_urlsafe(20)
return f"{prefix}/{now.year}/{now.month}/{now.day}/{new_filename}{old_extension}" return f"{prefix}/{now.year}/{now.month}/{now.day}/{new_filename}{old_extension}"
class TakaheS3Storage(S3Boto3Storage):
def get_object_parameters(self, name: str):
params = self.object_parameters.copy()
if name.endswith(".webp"):
params["ContentDisposition"] = "inline"
params["ContentType"] = "image/webp"
return params

2
runtime.txt
View file

@ -1 +1 @@
python-3.11.0 python-3.11.1

3
takahe/settings.py
View file

@ -346,7 +346,8 @@ if SETUP.MEDIA_BACKEND:
GS_BUCKET_NAME = parsed.hostname GS_BUCKET_NAME = parsed.hostname
GS_QUERYSTRING_AUTH = False GS_QUERYSTRING_AUTH = False
elif parsed.scheme == "s3": elif parsed.scheme == "s3":
DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage" # DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
DEFAULT_FILE_STORAGE = "core.uploads.TakaheS3Storage"
AWS_STORAGE_BUCKET_NAME = parsed.path.lstrip("/") AWS_STORAGE_BUCKET_NAME = parsed.path.lstrip("/")
AWS_QUERYSTRING_AUTH = False AWS_QUERYSTRING_AUTH = False
AWS_DEFAULT_ACL = "public-read" AWS_DEFAULT_ACL = "public-read"