tanner/spaceport
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stop detection of MP0 images

Browse Source
This commit is contained in:
Tanner Collin 2022-01-21 03:17:21 +00:00
parent 26cae32c0b
commit 08ab4b2924
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apiserver/apiserver/api/utils.py
View File

@ -10,7 +10,8 @@ from rest_framework.exceptions import ValidationError
from rest_framework.views import exception_handler from rest_framework.views import exception_handler
from dateutil import relativedelta from dateutil import relativedelta
from uuid import uuid4 from uuid import uuid4
from PIL import Image, ImageDraw, ImageFont, ImageOps from PIL import Image, ImageDraw, ImageFont, ImageOps, JpegImagePlugin
#JpegImagePlugin._getmp = lambda x: None
from bleach.sanitizer import Cleaner from bleach.sanitizer import Cleaner
from PyPDF2 import PdfFileWriter, PdfFileReader from PyPDF2 import PdfFileWriter, PdfFileReader
from reportlab.pdfgen import canvas from reportlab.pdfgen import canvas
@ -179,14 +180,16 @@ def process_image_upload(upload, crop):
try: try:
pic = Image.open(upload) pic = Image.open(upload)
except OSError: except OSError:
raise serializers.ValidationError('Invalid image file.') raise serializers.ValidationError(dict(photo='Invalid image file.'))
logging.info('Detected format: %s', pic.format)
if pic.format == 'PNG': if pic.format == 'PNG':
ext = '.png' ext = '.png'
elif pic.format == 'JPEG': elif pic.format == 'JPEG':
ext = '.jpg' ext = '.jpg'
else: else:
raise serializers.ValidationError('Image must be a jpg or png.') raise serializers.ValidationError(dict(photo='Image must be a jpg or png.'))
pic = ImageOps.exif_transpose(pic) pic = ImageOps.exif_transpose(pic)