rewrite import_shots and cleanup

This commit is contained in:
ChristopheSeux
2024-04-10 16:15:57 +02:00
parent dae9d55494
commit 2960bab63d
15 changed files with 1068 additions and 269 deletions
+89 -16
View File
@@ -110,6 +110,12 @@ class MetadataType(PropertyGroup):
class TaskType(PropertyGroup):
color : FloatVectorProperty(subtype='COLOR')
import_enabled : BoolProperty(default=False)
id : StringProperty(default='')
class Sequence(PropertyGroup):
import_enabled : BoolProperty(default=False)
id : StringProperty(default='')
class TaskStatus(PropertyGroup):
@@ -211,6 +217,66 @@ class SpreadsheetImport(PropertyGroup):
update_edit: BoolProperty(default=True)
def get_task_status_items(self, context):
settings = get_scene_settings()
project = settings.active_project
status_items = [('CURRENT', 'Current', '')]
if project:
status_items += [(t.name, t.name, '') for t in project.task_statuses]
return status_items
def get_task_type_items(self, context):
settings = get_scene_settings()
project = settings.active_project
if not project:
return [('NONE', 'None', '')]
return [(t.name, t.name, '') for t in project.task_types]
class ImportShots(PropertyGroup):
import_source: EnumProperty(items=[(i, i.title(), '') for i in ('DISK', 'TRACKER')])
import_task: EnumProperty(items=[(i, i.title().replace('_', ' '), '')
for i in ('LAST', 'FROM_LIST', 'ALL')], default='FROM_LIST')
#sequence_dir_template: StringProperty(
# name="Sequence Template", default="$PROJECT_ROOT/sequences/{sequence}")
shot_folder_template: StringProperty(
name="Shot Template", default="$PROJECT_ROOT/sequences/sq{sequence}/sh{shot}")
import_video_template : StringProperty(
name="Video Path", default="./{task}/render/{version}.{ext}")
import_sequence: EnumProperty(items=[(i, i.title().replace('_', ' '), '')
for i in ('SELECTED_STRIPS', 'FROM_LIST', 'ALL')], default='FROM_LIST')
previews_folder: StringProperty(
name="Previews Folder", default="//sources", subtype='DIR_PATH')
class UploadToTracker(PropertyGroup):
render_strips: BoolProperty(default=False)
render_strip_template : StringProperty(
name="Movie Path", default="//render/{project_basename}.{ext}")
task : EnumProperty(items=get_task_type_items)
status : EnumProperty(items=get_task_status_items)
comment : StringProperty()
add_preview : BoolProperty(default=True)
preview_mode : EnumProperty(items=[(m, m.title().replace('_', ' '), '')
for m in ('ONLY_NEW', 'REPLACE', 'ADD')])
set_main_preview : BoolProperty(default=True)
casting : BoolProperty(default=True)
update_frames: BoolProperty(default=True)
custom_data : BoolProperty(default=True)
tasks_comment: BoolProperty(default=True)
def get_episodes_items(self, context):
settings = get_scene_settings()
@@ -232,7 +298,10 @@ class Project(PropertyGroup):
id : StringProperty(default='')
shot_start_number : IntProperty(name="Shot Start Number", default=10, min=0)
shot_padding : IntProperty(name="Shot Padding", default=4, min=0, max=10)
sequence_start_number : IntProperty(name="Sequence Start Number", default=10, min=0)
sequence_padding : IntProperty(name="Sequence Padding", default=3, min=0, max=10)
reset_by_sequence : BoolProperty(
name="Reset By Sequence",
@@ -247,13 +316,13 @@ class Project(PropertyGroup):
name="Shot Increment", default=10, min=0, step=10)
sequence_template : StringProperty(
name="Sequence Name", default="sq{index:03d}")
name="Sequence Name", default="sq{sequence}")
episode_template : StringProperty(
name="Episode Name", default="ep{index:03d}")
name="Episode Name", default="ep{episode}")
shot_template : StringProperty(
name="Shot Name", default="{sequence}_sh{index:04d}")
name="Shot Name", default="sq{sequence}_sh{shot}")
render_video_template : StringProperty(
name="Movie Path", default="//render/{project_basename}.{ext}")
@@ -300,17 +369,15 @@ class Project(PropertyGroup):
task_types : CollectionProperty(type=TaskType)
task_type_index : IntProperty()
task_statuses : CollectionProperty(type=TaskStatus)
sequences : CollectionProperty(type=Sequence)
spreadsheet_import: PointerProperty(type=SpreadsheetImport)
spreadsheet_export: PointerProperty(type=SpreadsheetExport)
type : StringProperty()
import_source: EnumProperty(items=[(i, i.title(), '') for i in ('DISK', 'TRACKER')])
import_task: EnumProperty(items=[(i, i.title(), '') for i in ('LAST', 'SELECTED', 'ALL')], default='LAST')
shot_dir_template: StringProperty(
name="Shot Template", default="$PROJECT_ROOT/sequences/{sequence}/sh{index:04d}")
upload_to_tracker: PointerProperty(type=UploadToTracker)
import_shots: PointerProperty(type=ImportShots)
@property
def active_episode(self):
@@ -354,8 +421,6 @@ class Project(PropertyGroup):
return cell_types
def set_spreadsheet(self):
cell_names = ['Sequence', 'Shot', 'Nb Frames', 'Description']
if self.type == 'TVSHOW':
cell_names.insert(0, 'Episode')
@@ -563,6 +628,7 @@ def on_project_updated(self, context):
os.environ['TRACKER_PROJECT_ID'] = settings.active_project.id
class VSETB_PGT_scene_settings(PropertyGroup):
projects : CollectionProperty(type=Project)
@@ -649,17 +715,21 @@ class VSETB_PGT_strip_settings(PropertyGroup):
channel = get_channel_name(strip)
if channel == 'Sequences':
data = parse(strip.name, template=project.sequence_template)
data['index'] = int(data['index'])
data['sequence'] = strip.name
data = parse(project.sequence_template, strip.name)
#data['index'] = int(data['index'])
#data['sequence'] = strip.name
data['strip'] = strip.name
#data['shot'] = project.shot_template
elif channel == "Shots":
data = {}
if sequence_strip_name := get_strip_sequence_name(strip):
data = parse(project.sequence_template, sequence_strip_name)
data['sequence_strip'] = sequence_strip_name
data.update(parse(project.shot_template, strip.name))
#data['index'] = int(data['index'])
data = parse(strip.name, template=project.shot_template)
data['index'] = int(data['index'])
data['sequence'] = get_strip_sequence_name(strip)
data['strip'] = strip.name
#data['shot'] = project.shot_template
else:
@@ -677,11 +747,14 @@ classes = (
Episode,
Metadata,
MetadataType,
Sequence,
TaskType,
ShotTasks,
ShotTask,
SpreadsheetImport,
SpreadsheetExport,
ImportShots,
UploadToTracker,
Project,
VSETB_UL_spreadsheet_import,
VSETB_UL_spreadsheet_export,