heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for ticket #404

Browse Source
This commit is contained in:
Bassam 2012-03-15 12:13:44 -04:00
parent dd0799ad0a
commit 0f8221dca4
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mediagoblin/media_types/image/processing.py
View File

@ -21,7 +21,8 @@ from mediagoblin import mg_globals as mgg
from mediagoblin.processing import BadMediaFail, \ from mediagoblin.processing import BadMediaFail, \
create_pub_filepath, THUMB_SIZE, MEDIUM_SIZE create_pub_filepath, THUMB_SIZE, MEDIUM_SIZE
from mediagoblin.tools.exif import exif_fix_image_orientation, \ from mediagoblin.tools.exif import exif_fix_image_orientation, \
extract_exif, clean_exif, get_gps_data, get_useful extract_exif, clean_exif, get_gps_data, get_useful, \
exif_image_needs_rotation
def process_image(entry): def process_image(entry):
""" """
@ -32,7 +33,6 @@ def process_image(entry):
conversions_subdir = os.path.join( conversions_subdir = os.path.join(
workbench.dir, 'conversions') workbench.dir, 'conversions')
os.mkdir(conversions_subdir) os.mkdir(conversions_subdir)
queued_filepath = entry.queued_media_file queued_filepath = entry.queued_media_file
queued_filename = workbench.localized_file( queued_filename = workbench.localized_file(
mgg.queue_store, queued_filepath, mgg.queue_store, queued_filepath,
@ -72,24 +72,31 @@ def process_image(entry):
# file, a `medium.jpg` files is created and later associated with the media # file, a `medium.jpg` files is created and later associated with the media
# entry. # entry.
medium = Image.open(queued_filename) medium = Image.open(queued_filename)
if medium.size[0] > MEDIUM_SIZE[0] or medium.size[1] > MEDIUM_SIZE[1] \
# Fix orientation or exif_image_needs_rotation(exif_tags):
medium = exif_fix_image_orientation(medium, exif_tags)
if medium.size[0] > MEDIUM_SIZE[0] or medium.size[1] > MEDIUM_SIZE[1]:
medium.thumbnail(MEDIUM_SIZE, Image.ANTIALIAS) medium.thumbnail(MEDIUM_SIZE, Image.ANTIALIAS)
medium_filename = 'medium' + extension # Fix orientation
medium_filepath = create_pub_filepath(entry, medium_filename) medium = exif_fix_image_orientation(medium, exif_tags)
tmp_medium_filename = os.path.join(
conversions_subdir, medium_filename)
with file(tmp_medium_filename, 'w') as medium_file: medium_filename = 'medium' + extension
medium.save(medium_file) medium_filepath = create_pub_filepath(entry, medium_filename)
mgg.public_store.copy_local_to_storage( tmp_medium_filename = os.path.join(
tmp_medium_filename, medium_filepath) conversions_subdir, medium_filename)
with file(tmp_medium_filename, 'w') as medium_file:
medium.save(medium_file)
mgg.public_store.copy_local_to_storage(
tmp_medium_filename, medium_filepath)
else:
medium_filepath = None
# we have to re-read because unlike PIL, not everything reads # we have to re-read because unlike PIL, not everything reads
# things in string representation :) # things in string representation :)
@ -111,7 +118,8 @@ def process_image(entry):
media_files_dict = entry.setdefault('media_files', {}) media_files_dict = entry.setdefault('media_files', {})
media_files_dict['thumb'] = thumb_filepath media_files_dict['thumb'] = thumb_filepath
media_files_dict['original'] = original_filepath media_files_dict['original'] = original_filepath
media_files_dict['medium'] = medium_filepath if medium_filepath:
media_files_dict['medium'] = medium_filepath
# Insert exif data into database # Insert exif data into database
media_data = entry.setdefault('media_data', {}) media_data = entry.setdefault('media_data', {})

7
mediagoblin/tools/exif.py
View File

@ -32,6 +32,13 @@ USEFUL_TAGS = [
'EXIF UserComment', 'EXIF UserComment',
] ]
def exif_image_needs_rotation(exif_tags):
"""
Returns True if EXIF orientation requires rotation
"""
return 'Image Orientation' in exif_tags \
and exif_tags['Image Orientation'].values[0] != 1
def exif_fix_image_orientation(im, exif_tags): def exif_fix_image_orientation(im, exif_tags):
""" """
Translate any EXIF orientation to raw orientation Translate any EXIF orientation to raw orientation