aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-08-28 07:56:44 -0700
committerRodney Ewing <ewing.rj@gmail.com>2013-08-29 08:22:16 -0700
commit93874d0a662fc3abd73c56ad3939a13f3d372493 (patch)
treeaad5578f19f049788db6856d9e37aac0fba68f47
parent6a01fafc9828023b449df004d30580a341fd6279 (diff)
downloadmediagoblin-93874d0a662fc3abd73c56ad3939a13f3d372493.tar.lz
mediagoblin-93874d0a662fc3abd73c56ad3939a13f3d372493.tar.xz
mediagoblin-93874d0a662fc3abd73c56ad3939a13f3d372493.zip
image media_type now have their own config_spec.ini
-rw-r--r--mediagoblin/config_spec.ini6
-rw-r--r--mediagoblin/media_types/image/config_spec.ini7
-rw-r--r--mediagoblin/media_types/image/processing.py4
3 files changed, 9 insertions, 8 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index 8f03509d..790c31a5 100644
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -104,12 +104,6 @@ max_height = integer(default=640)
max_width = integer(default=180)
max_height = integer(default=180)
-[media_type:mediagoblin.media_types.image]
-# One of BICUBIC, BILINEAR, NEAREST, ANTIALIAS
-resize_filter = string(default="ANTIALIAS")
-#level of compression used when resizing images
-quality = integer(default=90)
-
[media_type:mediagoblin.media_types.video]
# Should we keep the original file?
keep_original = boolean(default=False)
diff --git a/mediagoblin/media_types/image/config_spec.ini b/mediagoblin/media_types/image/config_spec.ini
new file mode 100644
index 00000000..08111df2
--- /dev/null
+++ b/mediagoblin/media_types/image/config_spec.ini
@@ -0,0 +1,7 @@
+[plugin_spec]
+# One of BICUBIC, BILINEAR, NEAREST, ANTIALIAS
+resize_filter = string(default="ANTIALIAS")
+#level of compression used when resizing images
+quality = integer(default=90)
+
+
diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py
index 088979bc..555a0e0a 100644
--- a/mediagoblin/media_types/image/processing.py
+++ b/mediagoblin/media_types/image/processing.py
@@ -138,8 +138,8 @@ class CommonImageProcessor(MediaProcessor):
"""
Set up the workbench directory and pull down the original file
"""
- self.image_config = mgg.global_config[
- 'media_type:mediagoblin.media_types.image']
+ self.image_config = mgg.global_config['plugins'][
+ 'mediagoblin.media_types.image']
## @@: Should this be two functions?
# Conversions subdirectory to avoid collisions