diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-09-06 10:56:27 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-09-06 10:57:13 -0500 |
| commit | b29b4e175fc85bf680d5859f68b47d48e6ed478b (patch) | |
| tree | a2793cb87d4132444d1c38a1c162cf730796bf03 | |
| parent | 1b22d51a5dd3676d1b895d7093b93fa09c456f9c (diff) | |
| download | mediagoblin-b29b4e175fc85bf680d5859f68b47d48e6ed478b.tar.lz mediagoblin-b29b4e175fc85bf680d5859f68b47d48e6ed478b.tar.xz mediagoblin-b29b4e175fc85bf680d5859f68b47d48e6ed478b.zip | |
Handle cr2 files through the raw_image media type
This commit sponsored by Jim Campbell. Hey, I know that guy! Thanks
Jim! :)
| -rw-r--r-- | mediagoblin/media_types/raw_image/processing.py | 2 | ||||
| -rw-r--r-- | mediagoblin/media_types/video/processing.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/media_types/raw_image/processing.py b/mediagoblin/media_types/raw_image/processing.py index 83b01559..55a48b50 100644 --- 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 c21c74b3..a7716592 100644 --- 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) |