Resolve: removed few bugs

openpype/hosts/resolve/api/lib.py

@@ -319,14 +319,13 @@ def get_current_timeline_items(
  selected_track_count = timeline.GetTrackCount(track_type)
 
  # loop all tracks and get items
- _clips = dict()
+ _clips = {}
  for track_index in range(1, (int(selected_track_count) + 1)):
  _track_name = timeline.GetTrackName(track_type, track_index)
 
  # filter out all unmathed track names
- if track_name:
- if _track_name not in track_name:
- continue
+ if track_name and _track_name not in track_name:
+ continue
 
  timeline_items = timeline.GetItemListInTrack(
  track_type, track_index)
@@ -348,12 +347,8 @@ def get_current_timeline_items(
  "index": clip_index
  }
  ti_color = ti.GetClipColor()
- if filter is True:
- if selecting_color in ti_color:
- selected_clips.append(data)
- else:
+ if filter and selecting_color in ti_color or not filter:
  selected_clips.append(data)
-
  return selected_clips
 
 

openpype/hosts/resolve/api/plugin.py

@@ -506,7 +506,7 @@ def __init__(self, *args, **kwargs):
  super(Creator, self).__init__(*args, **kwargs)
  from openpype.api import get_current_project_settings
  resolve_p_settings = get_current_project_settings().get("resolve")
- self.presets = dict()
+ self.presets = {}
  if resolve_p_settings:
  self.presets = resolve_p_settings["create"].get(
  self.__class__.__name__, {})

openpype/hosts/resolve/plugins/create/create_shot_clip.py

@@ -116,12 +116,13 @@ class CreateShotClip(resolve.Creator):
  "order": 0},
  "vSyncTrack": {
  "value": gui_tracks, # noqa
- "type": "QComboBox",
- "label": "Hero track",
- "target": "ui",
- "toolTip": "Select driving track name which should be mastering all others", # noqa
- "order": 1}
+  "type": "QComboBox",
+  "label": "Hero track",
+  "target": "ui",
+  "toolTip": "Select driving track name which should be mastering all others", # noqa
+  "order": 1
  }
+ }
  },
  "publishSettings": {
  "type": "section",
@@ -172,28 +173,31 @@ class CreateShotClip(resolve.Creator):
  "target": "ui",
  "order": 4,
  "value": {
- "workfileFrameStart": {
- "value": 1001,
- "type": "QSpinBox",
- "label": "Workfiles Start Frame",
- "target": "tag",
- "toolTip": "Set workfile starting frame number", # noqa
- "order": 0},
- "handleStart": {
- "value": 0,
- "type": "QSpinBox",
- "label": "Handle start (head)",
- "target": "tag",
- "toolTip": "Handle at start of clip", # noqa
- "order": 1},
- "handleEnd": {
- "value": 0,
- "type": "QSpinBox",
- "label": "Handle end (tail)",
- "target": "tag",
- "toolTip": "Handle at end of clip", # noqa
- "order": 2},
- }
+ "workfileFrameStart": {
+ "value": 1001,
+ "type": "QSpinBox",
+ "label": "Workfiles Start Frame",
+ "target": "tag",
+ "toolTip": "Set workfile starting frame number", # noqa
+ "order": 0
+ },
+ "handleStart": {
+ "value": 0,
+ "type": "QSpinBox",
+ "label": "Handle start (head)",
+ "target": "tag",
+ "toolTip": "Handle at start of clip", # noqa
+ "order": 1
+ },
+ "handleEnd": {
+ "value": 0,
+ "type": "QSpinBox",
+ "label": "Handle end (tail)",
+ "target": "tag",
+ "toolTip": "Handle at end of clip", # noqa
+ "order": 2
+ }
+ }
  }
  }
 
@@ -229,8 +233,10 @@ def process(self):
  v_sync_track = widget.result["vSyncTrack"]["value"]
 
  # sort selected trackItems by
- sorted_selected_track_items = list()
- unsorted_selected_track_items = list()
+ sorted_selected_track_items = []
+ unsorted_selected_track_items = []
+ print("_____ selected ______")
+ print(self.selected)
  for track_item_data in self.selected:
  if track_item_data["track"]["name"] in v_sync_track:
  sorted_selected_track_items.append(track_item_data)
@@ -253,10 +259,10 @@ def process(self):
  "sq_frame_start": sq_frame_start,
  "sq_markers": sq_markers
  }
-
+ print(kwargs)
  for i, track_item_data in enumerate(sorted_selected_track_items):
  self.rename_index = i
-
+ self.log.info(track_item_data)
  # convert track item to timeline media pool item
  track_item = resolve.PublishClip(
  self, track_item_data, **kwargs).convert()

openpype/hosts/resolve/plugins/load/load_clip.py

@@ -19,7 +19,7 @@ class LoadClip(resolve.TimelineItemLoader):
  """
 
  families = ["render2d", "source", "plate", "render", "review"]
- representations = ["exr", "dpx", "jpg", "jpeg", "png", "h264", ".mov"]
+ representations = ["exr", "dpx", "jpg", "jpeg", "png", "h264", "mov"]
 
  label = "Load as clip"
  order = -10

openpype/hosts/resolve/plugins/publish/precollect_workfile.py

@@ -30,7 +30,8 @@ def process(self, context):
  "asset": asset,
  "subset": "{}{}".format(asset, subset.capitalize()),
  "item": project,
- "family": "workfile"
+ "family": "workfile",
+ "families": []
  }
 
  # create instance with workfile