blender
/
blender
136
403
Fork 586
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

Cleanup: use f-string

This commit is contained in:
Campbell Barton 2018-06-30 22:02:41 +02:00
parent bea62c5c1a
commit 9738de820a
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
release/scripts/startup/bl_operators/screen_play_rendered_anim.py
View File

@ -75,10 +75,12 @@ class PlayRenderedAnim(Operator):
def execute(self, context):
import subprocess
from shlex import quote
scene = context.scene
rd = scene.render
prefs = context.user_preferences
fps_final = rd.fps / rd.fps_base
preset = prefs.filepaths.animation_player_preset
player_path = prefs.filepaths.animation_player
@ -112,7 +114,7 @@ class PlayRenderedAnim(Operator):
file = rd.frame_path(frame=scene.frame_start, preview=scene.use_preview_range)
file = bpy.path.abspath(file) # expand '//'
if not os.path.exists(file):
self.report({'WARNING'}, "File %r not found" % file)
self.report({'WARNING'}, f"File {file!r} not found")
path_valid = False
# one last try for full range if we used preview range
@ -120,7 +122,7 @@ class PlayRenderedAnim(Operator):
file = rd.frame_path(frame=scene.frame_start, preview=False)
file = bpy.path.abspath(file) # expand '//'
if not os.path.exists(file):
self.report({'WARNING'}, "File %r not found" % file)
self.report({'WARNING'}, "File {file!r} not found")
cmd = [player_path]
# extra options, fps controls etc.
@ -131,31 +133,34 @@ class PlayRenderedAnim(Operator):
frame_start = scene.frame_start
frame_end = scene.frame_end
if preset == 'INTERNAL':
opts = ["-a",
"-f", str(rd.fps), str(rd.fps_base),
"-s", str(frame_start),
"-e", str(frame_end),
"-j", str(scene.frame_step),
file]
opts = [
"-a",
"-f", str(rd.fps), str(rd.fps_base),
"-s", str(frame_start),
"-e", str(frame_end),
"-j", str(scene.frame_step),
file,
]
cmd.extend(opts)
elif preset == 'DJV':
opts = [file, "-playback_speed", "%d" % int(rd.fps / rd.fps_base)]
opts = [file, "-playback_speed", str(int(fps_final))]
cmd.extend(opts)
elif preset == 'FRAMECYCLER':
opts = [file, "%d-%d" % (scene.frame_start, scene.frame_end)]
opts = [file, f"{scene.frame_start:d}-{scene.frame_end:d}"]
cmd.extend(opts)
elif preset == 'RV':
opts = ["-fps", str(rd.fps), "-play", "[ %s ]" % file]
opts = ["-fps", str(rd.fps), "-play", f"[ {file} ]"]
cmd.extend(opts)
elif preset == 'MPLAYER':
opts = []
if is_movie:
opts.append(file)
else:
opts += [("mf://%s" % file.replace("#", "?")),
"-mf",
"fps=%.4f" % (rd.fps / rd.fps_base),
]
opts += [
("mf://" + file.replace("#", "?")),
"-mf",
f"fps={fps_final:4f}"
]
opts += ["-loop", "0", "-really-quiet", "-fs"]
cmd.extend(opts)
@ -163,7 +168,7 @@ class PlayRenderedAnim(Operator):
cmd.append(file)
# launch it
print("Executing command:\n %r" % " ".join(cmd))
print("Executing command:\n ", " ".join(quote(c) for c in cmd))
# workaround for boost 1.46, can be eventually removed. bug: [#32350]
env_copy = os.environ.copy()
@ -174,9 +179,11 @@ class PlayRenderedAnim(Operator):
try:
subprocess.Popen(cmd, env=env_copy)
except Exception as e:
self.report({'ERROR'},
"Couldn't run external animation player with command "
"%r\n%s" % (" ".join(cmd), str(e)))
self.report(
{'ERROR'},
"Couldn't run external animation player with command "
f"{cmd!r}\n{e!s}",
)
return {'CANCELLED'}
return {'FINISHED'}