From c9e9f6e6d5b0637b5a88a3b6919fa8968b53165c Mon Sep 17 00:00:00 2001 From: Alexander Kryklia Date: Tue, 18 Feb 2014 16:48:31 +0200 Subject: [PATCH] Remove duplicate code in transcripts_ajax. --- .../contentstore/views/transcripts_ajax.py | 33 +++++++------------ 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/cms/djangoapps/contentstore/views/transcripts_ajax.py b/cms/djangoapps/contentstore/views/transcripts_ajax.py index d30e2a29c4..c0d7b95b79 100644 --- a/cms/djangoapps/contentstore/views/transcripts_ajax.py +++ b/cms/djangoapps/contentstore/views/transcripts_ajax.py @@ -115,29 +115,20 @@ def upload_transcripts(request): # Allow upload only if any video link is presented if video_list: sub_attr = source_subs_name - - try: # Generate and save for 1.0 speed, will create subs_sub_attr.srt.sjson subtitles file in storage. + try: + # Generate and save for 1.0 speed, will create subs_sub_attr.srt.sjson subtitles file in storage. generate_subs_from_source({1: sub_attr}, source_subs_ext, source_subs_filedata, item) - except TranscriptsGenerationException as e: - return error_response(response, e.message) - statuses = {} - for video_dict in video_list: - video_name = video_dict['video'] - # We are creating transcripts for every video source, - # for the case that in future, some of video sources can be deleted. - statuses[video_name] = copy_or_rename_transcript(video_name, sub_attr, item, user=request.user) - try: - # updates item.sub with `video_name` if it is successful. - copy_or_rename_transcript(video_name, sub_attr, item, user=request.user) - selected_name = video_name # name to write to item.sub field, chosen at random. - except NotFoundError: - # subtitles file `sub_attr` is not presented in the system. Nothing to copy or rename. - return error_response(response, "Can't find transcripts in storage for {}".format(sub_attr)) - item.sub = selected_name # write one of new subtitles names to item.sub attribute. - item.save_with_metadata(request.user) - response['subs'] = item.sub - response['status'] = 'Success' + for video_dict in video_list: + video_name = video_dict['video'] + # We are creating transcripts for every video source, if in future some of video sources would be deleted. + # Updates item.sub with `video_name` on success. + copy_or_rename_transcript(video_name, sub_attr, item, user=request.user) + + response['subs'] = item.sub + response['status'] = 'Success' + except Exception as ex: + return error_response(response, ex.message) else: return error_response(response, 'Empty video sources.')