aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/media_types
diff options
context:
space:
mode:
authorBoris Bobrov <breton@cynicmansion.ru>2018-07-13 18:29:01 +0200
committerBoris Bobrov <breton@cynicmansion.ru>2018-07-13 18:29:01 +0200
commit92a94f4e77a45abc9096502bb0af69139d10a103 (patch)
tree2a411071734d6f464d911b3e1a9337f07e24fad4 /mediagoblin/media_types
parent8510eca07baf4715e8f5500bbced2c38bcaaf740 (diff)
downloadmediagoblin-92a94f4e77a45abc9096502bb0af69139d10a103.tar.lz
mediagoblin-92a94f4e77a45abc9096502bb0af69139d10a103.tar.xz
mediagoblin-92a94f4e77a45abc9096502bb0af69139d10a103.zip
simplify an if and fix string formatting
Diffstat (limited to 'mediagoblin/media_types')
-rw-r--r--mediagoblin/media_types/video/processing.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py
index 012ba352..79d356cc 100644
--- a/mediagoblin/media_types/video/processing.py
+++ b/mediagoblin/media_types/video/processing.py
@@ -260,11 +260,10 @@ class CommonVideoProcessor(MediaProcessor):
# If we didn't transcode, then we need to keep the original
self.did_transcode = False
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
break
- if not self.did_transcode or \
- (self.video_config['keep_original'] and self.did_transcode):
+ if not self.did_transcode or self.video_config['keep_original']:
copy_original(
self.entry, self.process_filename,
self.name_builder.fill('{basename}{ext}'))