Handle cr2 files through the raw_image media type

This commit sponsored by Jim Campbell.  Hey, I know that guy!  Thanks
Jim! :)

diff --git a/mediagoblin/media_types/raw_image/processing.py b/mediagoblin/media_types/raw_image/processing.py
index 83b01559ba5e580f7ade80728dfe93a78b9b950f..55a48b50a90efafa9f500f1bae8f187913d02098 100644 (file)
--- a/mediagoblin/media_types/raw_image/processing.py
+++ b/mediagoblin/media_types/raw_image/processing.py
@@ -29,7 +29,7 @@ from mediagoblin.processing import (
 _log = logging.getLogger(__name__)
 
 MEDIA_TYPE = 'mediagoblin.media_types.raw_image'
-ACCEPTED_EXTENSIONS = ['nef',]
+ACCEPTED_EXTENSIONS = ['nef', 'cr2']
 
 
 # The entire function have to be copied

diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py
index c21c74b3ac7c9e9c371cc40794cef47654041b5f..a7716592a9671a32f315e27734a038a6895cd189 100644 (file)
--- a/mediagoblin/media_types/video/processing.py
+++ b/mediagoblin/media_types/video/processing.py
@@ -44,7 +44,7 @@ class VideoTranscodingFail(BaseProcessingFail):
     general_message = _(u'Video transcoding failed')
 
 
-EXCLUDED_EXTS = ["nef"]
+EXCLUDED_EXTS = ["nef", "cr2"]
 
 def sniff_handler(media_file, filename):
     name, ext = os.path.splitext(filename)