From a953a844fdfbe8f3492f26dc68e16a5f25fb74e4 Mon Sep 17 00:00:00 2001 From: muzaffaryousaf Date: Thu, 3 Aug 2017 15:46:26 +0500 Subject: [PATCH] Settings for video transcripts bucket w.r.t django storages. --- cms/envs/aws.py | 4 ++++ cms/envs/common.py | 1 + cms/envs/test.py | 10 ++++++++++ cms/urls.py | 5 +++++ lms/envs/aws.py | 3 +++ lms/envs/common.py | 14 ++++++++++++++ 6 files changed, 37 insertions(+) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index bf4ffc38b1..fb399cb056 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -453,6 +453,10 @@ VIDEO_UPLOAD_PIPELINE = ENV_TOKENS.get('VIDEO_UPLOAD_PIPELINE', VIDEO_UPLOAD_PIP VIDEO_IMAGE_SETTINGS = ENV_TOKENS.get('VIDEO_IMAGE_SETTINGS', VIDEO_IMAGE_SETTINGS) +################ VIDEO TRANSCRIPTS STORAGE ############### + +VIDEO_TRANSCRIPTS_SETTINGS = ENV_TOKENS.get('VIDEO_TRANSCRIPTS_SETTINGS', VIDEO_TRANSCRIPTS_SETTINGS) + ################ PUSH NOTIFICATIONS ############### PARSE_KEYS = AUTH_TOKENS.get("PARSE_KEYS", {}) diff --git a/cms/envs/common.py b/cms/envs/common.py index 3a5af3b51a..b345bca8ff 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -112,6 +112,7 @@ from lms.envs.common import ( DISABLE_ACCOUNT_ACTIVATION_REQUIREMENT_SWITCH, # Video Image settings VIDEO_IMAGE_SETTINGS, + VIDEO_TRANSCRIPTS_SETTINGS, ) from path import Path as path from warnings import simplefilter diff --git a/cms/envs/test.py b/cms/envs/test.py index 4875b8447b..e57f348e7f 100644 --- a/cms/envs/test.py +++ b/cms/envs/test.py @@ -353,3 +353,13 @@ VIDEO_IMAGE_SETTINGS = dict( DIRECTORY_PREFIX='video-images/', ) VIDEO_IMAGE_DEFAULT_FILENAME = 'default_video_image.png' + +########################## VIDEO TRANSCRIPTS STORAGE ############################ +VIDEO_TRANSCRIPTS_SETTINGS = dict( + VIDEO_TRANSCRIPTS_MAX_BYTES=3 * 1024 * 1024, # 3 MB + STORAGE_KWARGS=dict( + location=MEDIA_ROOT, + base_url=MEDIA_URL, + ), + DIRECTORY_PREFIX='video-transcripts/', +) diff --git a/cms/urls.py b/cms/urls.py index e125344309..0a1d50bd8c 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -210,6 +210,11 @@ if settings.DEBUG: document_root=settings.VIDEO_IMAGE_SETTINGS['STORAGE_KWARGS']['location'] ) + urlpatterns += static( + settings.VIDEO_TRANSCRIPTS_SETTINGS['STORAGE_KWARGS']['base_url'], + document_root=settings.VIDEO_TRANSCRIPTS_SETTINGS['STORAGE_KWARGS']['location'] + ) + if 'debug_toolbar' in settings.INSTALLED_APPS: import debug_toolbar urlpatterns += ( diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 81993a03ac..c5fc802d10 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -795,6 +795,9 @@ XBLOCK_SETTINGS.setdefault("VideoModule", {})['YOUTUBE_API_KEY'] = AUTH_TOKENS.g ##### VIDEO IMAGE STORAGE ##### VIDEO_IMAGE_SETTINGS = ENV_TOKENS.get('VIDEO_IMAGE_SETTINGS', VIDEO_IMAGE_SETTINGS) +##### VIDEO TRANSCRIPTS STORAGE ##### +VIDEO_TRANSCRIPTS_SETTINGS = ENV_TOKENS.get('VIDEO_TRANSCRIPTS_SETTINGS', VIDEO_TRANSCRIPTS_SETTINGS) + ##### CDN EXPERIMENT/MONITORING FLAGS ##### CDN_VIDEO_URLS = ENV_TOKENS.get('CDN_VIDEO_URLS', CDN_VIDEO_URLS) ONLOAD_BEACON_SAMPLE_RATE = ENV_TOKENS.get('ONLOAD_BEACON_SAMPLE_RATE', ONLOAD_BEACON_SAMPLE_RATE) diff --git a/lms/envs/common.py b/lms/envs/common.py index b25788a452..eedc78d5ae 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -2605,6 +2605,20 @@ VIDEO_IMAGE_SETTINGS = dict( DIRECTORY_PREFIX='video-images/', ) +########################## VIDEO TRANSCRIPTS STORAGE ############################ + +VIDEO_TRANSCRIPTS_SETTINGS = dict( + VIDEO_TRANSCRIPTS_MAX_BYTES=3 * 1024 * 1024, # 3 MB + # Backend storage + # STORAGE_CLASS='storages.backends.s3boto.S3BotoStorage', + # STORAGE_KWARGS=dict(bucket='video-transcripts-bucket'), + STORAGE_KWARGS=dict( + location=MEDIA_ROOT, + base_url=MEDIA_URL, + ), + DIRECTORY_PREFIX='video-transcripts/', +) + # Source: # http://loc.gov/standards/iso639-2/ISO-639-2_utf-8.txt according to http://en.wikipedia.org/wiki/ISO_639-1