Skip to content

Commit 833b935

Browse files
committed
chore: adds video block flag
1 parent cb051a9 commit 833b935

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

xmodule/video_block/video_block.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from xblock.core import XBlock
3030
from xblock.fields import ScopeIds
3131
from xblock.runtime import KvsFieldData
32+
from xblocks_contrib.video import VideoBlock as _ExtractedVideoBlock
3233

3334
from common.djangoapps.xblock_django.constants import ATTR_KEY_REQUEST_COUNTRY_CODE, ATTR_KEY_USER_ID
3435
from openedx.core.djangoapps.video_config.models import HLSPlaybackEnabledFlag, CourseYoutubeBlockedFlag
@@ -47,16 +48,15 @@
4748
from xmodule.mako_block import MakoTemplateBlockBase
4849
from xmodule.modulestore.inheritance import InheritanceKeyValueStore, own_metadata
4950
from xmodule.raw_block import EmptyDataRawMixin
51+
from xmodule.util.builtin_assets import add_css_to_fragment, add_webpack_js_to_fragment
5052
from xmodule.validation import StudioValidation, StudioValidationMessage
51-
from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_css_to_fragment
5253
from xmodule.video_block import manage_video_subtitles_save
5354
from xmodule.x_module import (
5455
PUBLIC_VIEW, STUDENT_VIEW,
5556
ResourceTemplates, shim_xmodule_js,
5657
XModuleMixin, XModuleToXBlockMixin,
5758
)
5859
from xmodule.xml_block import XmlMixin, deserialize_field, is_pointer_tag, name_to_pathname
59-
6060
from .bumper_utils import bumperize
6161
from .sharing_sites import sharing_sites_info_for_video
6262
from .transcripts_utils import (
@@ -70,6 +70,7 @@
7070
from .video_handlers import VideoStudentViewHandlers, VideoStudioViewHandlers
7171
from .video_utils import create_youtube_string, format_xml_exception_message, get_poster, rewrite_video_url
7272
from .video_xfields import VideoFields
73+
from ..toggles import USE_EXTRACTED_VIDEO_BLOCK
7374

7475
# The following import/except block for edxval is temporary measure until
7576
# edxval is a proper XBlock Runtime Service.
@@ -119,7 +120,7 @@
119120

120121
@XBlock.wants('settings', 'completion', 'i18n', 'request_cache')
121122
@XBlock.needs('mako', 'user')
122-
class VideoBlock(
123+
class _BuiltInVideoBlock(
123124
VideoFields, VideoTranscriptsMixin, VideoStudioViewHandlers, VideoStudentViewHandlers,
124125
EmptyDataRawMixin, XmlMixin, EditingMixin, XModuleToXBlockMixin,
125126
ResourceTemplates, XModuleMixin, LicenseMixin):
@@ -134,6 +135,7 @@ class VideoBlock(
134135
<source src=".../mit-3091x/M-3091X-FA12-L21-3_100.ogv"/>
135136
</video>
136137
"""
138+
is_extracted = False
137139
has_custom_completion = True
138140
completion_mode = XBlockCompletionMode.COMPLETABLE
139141

@@ -1260,3 +1262,9 @@ def _poster(self):
12601262
edx_video_id=self.edx_video_id.strip()
12611263
)
12621264
return None
1265+
1266+
1267+
VideoBlock = (
1268+
_ExtractedVideoBlock if USE_EXTRACTED_VIDEO_BLOCK.is_enabled()
1269+
else _BuiltInVideoBlock
1270+
)

0 commit comments

Comments
 (0)