aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2013-04-21 11:42:58 +0200
committerElrond <elrond+mediagoblin.org@samba-tng.org>2013-04-21 19:26:57 +0200
commitdc1ec36eb9a3bbe37a4dac2e94d4dae339ef0715 (patch)
tree6a6de1cb617f9fd1d345fb3a40c08b40128cc123
parentfd1202b7745a536428cdfe1d862a07bf59a3ad43 (diff)
downloadmediagoblin-dc1ec36eb9a3bbe37a4dac2e94d4dae339ef0715.tar.lz
mediagoblin-dc1ec36eb9a3bbe37a4dac2e94d4dae339ef0715.tar.xz
mediagoblin-dc1ec36eb9a3bbe37a4dac2e94d4dae339ef0715.zip
resize_image: Refactor config loading a small bit.
Well, get the config into a local variable, for easier access.
-rw-r--r--mediagoblin/media_types/image/processing.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py
index b8d576e4..142ec2bf 100644
--- a/mediagoblin/media_types/image/processing.py
+++ b/mediagoblin/media_types/image/processing.py
@@ -50,16 +50,15 @@ def resize_image(entry, filename, new_path, exif_tags, workdir, new_size,
workdir -- directory path for storing converted image files
new_size -- 2-tuple size for the resized image
"""
+ config = mgg.global_config['media_type:mediagoblin.media_types.image']
+
try:
resized = Image.open(filename)
except IOError:
raise BadMediaFail()
resized = exif_fix_image_orientation(resized, exif_tags) # Fix orientation
- filter_config = \
- mgg.global_config['media_type:mediagoblin.media_types.image']\
- ['resize_filter']
-
+ filter_config = config['resize_filter']
try:
resize_filter = PIL_FILTERS[filter_config.upper()]
except KeyError:
@@ -72,9 +71,7 @@ def resize_image(entry, filename, new_path, exif_tags, workdir, new_size,
# Copy the new file to the conversion subdir, then remotely.
tmp_resized_filename = os.path.join(workdir, new_path[-1])
with file(tmp_resized_filename, 'w') as resized_file:
- resized.save(resized_file,
- quality=mgg.global_config['media_type:mediagoblin.media_types.image']\
- ['quality'])
+ resized.save(resized_file, quality=config['quality'])
mgg.public_store.copy_local_to_storage(tmp_resized_filename, new_path)