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

Little refactoring for images: media_files.

Browse Source 
Set the media_files directly at the relvant places.
This commit is contained in:
Elrond 2013-04-03 18:49:46 +02:00
parent b1126f7127
commit af0b508c75
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,6 +122,7 @@ def process_image(proc_state):
exif_tags, conversions_subdir, exif_tags, conversions_subdir,
(mgg.global_config['media:thumb']['max_width'], (mgg.global_config['media:thumb']['max_width'],
mgg.global_config['media:thumb']['max_height'])) mgg.global_config['media:thumb']['max_height']))
entry.media_files[u'thumb'] = thumb_filepath
# If the size of the original file exceeds the specified size of a `medium` # If the size of the original file exceeds the specified size of a `medium`
# 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
@ -137,8 +138,7 @@ def process_image(proc_state):
exif_tags, conversions_subdir, exif_tags, conversions_subdir,
(mgg.global_config['media:medium']['max_width'], (mgg.global_config['media:medium']['max_width'],
mgg.global_config['media:medium']['max_height'])) mgg.global_config['media:medium']['max_height']))
else: entry.media_files[u'medium'] = medium_filepath
medium_filepath = None
# Copy our queued local workbench to its final destination # Copy our queued local workbench to its final destination
proc_state.copy_original(name_builder.fill('{basename}{ext}')) proc_state.copy_original(name_builder.fill('{basename}{ext}'))
@ -146,12 +146,6 @@ def process_image(proc_state):
# Remove queued media file from storage and database # Remove queued media file from storage and database
proc_state.delete_queue_file() proc_state.delete_queue_file()
# Insert media file information into database
media_files_dict = entry.setdefault('media_files', {})
media_files_dict[u'thumb'] = thumb_filepath
if medium_filepath:
media_files_dict[u'medium'] = medium_filepath
# Insert exif data into database # Insert exif data into database
exif_all = clean_exif(exif_tags) exif_all = clean_exif(exif_tags)