jonny/microblog.pub
1
0
Fork 0
forked from forks/microblog.pub
Code Pull requests Activity

Remove exif from images on upload

Browse source
This commit is contained in:
Thomas Sileo 2022-06-23 22:07:18 +02:00
parent 1a88ce7259
commit 7293160b6f
1 changed files with 35 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
app/uploads.py
View file

@ -24,8 +24,8 @@ def save_upload(db: Session, f: UploadFile) -> models.Upload:
break break
h.update(buf) h.update(buf)
f.file.seek(0)
content_hash = h.hexdigest() content_hash = h.hexdigest()
f.file.seek(0)
existing_upload = ( existing_upload = (
db.query(models.Upload) db.query(models.Upload)
@ -38,12 +38,6 @@ def save_upload(db: Session, f: UploadFile) -> models.Upload:
logger.info(f"Creating new Upload with {content_hash=}") logger.info(f"Creating new Upload with {content_hash=}")
dest_filename = UPLOAD_DIR / content_hash dest_filename = UPLOAD_DIR / content_hash
with open(dest_filename, "wb") as dest:
while True:
buf = f.file.read(COPY_BUFSIZE)
if not buf:
break
dest.write(buf)
has_thumbnail = False has_thumbnail = False
image_blurhash = None image_blurhash = None
@ -51,14 +45,27 @@ def save_upload(db: Session, f: UploadFile) -> models.Upload:
height = None height = None
if f.content_type.startswith("image"): if f.content_type.startswith("image"):
with open(dest_filename, "rb") as df: image_blurhash = blurhash.encode(f.file, x_components=4, y_components=3)
image_blurhash = blurhash.encode(df, x_components=4, y_components=3) f.file.seek(0)
with Image.open(f.file) as original_image:
destination_image = Image.new(
original_image.mode,
original_image.size,
)
destination_image.putdata(original_image.getdata())
destination_image.save(
dest_filename,
format=original_image.format,
)
try: try:
with Image.open(dest_filename) as i: width, height = original_image.size
width, height = i.size original_image.thumbnail((740, 740))
i.thumbnail((740, 740)) original_image.save(
i.save(UPLOAD_DIR / f"{content_hash}_resized", format=i.format) UPLOAD_DIR / f"{content_hash}_resized",
format=original_image.format,
)
except Exception: except Exception:
logger.exception( logger.exception(
f"Failed to created thumbnail for {f.filename}/{content_hash}" f"Failed to created thumbnail for {f.filename}/{content_hash}"
@ -66,6 +73,13 @@ def save_upload(db: Session, f: UploadFile) -> models.Upload:
else: else:
has_thumbnail = True has_thumbnail = True
logger.info("Thumbnail generated") logger.info("Thumbnail generated")
else:
with open(dest_filename, "wb") as dest:
while True:
buf = f.file.read(COPY_BUFSIZE)
if not buf:
break
dest.write(buf)
new_upload = models.Upload( new_upload = models.Upload(
content_type=f.content_type, content_type=f.content_type,
@ -95,6 +109,6 @@ def upload_to_attachment(upload: models.Upload, filename: str) -> ap.RawObject:
"type": "Document", "type": "Document",
"mediaType": upload.content_type, "mediaType": upload.content_type,
"name": filename, "name": filename,
"url": BASE_URL + f"/attachments/{upload.content_hash}", "url": BASE_URL + f"/attachments/{upload.content_hash}/{filename}",
**extra_attachment_fields, **extra_attachment_fields,
} }