Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2728 from edx/alex/allow_static_in_transcript_names

Browse Source 
Allow /static in transcript names.
This commit is contained in:
Alexander Kryklia
2014-02-26 17:01:39 +02:00
parent cb4d3dd327 2e78fce760
commit 9ffcbb88b5
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/lib/xmodule/xmodule/video_module/transcripts_utils.py
View File

@@ -327,7 +327,10 @@ def manage_video_subtitles_save(item, user, old_metadata=None, generate_translat
This whole action ensures that after user changes video fields, proper `sub` files, corresponding This whole action ensures that after user changes video fields, proper `sub` files, corresponding
to new values of video fields, will be presented in system. to new values of video fields, will be presented in system.
# 2. Generate transcripts translation only when user clicks `save` button, not while switching tabs. # 2 convert /static/filename.srt to filename.srt in self.transcripts.
(it is done to allow user to enter both /static/filename.srt and filename.srt)
# 3. Generate transcripts translation only when user clicks `save` button, not while switching tabs.
a) delete sjson translation for those languages, which were removed from `item.transcripts`. a) delete sjson translation for those languages, which were removed from `item.transcripts`.
Note: we are not deleting old SRT files to give user more flexibility. Note: we are not deleting old SRT files to give user more flexibility.
b) For all SRT files in`item.transcripts` regenerate new SJSON files. b) For all SRT files in`item.transcripts` regenerate new SJSON files.
@@ -358,17 +361,22 @@ def manage_video_subtitles_save(item, user, old_metadata=None, generate_translat
) )
# 2. # 2.
if generate_translation:
for lang, filename in item.transcripts.items():
item.transcripts[lang] = os.path.split(filename)[-1]
# 3.
if generate_translation: if generate_translation:
old_langs = set(old_metadata.get('transcripts', {})) if old_metadata else set() old_langs = set(old_metadata.get('transcripts', {})) if old_metadata else set()
new_langs = set(item.transcripts) new_langs = set(item.transcripts)
for lang in old_langs.difference(new_langs): # 2a for lang in old_langs.difference(new_langs): # 3a
for video_id in possible_video_id_list: for video_id in possible_video_id_list:
if video_id: if video_id:
remove_subs_from_store(video_id, item, lang) remove_subs_from_store(video_id, item, lang)
reraised_message = '' reraised_message = ''
for lang in new_langs: # 2b for lang in new_langs: # 3b
try: try:
generate_sjson_for_all_speeds( generate_sjson_for_all_speeds(
item, item,