aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2013-04-03 18:49:46 +0200
committerElrond <elrond+mediagoblin.org@samba-tng.org>2013-04-03 18:49:46 +0200
commitaf0b508c75dcb136a864dd96e0020875c8397efe (patch)
treef7948213948c9d68ebb703f2988f6385b7188c48
parentb1126f71277b89bcedb817bbc90e8d4627917ef0 (diff)
downloadmediagoblin-af0b508c75dcb136a864dd96e0020875c8397efe.tar.lz
mediagoblin-af0b508c75dcb136a864dd96e0020875c8397efe.tar.xz
mediagoblin-af0b508c75dcb136a864dd96e0020875c8397efe.zip
Little refactoring for images: media_files.
Set the media_files directly at the relvant places.
-rw-r--r--mediagoblin/media_types/image/processing.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py
index ca88d3f4..e951ef29 100644
--- a/mediagoblin/media_types/image/processing.py
+++ b/mediagoblin/media_types/image/processing.py
@@ -122,6 +122,7 @@ def process_image(proc_state):
exif_tags, conversions_subdir,
(mgg.global_config['media:thumb']['max_width'],
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`
# 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,
(mgg.global_config['media:medium']['max_width'],
mgg.global_config['media:medium']['max_height']))
- else:
- medium_filepath = None
+ entry.media_files[u'medium'] = medium_filepath
# Copy our queued local workbench to its final destination
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
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
exif_all = clean_exif(exif_tags)