heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify an if and fix string formatting

Browse Source
This commit is contained in:
Boris Bobrov 2018-07-13 18:29:01 +02:00
parent 8510eca07b
commit 92a94f4e77
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mediagoblin/media_types/video/processing.py
View File

@ -260,11 +260,10 @@ class CommonVideoProcessor(MediaProcessor):
# If we didn't transcode, then we need to keep the original # If we didn't transcode, then we need to keep the original
self.did_transcode = False self.did_transcode = False
for each_res in self.video_config['available_resolutions']: for each_res in self.video_config['available_resolutions']:
if ('webm_' + str(each_res)) in self.entry.media_files: if 'webm_{}'.format(each_res) in self.entry.media_files:
self.did_transcode = True self.did_transcode = True
break break
if not self.did_transcode or \ if not self.did_transcode or self.video_config['keep_original']:
(self.video_config['keep_original'] and self.did_transcode):
copy_original( copy_original(
self.entry, self.process_filename, self.entry, self.process_filename,
self.name_builder.fill('{basename}{ext}')) self.name_builder.fill('{basename}{ext}'))