From ed987073478f9f3ba53c393edcd33711a0e9d1a0 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 10 Sep 2024 21:41:00 +0200 Subject: [PATCH 1/4] Add missing space in log message --- client/ayon_core/plugins/publish/extract_burnin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/plugins/publish/extract_burnin.py b/client/ayon_core/plugins/publish/extract_burnin.py index 58a032a030..a25b7244d4 100644 --- a/client/ayon_core/plugins/publish/extract_burnin.py +++ b/client/ayon_core/plugins/publish/extract_burnin.py @@ -198,7 +198,7 @@ class ExtractBurnin(publish.Extractor): ) if not burnins_per_repres: self.log.debug( - "Skipped instance. No representations found matching a burnin" + "Skipped instance. No representations found matching a burnin " "definition in: %s", burnin_defs ) return From 264ff3f217c974fb36d1c070fec27dd761e37c4c Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 10 Sep 2024 21:58:52 +0200 Subject: [PATCH 2/4] Cosmetics --- .../ayon_core/plugins/publish/extract_burnin.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/client/ayon_core/plugins/publish/extract_burnin.py b/client/ayon_core/plugins/publish/extract_burnin.py index a25b7244d4..12cc9fbc71 100644 --- a/client/ayon_core/plugins/publish/extract_burnin.py +++ b/client/ayon_core/plugins/publish/extract_burnin.py @@ -399,7 +399,7 @@ class ExtractBurnin(publish.Extractor): add_repre_files_for_cleanup(instance, new_repre) - # Cleanup temp staging dir after procesisng of output definitions + # Cleanup temp staging dir after processing of output definitions if do_convert: temp_dir = repre["stagingDir"] shutil.rmtree(temp_dir) @@ -420,6 +420,11 @@ class ExtractBurnin(publish.Extractor): self.log.debug("Removed: \"{}\"".format(filepath)) def _get_burnin_options(self): + """Get the burnin options from `ExtractBurnin` settings. + + Returns: + dict[str, Any]: Burnin options. + """ # Prepare burnin options burnin_options = copy.deepcopy(self.default_options) if self.options: @@ -696,7 +701,7 @@ class ExtractBurnin(publish.Extractor): """Prepare data for representation. Args: - instance (Instance): Currently processed Instance. + instance (pyblish.api.Instance): Currently processed Instance. repre (dict): Currently processed representation. burnin_data (dict): Copy of basic burnin data based on instance data. @@ -752,9 +757,10 @@ class ExtractBurnin(publish.Extractor): Args: profile (dict): Profile from presets matching current context. + instance (pyblish.api.Instance): Publish instance. Returns: - list: Contain all valid output definitions. + list[dict[str, Any]]: Contain all valid output definitions. """ filtered_burnin_defs = [] @@ -774,8 +780,8 @@ class ExtractBurnin(publish.Extractor): families, families_filters ): self.log.debug(( - "Skipped burnin definition \"{}\". Family" - " filters ({}) does not match current instance families: {}" + "Skipped burnin definition \"{}\". Family filters ({}) " + "does not match current instance families: {}" ).format( filename_suffix, str(families_filters), str(families) )) From c2cfef7703d7ee9bb8ddd77b18d848ef4efdbdd5 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 18 Sep 2024 00:48:44 +0200 Subject: [PATCH 3/4] Apply suggestions from code review Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- client/ayon_core/plugins/publish/extract_burnin.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/ayon_core/plugins/publish/extract_burnin.py b/client/ayon_core/plugins/publish/extract_burnin.py index 12cc9fbc71..00f49a55b9 100644 --- a/client/ayon_core/plugins/publish/extract_burnin.py +++ b/client/ayon_core/plugins/publish/extract_burnin.py @@ -198,8 +198,8 @@ class ExtractBurnin(publish.Extractor): ) if not burnins_per_repres: self.log.debug( - "Skipped instance. No representations found matching a burnin " - "definition in: %s", burnin_defs + "Skipped instance. No representations found matching a burnin" + " definition in: %s", burnin_defs ) return @@ -424,6 +424,7 @@ class ExtractBurnin(publish.Extractor): Returns: dict[str, Any]: Burnin options. + """ # Prepare burnin options burnin_options = copy.deepcopy(self.default_options) @@ -761,6 +762,7 @@ class ExtractBurnin(publish.Extractor): Returns: list[dict[str, Any]]: Contain all valid output definitions. + """ filtered_burnin_defs = [] From 086b452a02e4c94bf4457c13271019de2908dadf Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 18 Sep 2024 00:51:19 +0200 Subject: [PATCH 4/4] Reformat based on code review --- client/ayon_core/plugins/publish/extract_burnin.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/client/ayon_core/plugins/publish/extract_burnin.py b/client/ayon_core/plugins/publish/extract_burnin.py index 12cc9fbc71..dff82f3a80 100644 --- a/client/ayon_core/plugins/publish/extract_burnin.py +++ b/client/ayon_core/plugins/publish/extract_burnin.py @@ -779,12 +779,11 @@ class ExtractBurnin(publish.Extractor): if not self.families_filter_validation( families, families_filters ): - self.log.debug(( - "Skipped burnin definition \"{}\". Family filters ({}) " - "does not match current instance families: {}" - ).format( - filename_suffix, str(families_filters), str(families) - )) + self.log.debug( + f"Skipped burnin definition \"{filename_suffix}\"." + f" Family filters ({families_filters}) does not match" + f" current instance families: {families}" + ) continue # Burnin values