diff --git a/cms/djangoapps/contentstore/views/tests/test_transcripts.py b/cms/djangoapps/contentstore/views/tests/test_transcripts.py index 61c0bd81b9c8..07979fb0a54e 100644 --- a/cms/djangoapps/contentstore/views/tests/test_transcripts.py +++ b/cms/djangoapps/contentstore/views/tests/test_transcripts.py @@ -60,14 +60,14 @@ class BaseTranscripts(CourseTestCase): def clear_subs_content(self): """Remove, if transcripts content exists.""" - for youtube_id in self.get_youtube_ids().values(): - filename = f'subs_{youtube_id}.srt.sjson' - content_location = StaticContent.compute_location(self.course.id, filename) - try: - content = contentstore().find(content_location) - contentstore().delete(content.get_id()) - except NotFoundError: - pass + item = modulestore().get_item(self.video_usage_key) + filename = f'subs_{item.youtube_id_1_0}.srt.sjson' + content_location = StaticContent.compute_location(self.course.id, filename) + try: + content = contentstore().find(content_location) + contentstore().delete(content.get_id()) + except NotFoundError: + pass def save_subs_to_store(self, subs, subs_id): """ @@ -129,17 +129,6 @@ def _get_usage_key(self, resp): usage_key_string = json.loads(resp.content.decode('utf-8')).get('locator') return UsageKey.from_string(usage_key_string) - def get_youtube_ids(self): - """Return youtube speeds and ids.""" - item = modulestore().get_item(self.video_usage_key) - - return { - 0.75: item.youtube_id_0_75, - 1: item.youtube_id_1_0, - 1.25: item.youtube_id_1_25, - 1.5: item.youtube_id_1_5 - } - def create_non_video_block(self): """ Setup non video block for tests. diff --git a/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py b/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py index 97a20deac993..8bb5ebc37b77 100644 --- a/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py +++ b/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py @@ -155,7 +155,7 @@ def test_dump_course_structure(self): video_metadata.pop('edx_video_id', None) self.assertCountEqual( list(video_metadata.keys()), - ['youtube_id_0_75', 'youtube_id_1_0', 'youtube_id_1_25', 'youtube_id_1_5'] + ['youtube_id_1_0'] ) assert 'youtube_id_1_0' in dump[video_id]['metadata'] diff --git a/lms/djangoapps/courseware/tests/test_video_handlers.py b/lms/djangoapps/courseware/tests/test_video_handlers.py index ef0fb862833d..bff1b8b5a5d7 100644 --- a/lms/djangoapps/courseware/tests/test_video_handlers.py +++ b/lms/djangoapps/courseware/tests/test_video_handlers.py @@ -667,37 +667,11 @@ def test_translation_non_en_youtube_success(self): # youtube 1_0 request, will generate for all speeds for existing ids self.block.youtube_id_1_0 = subs_id - self.block.youtube_id_0_75 = '0_75' self.store.update_item(self.block, self.user.id) request = _create_djangowebobrequest_object_for_url(f'/translation/uk?videoId={subs_id}') response = self.block.transcript(request=request, dispatch='translation/uk') self.assertDictEqual(json.loads(response.body.decode('utf-8')), subs) - # 0_75 subs are exist - request = _create_djangowebobrequest_object_for_url('/translation/uk?videoId={}'.format('0_75')) - response = self.block.transcript(request=request, dispatch='translation/uk') - calculated_0_75 = { - 'end': [75], - 'start': [9], - 'text': [ - '\u041f\u0440\u0438\u0432\u0456\u0442, edX \u0432\u0456\u0442\u0430\u0454 \u0432\u0430\u0441.' - ] - } - - self.assertDictEqual(json.loads(response.body.decode('utf-8')), calculated_0_75) - # 1_5 will be generated from 1_0 - self.block.youtube_id_1_5 = '1_5' - self.store.update_item(self.block, self.user.id) - request = _create_djangowebobrequest_object_for_url('/translation/uk?videoId={}'.format('1_5')) - response = self.block.transcript(request=request, dispatch='translation/uk') - calculated_1_5 = { - 'end': [150], - 'start': [18], - 'text': [ - '\u041f\u0440\u0438\u0432\u0456\u0442, edX \u0432\u0456\u0442\u0430\u0454 \u0432\u0430\u0441.' - ] - } - self.assertDictEqual(json.loads(response.body.decode('utf-8')), calculated_1_5) @ddt.data( ('translation/en', 'translation/en', attach_sub), diff --git a/xmodule/modulestore/tests/sample_courses.py b/xmodule/modulestore/tests/sample_courses.py index 04a56b82e1ad..0355372ff863 100644 --- a/xmodule/modulestore/tests/sample_courses.py +++ b/xmodule/modulestore/tests/sample_courses.py @@ -144,28 +144,19 @@ }, [ BlockInfo( "sample_video", "video", { - "youtube_id_1_25": "AKqURZnYqpk", - "youtube_id_0_75": "JMD_ifUUfsU", "youtube_id_1_0": "OEoXaMPEzfM", "display_name": "default", - "youtube_id_1_5": "DYpADpL7jAY" }, []), BlockInfo( "separate_file_video", "video", { - "youtube_id_1_25": "AKqURZnYqpk", - "youtube_id_0_75": "JMD_ifUUfsU", "youtube_id_1_0": "OEoXaMPEzfM", "display_name": "default", - "youtube_id_1_5": "DYpADpL7jAY" }, []), BlockInfo( "video_with_end_time", "video", { - "youtube_id_1_25": "AKqURZnYqpk", "display_name": "default", "youtube_id_1_0": "OEoXaMPEzfM", "end_time": datetime.timedelta(seconds=10), - "youtube_id_1_5": "DYpADpL7jAY", - "youtube_id_0_75": "JMD_ifUUfsU" }, []), BlockInfo( "T1_changemind_poll_foo_2", "poll_question", { diff --git a/xmodule/tests/test_video.py b/xmodule/tests/test_video.py index 1179feebf324..46ad3f935703 100644 --- a/xmodule/tests/test_video.py +++ b/xmodule/tests/test_video.py @@ -203,21 +203,16 @@ def test_create_youtube_string(self): """ Test that Youtube ID strings are correctly created when writing back out to XML. """ - self.block.youtube_id_0_75 = 'izygArpw-Qo' self.block.youtube_id_1_0 = 'p2Q6BrNhdh8' - self.block.youtube_id_1_25 = '1EeWXzPdhSA' - self.block.youtube_id_1_5 = 'rABDYkeK0x8' - expected = "0.75:izygArpw-Qo,1.00:p2Q6BrNhdh8,1.25:1EeWXzPdhSA,1.50:rABDYkeK0x8" + expected = "1.00:p2Q6BrNhdh8" assert create_youtube_string(self.block) == expected def test_create_youtube_string_missing(self): """ Test that Youtube IDs which aren't explicitly set aren't included in the output string. """ - self.block.youtube_id_0_75 = 'izygArpw-Qo' self.block.youtube_id_1_0 = 'p2Q6BrNhdh8' - self.block.youtube_id_1_25 = '1EeWXzPdhSA' - expected = "0.75:izygArpw-Qo,1.00:p2Q6BrNhdh8,1.25:1EeWXzPdhSA" + expected = "1.00:p2Q6BrNhdh8" assert create_youtube_string(self.block) == expected diff --git a/xmodule/video_block/video_utils.py b/xmodule/video_block/video_utils.py index 64f6ec875a2a..b3af0249354e 100644 --- a/xmodule/video_block/video_utils.py +++ b/xmodule/video_block/video_utils.py @@ -22,12 +22,9 @@ def create_youtube_string(block): courses. """ youtube_ids = [ - block.youtube_id_0_75, block.youtube_id_1_0, - block.youtube_id_1_25, - block.youtube_id_1_5 ] - youtube_speeds = ['0.75', '1.00', '1.25', '1.50'] + youtube_speeds = ['1.00'] return ','.join([ ':'.join(pair) for pair diff --git a/xmodule/video_block/video_xfields.py b/xmodule/video_block/video_xfields.py index 873ed01f285c..6bf6e0f516fd 100644 --- a/xmodule/video_block/video_xfields.py +++ b/xmodule/video_block/video_xfields.py @@ -36,24 +36,6 @@ class VideoFields: scope=Scope.settings, default="3_yD_cEKoCk" ) - youtube_id_0_75 = String( - help=_("Optional, for older browsers: the YouTube ID for the .75x speed video."), - display_name=_("YouTube ID for .75x speed"), - scope=Scope.settings, - default="" - ) - youtube_id_1_25 = String( - help=_("Optional, for older browsers: the YouTube ID for the 1.25x speed video."), - display_name=_("YouTube ID for 1.25x speed"), - scope=Scope.settings, - default="" - ) - youtube_id_1_5 = String( - help=_("Optional, for older browsers: the YouTube ID for the 1.5x speed video."), - display_name=_("YouTube ID for 1.5x speed"), - scope=Scope.settings, - default="" - ) start_time = RelativeTime( # datetime.timedelta object help=_( "Time you want the video to start if you don't want the entire video to play. "