studio/blender-studio-pipeline
13
29
Fork 18
Code Issues 17 Pull Requests 4 Projects Releases 1 Activity

Render Review: Fix File Delimiter #224

Merged
Nick Alberelli merged 1 commits from TinyNick/blender-studio-pipeline:fix/render-review-naming into main 2024-02-01 18:01:58 +01:00
Conversation 0 Commits 1 Files Changed 2 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts-blender/addons/render_review/ops.py
View File

@ -911,6 +911,7 @@ class RR_OT_sqe_push_to_edit(bpy.types.Operator):
return context.window_manager.invoke_props_dialog(self, width=width) return context.window_manager.invoke_props_dialog(self, width=width)
def get_edit_filepath(self, strip: bpy.types.Sequence) -> Path: def get_edit_filepath(self, strip: bpy.types.Sequence) -> Path:
delimiter = vars.DELIMITER
render_dir = opsdata.get_strip_folder(strip) render_dir = opsdata.get_strip_folder(strip)
shot_previews_dir = opsdata.get_shot_previews_path(strip) shot_previews_dir = opsdata.get_shot_previews_path(strip)
@ -931,7 +932,7 @@ class RR_OT_sqe_push_to_edit(bpy.types.Operator):
if ( if (
file.name.replace(version, "") file.name.replace(version, "")
== f"{opsdata.get_shot_dot_task_type(render_dir)}..mp4" == f"{opsdata.get_shot_dot_task_type(render_dir)}{delimiter}.mp4"
): ):
existing_files.append(file) existing_files.append(file)
@ -945,7 +946,7 @@ class RR_OT_sqe_push_to_edit(bpy.types.Operator):
# Compose edit filepath of new mp4 file. # Compose edit filepath of new mp4 file.
edit_filepath = ( edit_filepath = (
shot_previews_dir shot_previews_dir
/ f"{opsdata.get_shot_dot_task_type(render_dir)}.{increment}.mp4" / f"{opsdata.get_shot_dot_task_type(render_dir)}{delimiter}{increment}.mp4"
) )
return edit_filepath return edit_filepath

1
scripts-blender/addons/render_review/vars.py
View File

@ -22,3 +22,4 @@
RESOLUTION = (2048, 858) RESOLUTION = (2048, 858)
VERSION_PATTERN = r"v\d\d\d" VERSION_PATTERN = r"v\d\d\d"
FPS = 24 FPS = 24
DELIMITER = "-"