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

This commit is contained in:
Joar Wandborg 2011-11-22 00:09:41 +01:00
parent 0bce749b21
commit 8aeb673877
2 changed files with 8 additions and 2 deletions

View File

@ -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")

View File

@ -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():