chore: Implement TODOs

Author: farhan

xblocks_contrib/video/toggles.py

@@ -40,3 +40,35 @@ def get_course_organization(video_block, course_id):
     if video_config_service:
         return video_config_service.get_course_organization(course_id)
     return None
+
+
+def is_youtube_deprecated(video_block, course_id):
+    """Check if YouTube is deprecated."""
+    video_config_service = video_block.runtime.service(video_block, 'video_config')
+    if video_config_service:
+        return video_config_service.is_youtube_deprecated(course_id)
+    return False  # Default from edx-platform: DEPRECATE_YOUTUBE toggle_default: False
+
+
+def is_youtube_blocked_for_course(video_block, course_id):
+    """Check if YouTube is blocked for course."""
+    video_config_service = video_block.runtime.service(video_block, 'video_config')
+    if video_config_service:
+        return video_config_service.is_youtube_blocked_for_course(course_id)
+    return False  # Default from edx-platform: CourseYoutubeBlockedFlag default: False
+
+
+def is_public_video_share_enabled(video_block, course_id):
+    """Check if public video share is enabled."""
+    video_config_service = video_block.runtime.service(video_block, 'video_config')
+    if video_config_service:
+        return video_config_service.is_public_video_share_enabled(course_id)
+    return False  # Default from edx-platform: PUBLIC_VIDEO_SHARE toggle_default: False
+
+
+def is_transcript_feedback_enabled(video_block, course_id):
+    """Check if transcript feedback is enabled."""
+    video_config_service = video_block.runtime.service(video_block, 'video_config')
+    if video_config_service:
+        return video_config_service.is_transcript_feedback_enabled(course_id)
+    return False  # Default from edx-platform: TRANSCRIPT_FEEDBACK toggle_default: False

xblocks_contrib/video/video.py

@@ -47,12 +47,23 @@
     is_hls_playback_enabled,
     get_branding_info,
     get_course_by_id,
-    get_course_organization
+    get_course_organization,
+    is_youtube_deprecated,
+    is_youtube_blocked_for_course,
+    is_public_video_share_enabled,
+    is_transcript_feedback_enabled
 )
 from xblocks_contrib.video.utils import deserialize_field, own_metadata
 from xblocks_contrib.video.validation import StudioValidation, StudioValidationMessage
-# TODO: reimport following wild card import
-from xblocks_contrib.video.constants import *
+from xblocks_contrib.video.constants import (
+    STUDENT_VIEW,
+    PUBLIC_VIEW,
+    ATTR_KEY_USER_ID,
+    ATTR_KEY_REQUEST_COUNTRY_CODE,
+    COURSE_VIDEO_SHARING_PER_VIDEO,
+    COURSE_VIDEO_SHARING_ALL_VIDEOS,
+    COURSE_VIDEO_SHARING_NONE,
+)
 from xblocks_contrib.video.transcripts_utils import (
     Transcript,
     VideoTranscriptsMixin,
@@ -111,6 +122,7 @@
 LMS_ROOT_URL = "https://localhost:18000"
 
 
+# TODO: Add request_cache to the wants list
 @XBlock.wants('settings', 'completion', 'i18n')
 @XBlock.needs("i18n", 'user', 'video_config')
 class VideoBlock(
@@ -211,31 +223,25 @@ def youtube_deprecated(self):
         """
         Return True if youtube is deprecated and hls as primary playback is enabled else False
         """
-        # # Return False if `hls` playback feature is disabled.
-        # if not HLSPlaybackEnabledFlag.feature_enabled(self.location.course_key):
-        #     return False
-        #
-        # # check if youtube has been deprecated and hls as primary playback
-        # # is enabled for this course
-        # return DEPRECATE_YOUTUBE.is_enabled(self.location.course_key)
-        # TODO: Implement this method
-        return True
+        # Return False if `hls` playback feature is disabled.
+        if not is_hls_playback_enabled(self, self.location.course_key):
+            return False
+
+        # check if youtube has been deprecated and hls as primary playback
+        # is enabled for this course
+        return is_youtube_deprecated(self, self.location.course_key)
 
     def youtube_disabled_for_course(self):  # lint-amnesty, pylint: disable=missing-function-docstring
-        # TODO: Un comment following code
-        # if not self.location.context_key.is_course:
-        #     return False  # Only courses have this flag
-        # request_cache = RequestCache('youtube_disabled_for_course')
-        # cache_response = request_cache.get_cached_response(self.location.context_key)
-        # if cache_response.is_found:
-        #     return cache_response.value
-
-        # # TODO: Un comment following as its linked to model
-        # # youtube_is_disabled = CourseYoutubeBlockedFlag.feature_enabled(self.location.course_key)
-        # youtube_is_disabled = True
-        # request_cache.set(self.location.context_key, youtube_is_disabled)
-        # return youtube_is_disabled
-        return False
+        if not self.location.context_key.is_course:
+            return False  # Only courses have this flag
+        request_cache = RequestCache('youtube_disabled_for_course')
+        cache_response = request_cache.get_cached_response(self.location.context_key)
+        if cache_response.is_found:
+            return cache_response.value
+
+        youtube_is_disabled = is_youtube_blocked_for_course(self, self.location.course_key)
+        request_cache.set(self.location.context_key, youtube_is_disabled)
+        return youtube_is_disabled
 
     def prioritize_hls(self, youtube_streams, html5_sources):
         """
@@ -326,7 +332,6 @@ def get_html(self, view=STUDENT_VIEW,
             try:
                 val_profiles = ["youtube", "desktop_webm", "desktop_mp4"]
 
-                # Use VideoConfigService to check HLS playback enabled
                 if is_hls_playback_enabled(self, self.course_id):
                     val_profiles.append('hls')
 
@@ -557,9 +562,7 @@ def is_public_sharing_enabled(self):
             return False  # Only courses support this feature at all (not libraries)
         try:
             # Video share feature must be enabled for sharing settings to take effect
-            # TODO: How to access waffle flag
-            # feature_enabled = PUBLIC_VIDEO_SHARE.is_enabled(self.context_key)
-            feature_enabled = False
+            feature_enabled = is_public_video_share_enabled(self, self.context_key)
         except Exception as err:  # pylint: disable=broad-except
             log.exception(f"Error retrieving course for course ID: {self.context_key}")
             return False
@@ -590,9 +593,7 @@ def is_transcript_feedback_enabled(self):
             return False  # Only courses support this feature at all (not libraries)
         try:
             # Video transcript feedback must be enabled in order to show the widget
-            # TODO: How to access waffle flags
-            # feature_enabled = TRANSCRIPT_FEEDBACK.is_enabled(self.context_key)
-            feature_enabled = False
+            feature_enabled = is_transcript_feedback_enabled(self, self.context_key)
         except Exception as err:  # pylint: disable=broad-except
             log.exception(f"Error retrieving course for course ID: {self.context_key}")
             return False
@@ -1048,7 +1049,7 @@ def get_youtube_link(video_id):
         if self.edx_video_id and edxval_api:
 
             val_profiles = ['youtube', 'desktop_webm', 'desktop_mp4']
-            if True: # TODO: HLSPlaybackEnabledFlag.feature_enabled(self.scope_ids.usage_id.context_key.for_branch(None)):
+            if is_hls_playback_enabled(self.scope_ids.usage_id.context_key.for_branch(None)):
                 val_profiles.append('hls')
 
             # Get video encodings for val profiles.
@@ -1306,7 +1307,7 @@ def student_view_data(self, context=None):
         # Check in VAL data first if edx_video_id exists
         if self.edx_video_id:
             video_profile_names = context.get("profiles", ["mobile_low", 'desktop_mp4', 'desktop_webm', 'mobile_high'])
-            if True: # TODO: HLSPlaybackEnabledFlag.feature_enabled(self.location.course_key) and 'hls' not in video_profile_names:
+            if is_hls_playback_enabled(self.location.course_key) and 'hls' not in video_profile_names:
                 video_profile_names.append('hls')
 
             # get and cache bulk VAL data for course