Video support is disabled by default, set enable_video to true to enable

diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index eef6f6e03a8413e4e2e7eb4c12c043f2a12b8b1c..e5e059c949466470d1f808abddd9a9be9ed972ff 100644 (file)
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -50,6 +50,9 @@ allow_attachments = boolean(default=False)
 # Cookie stuff
 csrf_cookie_name = string(default='mediagoblin_csrftoken')
 
+# Media types
+enable_video = boolean(default=False)
+
 [storage:publicstore]
 storage_class = string(default="mediagoblin.storage.filestorage:BasicFileStorage")
 base_dir = string(default="%(here)s/user_dev/media/public")

diff --git a/mediagoblin/media_types/__init__.py b/mediagoblin/media_types/__init__.py
index 2d13f5a6ce35d4742d7daf7663d004eb2035165e..a2ea6bcb9477132ddb8bb3fe594e43e1045ccb10 100644 (file)
--- a/mediagoblin/media_types/__init__.py
+++ b/mediagoblin/media_types/__init__.py
@@ -17,6 +17,7 @@
 import os
 import sys
 
+from mediagoblin import mg_globals
 from mediagoblin.util import lazy_pass_to_ugettext as _
 
 
@@ -29,8 +30,10 @@ class InvalidFileType(Exception):
 # This should be more dynamic in the future. Perhaps put it in the .ini?
 # -- Joar
 MEDIA_TYPES = [
-        'mediagoblin.media_types.image',
-        'mediagoblin.media_types.video']
+        'mediagoblin.media_types.image']
+
+if mg_globals.app_config['enable_video']:
+    MEDIA_TYPES.append('mediagoblin.media_types.video')
 
 
 def get_media_types():