From 86c2aaff37b336ed3f11498dc46db51dcef4ec24 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 4 Aug 2021 10:47:30 +0100 Subject: [PATCH 1/6] Get data from context with defined keys. --- openpype/plugins/publish/extract_burnin.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/openpype/plugins/publish/extract_burnin.py b/openpype/plugins/publish/extract_burnin.py index ef52d51325..88ccbdda1c 100644 --- a/openpype/plugins/publish/extract_burnin.py +++ b/openpype/plugins/publish/extract_burnin.py @@ -156,6 +156,16 @@ class ExtractBurnin(openpype.api.Extractor): filled_anatomy = anatomy.format_all(burnin_data) burnin_data["anatomy"] = filled_anatomy.get_solved() + # Add context data burnin_data. + burnin_data["context"] = {} + for item in repre_burnin_defs: + for field, setting in repre_burnin_defs[item].items(): + if "context" in setting: + key = setting.split("[")[1].split("]")[0] + burnin_data["context"][key] = ( + setting.format(context=instance.context.data) + ) + # Add source camera name to burnin data camera_name = repre.get("camera_name") if camera_name: From 26174213bd443e5f92471ef634b71ab83c24b944 Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 4 Aug 2021 10:52:06 +0100 Subject: [PATCH 2/6] Hound fix. --- openpype/plugins/publish/extract_burnin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_burnin.py b/openpype/plugins/publish/extract_burnin.py index 88ccbdda1c..a30f713e8a 100644 --- a/openpype/plugins/publish/extract_burnin.py +++ b/openpype/plugins/publish/extract_burnin.py @@ -159,7 +159,7 @@ class ExtractBurnin(openpype.api.Extractor): # Add context data burnin_data. burnin_data["context"] = {} for item in repre_burnin_defs: - for field, setting in repre_burnin_defs[item].items(): + for _, setting in repre_burnin_defs[item].items(): if "context" in setting: key = setting.split("[")[1].split("]")[0] burnin_data["context"][key] = ( From ebcfe422ac612b84096a2599a7fdfecb8f187d7a Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 4 Aug 2021 16:51:09 +0100 Subject: [PATCH 3/6] Simplify to predefined data variable. --- openpype/plugins/publish/extract_burnin.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/openpype/plugins/publish/extract_burnin.py b/openpype/plugins/publish/extract_burnin.py index a30f713e8a..2fab67cdb9 100644 --- a/openpype/plugins/publish/extract_burnin.py +++ b/openpype/plugins/publish/extract_burnin.py @@ -1,6 +1,5 @@ import os import re -import subprocess import json import copy import tempfile @@ -157,14 +156,7 @@ class ExtractBurnin(openpype.api.Extractor): burnin_data["anatomy"] = filled_anatomy.get_solved() # Add context data burnin_data. - burnin_data["context"] = {} - for item in repre_burnin_defs: - for _, setting in repre_burnin_defs[item].items(): - if "context" in setting: - key = setting.split("[")[1].split("]")[0] - burnin_data["context"][key] = ( - setting.format(context=instance.context.data) - ) + burnin_data["context"] = instance.context.data["burnin_context"] # Add source camera name to burnin data camera_name = repre.get("camera_name") From c130b72f126a31142e71f6d749d5b5ee65e1a3b3 Mon Sep 17 00:00:00 2001 From: Toke Jepsen Date: Fri, 27 Aug 2021 11:02:05 +0100 Subject: [PATCH 4/6] Update openpype/plugins/publish/extract_burnin.py Co-authored-by: Milan Kolar --- openpype/plugins/publish/extract_burnin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_burnin.py b/openpype/plugins/publish/extract_burnin.py index 2fab67cdb9..b35f514509 100644 --- a/openpype/plugins/publish/extract_burnin.py +++ b/openpype/plugins/publish/extract_burnin.py @@ -156,7 +156,7 @@ class ExtractBurnin(openpype.api.Extractor): burnin_data["anatomy"] = filled_anatomy.get_solved() # Add context data burnin_data. - burnin_data["context"] = instance.context.data["burnin_context"] + burnin_data["context"] = instance.context.data.get("burnin_context") or {} # Add source camera name to burnin data camera_name = repre.get("camera_name") From 1693be8778cac688de8c8606c7b19a495ed7e7b5 Mon Sep 17 00:00:00 2001 From: Toke Jepsen Date: Fri, 27 Aug 2021 11:04:49 +0100 Subject: [PATCH 5/6] Update openpype/plugins/publish/extract_burnin.py --- openpype/plugins/publish/extract_burnin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openpype/plugins/publish/extract_burnin.py b/openpype/plugins/publish/extract_burnin.py index b35f514509..fae79d6334 100644 --- a/openpype/plugins/publish/extract_burnin.py +++ b/openpype/plugins/publish/extract_burnin.py @@ -156,7 +156,9 @@ class ExtractBurnin(openpype.api.Extractor): burnin_data["anatomy"] = filled_anatomy.get_solved() # Add context data burnin_data. - burnin_data["context"] = instance.context.data.get("burnin_context") or {} + burnin_data["context"] = ( + instance.context.data.get("burnin_context") or {} + ) # Add source camera name to burnin data camera_name = repre.get("camera_name") From 9887e00859850cf0044452b0413db8406624f051 Mon Sep 17 00:00:00 2001 From: Toke Jepsen Date: Wed, 1 Sep 2021 09:36:20 +0200 Subject: [PATCH 6/6] Update openpype/plugins/publish/extract_burnin.py Co-authored-by: Milan Kolar --- openpype/plugins/publish/extract_burnin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/plugins/publish/extract_burnin.py b/openpype/plugins/publish/extract_burnin.py index fae79d6334..a9076c3e3c 100644 --- a/openpype/plugins/publish/extract_burnin.py +++ b/openpype/plugins/publish/extract_burnin.py @@ -156,8 +156,8 @@ class ExtractBurnin(openpype.api.Extractor): burnin_data["anatomy"] = filled_anatomy.get_solved() # Add context data burnin_data. - burnin_data["context"] = ( - instance.context.data.get("burnin_context") or {} + burnin_data["custom"] = ( + instance.data.get("custom_burnin_data") or {} ) # Add source camera name to burnin data