pinning file creation now allows to create pinning file for rel paths…

… via rootles paths
ynput · Sep 9, 2024 · fefa609 · fefa609
1 parent e1e4a3b
commit fefa609
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/client/ayon_usd/addon.py b/client/ayon_usd/addon.py
@@ -47,6 +47,7 @@ def initialize(self, module_settings):
             )
         self.enabled = True
         self._download_window = None
+        print(DOWNLOAD_DIR)
 
     def tray_start(self):
         """Start tray module.

diff --git a/client/ayon_usd/ayon_bin_client b/client/ayon_usd/ayon_bin_client
diff --git a/client/ayon_usd/standalone/usd/pinning/__pinning_file_generation_funcs.py b/client/ayon_usd/standalone/usd/pinning/__pinning_file_generation_funcs.py
@@ -51,7 +51,9 @@ def _replace_match(match: re.Match):
     rootless_dependency_info = {}
     for key, path in dependency_info.items():
         new_path = regx.sub(_replace_match, path)
-        rootless_dependency_info[key] = new_path
+        new_key = regx.sub(_replace_match, key)
+
+        rootless_dependency_info[new_key] = new_path
 
     return rootless_dependency_info
 
@@ -180,20 +182,27 @@ def get_asset_dependencies(
     asset_identifier_list: List[str] = layer.GetCompositionAssetDependencies()
 
     for ref in asset_identifier_list:
-
         resolved_path = resolver.Resolve(layer.ComputeAbsolutePath(ref))
-
         ref = _remove_sdf_args(ref)
+
         resolved_path_str = resolved_path.GetPathString()
-        identifier_to_path[ref] = resolved_path_str
+        search_path_string = ""
+        if is_uri(ref):
+            search_path_string = ref
+        else:
+            search_path_string = resolved_path_str
+
+
+        identifier_to_path[search_path_string] = resolved_path_str
+
 
         recursive_result = get_asset_dependencies(
-            resolved_path_str,
+            search_path_string,
             resolver,
             processed_layers,
         )
         identifier_to_path.update(recursive_result)
-
+   
     return identifier_to_path
+52 −0		.github/workflows/static.yml
+1 −0		.gitignore
+3 −1		.gitmodules
+2,621 −0		Docs/src/Doxyfile
+338 −0		Docs/src/custom.css
+424 −0		Docs/src/custom_dark_theme.css
+62 −0		Docs/src/generate.py
+19 −0		Docs/src/html_footer.html
+55 −0		Docs/src/html_header.html
+88 −0		Docs/src/md/Examples.md
+58 −0		Docs/src/md/Getting_Started.md
+21 −0		Docs/src/md/client_gui.md
+14 −0		Docs/src/md/client_lakectlpy.md
+6 −0		Docs/src/md/client_util.md
+25 −0		Docs/src/md/client_work_hanlder.md
+26 −0		Docs/src/md/mainpage.md
+62 −12		Project.py
+3 −3		README.md
+62 −15		ayon_bin_distro/gui/progress_ui.py
+ −		ayon_bin_distro/lakectlpy/bin/lakectl.exe
+85 −8		ayon_bin_distro/lakectlpy/wrapper.py
+9 −2		ayon_bin_distro/util/zip.py
+87 −18		ayon_bin_distro/work_handler/worker.py
+1 −1		test/test_lake_fs_wrapper.py