Checking existing uasset data during setting version after the load

client/ayon_unreal/api/pipeline.py

@@ -713,15 +713,6 @@ def replace_static_mesh_actors(old_assets, new_assets, selected):
         new_assets,
         selected
     )
-    unreal.log("static_mesh_comps")
-    unreal.log(static_mesh_comps)
-
-    unreal.log("old_meshes")
-    unreal.log(old_meshes)
-
-    unreal.log("new_meshes")
-    unreal.log(old_meshes)
-
 
     for old_name, old_mesh in old_meshes.items():
         new_mesh = new_meshes.get(old_name)
@@ -846,13 +837,14 @@ def select_camera(sequence):
                 actor_subsys.set_actor_selection_state(actor, False)
 
 
-def format_asset_directory(context, directory_template):
+def format_asset_directory(context, directory_template,
+                           use_content_plugin=False, content_plugin_name=""):
     """Setting up the asset directory path and name.
     Args:
-        name (str): Instance name
         context (dict): context
         directory_template (str): directory template path
-        extension (str, optional): file extension. Defaults to "abc".
+        use_content_plugin (bool): whether content plugin is used for the asset directory
+        content_plugin_name (str, optional): content plugin name.
     Returns:
         tuple[str, str]: asset directory, asset name
     """
@@ -889,7 +881,11 @@ def format_asset_directory(context, directory_template):
         data["version"]["version"] = f"v{version:03d}"
     asset_name_with_version = set_asset_name(data)
     asset_dir = StringTemplate(directory_template).format_strict(data)
-    return f"{AYON_ROOT_DIR}/{asset_dir}", asset_name_with_version
+    root_dir = AYON_ROOT_DIR
+    if use_content_plugin and content_plugin_name:
+        root_dir = root_dir.replace("Game", content_plugin_name)
+
+    return f"{root_dir}/{asset_dir}", asset_name_with_version
 
 
 def set_asset_name(data):
@@ -1034,16 +1030,25 @@ def get_frame_range_from_folder_attributes(folder_entity=None):
     return frame_start, frame_end
 
 
-def has_asset_existing_directory(asset_name, asset_dir):
+def has_asset_existing_directory(asset_name, asset_dir,
+                                 use_content_plugin, content_plugin_name):
     """Check if the asset already existed
     Args:
         asset_name (str): asset name
+        asset_dir (str): asset directory
+        use_content_plugin (bool): whether content plugin is used
+        content_plugin_name (str): name of the content plugin
 
     Returns:
         str: package path
     """
     asset_registry = unreal.AssetRegistryHelpers.get_asset_registry()
     all_assets = asset_registry.get_assets_by_path('/Game', recursive=True)
+    if use_content_plugin and content_plugin_name:
+        content_plugin_asset = asset_registry.get_assets_by_path(
+            f'/{content_plugin_name}', recursive=True)
+        all_assets.extend(content_plugin_asset)
+
     for game_asset in all_assets:
         if game_asset.asset_name == asset_name:
             asset_path = game_asset.get_asset().get_path_name()
@@ -1054,10 +1059,13 @@ def has_asset_existing_directory(asset_name, asset_dir):
                 return asset_path
     return None
 
-def has_asset_directory_pattern_matched(asset_name, asset_dir, name, extension=None):
+def has_asset_directory_pattern_matched(asset_name, asset_dir, name, extension=None,
+                                        use_content_plugin=False, content_plugin_name=""):
     version_folder = asset_dir.split("/")[-1]
     target_asset_dir = asset_dir.replace(version_folder, "")
-    asset_path = has_asset_existing_directory(asset_name, target_asset_dir)
+    asset_path = has_asset_existing_directory(
+        asset_name, target_asset_dir, use_content_plugin, content_plugin_name
+    )
     if not asset_path:
         return None
     existing_asset_dir = unreal.Paths.split(asset_path)[0]
@@ -1074,6 +1082,25 @@ def has_asset_directory_pattern_matched(asset_name, asset_dir, name, extension=N
     return None
 
 
+def has_content_plugin_path(content_plugin_name):
+    """Search if the content plugin from the ayon settings exist in
+    the Unreal project
+
+    Args:
+        content_plugin_name (str): Content plugin name
+
+    Returns:
+        str: content plugin name
+    """
+    asset_registry = unreal.AssetRegistryHelpers.get_asset_registry()
+
+    # Get all assets
+    asset_list = asset_registry.get_all_assets()
+    for package in asset_list:
+        if unreal.Paths.split(package.package_path)[0].startswith(f"/{content_plugin_name}"):
+            return content_plugin_name
+
+
 def get_top_hierarchy_folder(path):
     """Get top hierarchy of the path
 
@@ -1250,3 +1277,24 @@ def add_track(sequence, track):
         return sequence.add_track(track)
     else:
         return sequence.add_master_track(track)
+
+
+def remove_asset_from_content_plugin(container):
+    """Remove the AYON-loaded asset from content plugin
+    (Only valid when users manually migrates the asset)
+
+    Args:
+        container (dict): container data
+    """
+    path = container["namespace"]
+    content_plugin_path = container.get("content_plugin_path", "")
+    if content_plugin_path:
+        path = path.replace(AYON_ROOT_DIR, f"/{content_plugin_path}/Ayon")
+        if unreal.EditorAssetLibrary.does_directory_exist(path):
+            container_name = container["container_name"]
+            container_path = f"{path}/{container_name}"
+            if unreal.EditorAssetLibrary.does_asset_exist(container_path):
+                container = unreal.EditorAssetLibrary.load_asset(container_path)
+                data = unreal.EditorAssetLibrary.get_metadata_tag_values(container)
+                if data["namespace"] == container["namespace"]:
+                    unreal.EditorAssetLibrary.delete_directory(path)

client/ayon_unreal/api/plugin.py

@@ -20,7 +20,8 @@
 from .lib import remove_loaded_asset
 from ayon_core.lib import (
     BoolDef,
-    UILabelDef
+    UILabelDef,
+    EnumDef
 )
 from ayon_core.pipeline import (
     AutoCreator,
@@ -300,6 +301,26 @@ class LayoutLoader(Loader):
     color = "orange"
     loaded_layout_dir = "{folder[path]}/{product[name]}"
     remove_loaded_assets = False
+    content_plugin_enabled = False
+    content_plugin_path = []
+
+    @classmethod
+    def get_options(cls, contexts):
+        default_content_plugin = next(
+            (path for path in cls.content_plugin_path), "")
+        return [
+            BoolDef(
+                "content_plugin_enabled",
+                label="Content Plugin",
+                default=cls.content_plugin_enabled
+            ),
+            EnumDef(
+                    "content_plugin_name",
+                    label="Content Plugin Name",
+                    items=[path for path in cls.content_plugin_path],
+                    default=default_content_plugin
+            )
+        ]
 
     @staticmethod
     def _get_fbx_loader(loaders, family):
@@ -413,7 +434,8 @@ def imprint(
         asset_name,
         container_name,
         project_name,
-        hierarchy_dir=None
+        hierarchy_dir=None,
+        content_plugin_name=None
     ):
         data = {
             "schema": "ayon:container-2.0",
@@ -432,10 +454,12 @@ def imprint(
         }
         if hierarchy_dir is not None:
             data["master_directory"] = hierarchy_dir
+        if content_plugin_name:
+            data["content_plugin_name"] = content_plugin_name
         imprint(
             "{}/{}".format(asset_dir, container_name), data)
 
-    def _load_assets(self, instance_name, repre_id, product_type, repr_format):
+    def _load_assets(self, instance_name, repre_id, product_type, repr_format, options):
         all_loaders = discover_loader_plugins()
         loaders = loaders_from_representation(
             all_loaders, repre_id)
@@ -461,15 +485,16 @@ def _load_assets(self, instance_name, repre_id, product_type, repr_format):
                     f"{product_type}")
             return
 
-        options = {
-            # "asset_dir": asset_dir
+        import_options = {
+            "content_plugin_enabled": options["content_plugin_enabled"],
+            "content_plugin_name": options.get("content_plugin_name", "")
         }
 
         assets = load_container(
             loader,
             repre_id,
             namespace=instance_name,
-            options=options
+            options=import_options
         )
         return assets
 

client/ayon_unreal/plugins/inventory/update_actors.py

@@ -5,7 +5,7 @@
     ls,
     replace_static_mesh_actors,
     replace_skeletal_mesh_actors,
-    replace_geometry_cache_actors,
+    replace_geometry_cache_actors
 )
 from ayon_core.pipeline import InventoryAction
 
@@ -68,9 +68,6 @@ def update_assets(containers, selected):
                 sa_dir, recursive=True, include_folder=False
             )
 
-            unreal.log("old_content")
-            unreal.log(old_content)
-
             if container.get("family") == "rig":
                 replace_skeletal_mesh_actors(
                     old_content, asset_content, selected)