1
0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-27 21:54:17 +01:00

Changed all '%s', to '{}'.format()

This also fixes a bug on line 105: format() got '%s' instead of '{}'.
This commit is contained in:
iwconfig 2017-03-14 22:42:29 +01:00 committed by Johan Andersson
parent 5caf6d8354
commit e5e7fd0293

View File

@ -100,9 +100,9 @@ class postprocess(object):
new_name = u"{0}.mp4".format(name)
if self.merge_subtitle:
log.info(u"Muxing %s and merging its subtitle into %s", orig_filename, new_name)
log.info(u"Muxing {} and merging its subtitle into {}".format(orig_filename, new_name))
else:
log.info(u"Muxing %s into %s".format(orig_filename, new_name))
log.info(u"Muxing {} into {}".format(orig_filename, new_name))
tempfile = u"{0}.temp".format(orig_filename)
arguments = ["-map", "0:v", "-map", "0:a", "-c", "copy", "-copyts", "-f", "mp4"]
@ -129,7 +129,7 @@ class postprocess(object):
if p.returncode != 0:
stderr = stderr.decode('utf-8', 'replace')
msg = stderr.strip().split('\n')[-1]
log.error("Something went wrong: %s", msg)
log.error("Something went wrong: {}".format(msg))
return
if self.merge_subtitle and not self.external_subtitle:
@ -152,9 +152,9 @@ class postprocess(object):
orig_filename = self.stream.options.output
if self.merge_subtitle:
log.info("Merge audio, video and subtitle into %s", orig_filename)
log.info("Merge audio, video and subtitle into {}".format(orig_filename))
else:
log.info("Merge audio and video into %s", orig_filename)
log.info("Merge audio and video into {}".format(orig_filename))
tempfile = u"{0}.temp".format(orig_filename)
name = os.path.splitext(orig_filename)[0]
@ -181,7 +181,7 @@ class postprocess(object):
if p.returncode != 0:
stderr = stderr.decode('utf-8', 'replace')
msg = stderr.strip().split('\n')[-1]
log.error("Something went wrong: %s", msg)
log.error("Something went wrong: {}".format(msg))
return
log.info("Merging done, removing old files.")