From ce18ab98b9ddd5d4c3c46ef9cf7636cd9d74079e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 13 Apr 2023 16:42:05 +0200
Subject: [PATCH] TrayPublisher: Move 'BatchMovieCreator' settings to 'create'
subcategory (#4827)
* move 'BatchMovieCreator' settings to 'create' subcategory
* change label of simple creators
* added label to create plugins
---
.../plugins/create/create_movie_batch.py | 7 +-
.../project_settings/traypublisher.json | 22 +++---
.../schema_project_traypublisher.json | 68 +++++++++++--------
3 files changed, 52 insertions(+), 45 deletions(-)
diff --git a/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py b/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py
index d077131e4c..1bed07f785 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py
@@ -36,11 +36,9 @@ class BatchMovieCreator(TrayPublishCreator):
# Position batch creator after simple creators
order = 110
- def __init__(self, project_settings, *args, **kwargs):
- super(BatchMovieCreator, self).__init__(project_settings,
- *args, **kwargs)
+ def apply_settings(self, project_settings, system_settings):
creator_settings = (
- project_settings["traypublisher"]["BatchMovieCreator"]
+ project_settings["traypublisher"]["create"]["BatchMovieCreator"]
)
self.default_variants = creator_settings["default_variants"]
self.default_tasks = creator_settings["default_tasks"]
@@ -151,4 +149,3 @@ class BatchMovieCreator(TrayPublishCreator):
File names must then contain only asset name, or asset name + version.
(eg. 'chair.mov', 'chair_v001.mov', not really safe `my_chair_v001.mov`
"""
-
diff --git a/openpype/settings/defaults/project_settings/traypublisher.json b/openpype/settings/defaults/project_settings/traypublisher.json
index fdea4aeaba..1b4253a1f8 100644
--- a/openpype/settings/defaults/project_settings/traypublisher.json
+++ b/openpype/settings/defaults/project_settings/traypublisher.json
@@ -303,16 +303,18 @@
]
}
},
- "BatchMovieCreator": {
- "default_variants": [
- "Main"
- ],
- "default_tasks": [
- "Compositing"
- ],
- "extensions": [
- ".mov"
- ]
+ "create": {
+ "BatchMovieCreator": {
+ "default_variants": [
+ "Main"
+ ],
+ "default_tasks": [
+ "Compositing"
+ ],
+ "extensions": [
+ ".mov"
+ ]
+ }
},
"publish": {
"ValidateFrameRange": {
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
index 2ef1d2a414..f05f3433b0 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
@@ -26,7 +26,7 @@
"type": "list",
"collapsible": true,
"key": "simple_creators",
- "label": "Creator plugins",
+ "label": "Simple Create Plugins",
"use_label_wrap": true,
"collapsible_key": true,
"object_type": {
@@ -292,40 +292,48 @@
]
},
{
+ "key": "create",
+ "label": "Create plugins",
"type": "dict",
"collapsible": true,
- "key": "BatchMovieCreator",
- "label": "Batch Movie Creator",
- "collapsible_key": true,
"children": [
{
- "type": "label",
- "label": "Allows to publish multiple video files in one go.
Name of matching asset is parsed from file names ('asset.mov', 'asset_v001.mov', 'my_asset_to_publish.mov')"
- },
- {
- "type": "list",
- "key": "default_variants",
- "label": "Default variants",
- "object_type": {
- "type": "text"
- }
- },
- {
- "type": "list",
- "key": "default_tasks",
- "label": "Default tasks",
- "object_type": {
- "type": "text"
- }
- },
- {
- "type": "list",
- "key": "extensions",
- "label": "Extensions",
- "use_label_wrap": true,
+ "type": "dict",
+ "collapsible": true,
+ "key": "BatchMovieCreator",
+ "label": "Batch Movie Creator",
"collapsible_key": true,
- "collapsed": false,
- "object_type": "text"
+ "children": [
+ {
+ "type": "label",
+ "label": "Allows to publish multiple video files in one go.
Name of matching asset is parsed from file names ('asset.mov', 'asset_v001.mov', 'my_asset_to_publish.mov')"
+ },
+ {
+ "type": "list",
+ "key": "default_variants",
+ "label": "Default variants",
+ "object_type": {
+ "type": "text"
+ }
+ },
+ {
+ "type": "list",
+ "key": "default_tasks",
+ "label": "Default tasks",
+ "object_type": {
+ "type": "text"
+ }
+ },
+ {
+ "type": "list",
+ "key": "extensions",
+ "label": "Extensions",
+ "use_label_wrap": true,
+ "collapsible_key": true,
+ "collapsed": false,
+ "object_type": "text"
+ }
+ ]
}
]
},