From fa256ad2a8ac153b24e81e156e6612c8538d4e65 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 28 Sep 2022 16:28:32 +0200
Subject: [PATCH] Force repair on new comp without asking the user

---
 openpype/hosts/fusion/api/lib.py      | 28 ++++++++++++++++-----------
 openpype/hosts/fusion/api/pipeline.py |  2 +-
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py
index a55d25829e..a33e5cf289 100644
--- a/openpype/hosts/fusion/api/lib.py
+++ b/openpype/hosts/fusion/api/lib.py
@@ -90,7 +90,7 @@ def set_asset_resolution():
     })
 
 
-def validate_comp_prefs(comp=None):
+def validate_comp_prefs(comp=None, force_repair=False):
     """Validate current comp defaults with asset settings.
 
     Validates fps, resolutionWidth, resolutionHeight, aspectRatio.
@@ -133,21 +133,22 @@ def validate_comp_prefs(comp=None):
         asset_value = asset_data[key]
         comp_value = comp_frame_format_prefs.get(comp_key)
         if asset_value != comp_value:
-            # todo: Actually show dialog to user instead of just logging
-            log.warning(
-                "Comp {pref} {value} does not match asset "
-                "'{asset_name}' {pref} {asset_value}".format(
-                    pref=label,
-                    value=comp_value,
-                    asset_name=asset_doc["name"],
-                    asset_value=asset_value)
-            )
-
             invalid_msg = "{} {} should be {}".format(label,
                                                       comp_value,
                                                       asset_value)
             invalid.append(invalid_msg)
 
+            if not force_repair:
+                # Do not log warning if we force repair anyway
+                log.warning(
+                    "Comp {pref} {value} does not match asset "
+                    "'{asset_name}' {pref} {asset_value}".format(
+                        pref=label,
+                        value=comp_value,
+                        asset_name=asset_doc["name"],
+                        asset_value=asset_value)
+                )
+
     if invalid:
 
         def _on_repair():
@@ -158,6 +159,11 @@ def validate_comp_prefs(comp=None):
                 attributes[comp_key_full] = value
             comp.SetPrefs(attributes)
 
+        if force_repair:
+            log.info("Applying default Comp preferences..")
+            _on_repair()
+            return
+
         from . import menu
         from openpype.widgets import popup
         from openpype.style import load_stylesheet
diff --git a/openpype/hosts/fusion/api/pipeline.py b/openpype/hosts/fusion/api/pipeline.py
index 2043fa290f..79928c0d96 100644
--- a/openpype/hosts/fusion/api/pipeline.py
+++ b/openpype/hosts/fusion/api/pipeline.py
@@ -143,7 +143,7 @@ def on_pyblish_instance_toggled(instance, old_value, new_value):
 
 def on_new(event):
     comp = event["Rets"]["comp"]
-    validate_comp_prefs(comp)
+    validate_comp_prefs(comp, force_repair=True)
 
 
 def on_save(event):