Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

modified code to use AYON settings

Browse source
This commit is contained in:
Jakub Trllo 2024-02-16 09:43:19 +01:00
parent 834cea7066
commit 722923f3c0
3 changed files with 31 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

31
client/ayon_core/modules/royalrender/lib.py
View file

@ -213,30 +213,15 @@ class BaseCreateRoyalRenderJob(pyblish.api.InstancePlugin,
@staticmethod
def _resolve_rr_path(context, rr_path_name):
# type: (pyblish.api.Context, str) -> str
rr_settings = (
context.data
["system_settings"]
["modules"]
["royalrender"]
)
try:
default_servers = rr_settings["rr_paths"]
project_servers = (
context.data
["project_settings"]
["royalrender"]
["rr_paths"]
)
rr_servers = {
k: default_servers[k]
for k in project_servers
if k in default_servers
}
except (AttributeError, KeyError):
# Handle situation were we had only one url for royal render.
return context.data["defaultRRPath"][platform.system().lower()]
rr_settings = context.data["project_settings"]["royalrender"]
rr_paths = rr_settings["rr_paths"]
selected_paths = rr_settings["selected_rr_paths"]
rr_servers = {
path_key: rr_paths[path_key]
for path_key in selected_paths
if path_key in rr_paths
}
return rr_servers[rr_path_name][platform.system().lower()]
def expected_files(self, instance, path, start_frame, end_frame):

39
client/ayon_core/modules/royalrender/plugins/publish/collect_rr_path_from_instance.py
View file

@ -18,30 +18,21 @@ class CollectRRPathFromInstance(pyblish.api.InstancePlugin):
def _collect_rr_path_name(instance):
# type: (pyblish.api.Instance) -> str
"""Get Royal Render pat name from render instance."""
rr_settings = (
instance.context.data
["system_settings"]
["modules"]
["royalrender"]
)
if not instance.data.get("rrPaths"):
instance_rr_paths = instance.data.get("rrPaths")
if instance_rr_paths is None:
return "default"
try:
default_servers = rr_settings["rr_paths"]
project_servers = (
instance.context.data
["project_settings"]
["royalrender"]
["rr_paths"]
)
rr_servers = {
k: default_servers[k]
for k in project_servers
if k in default_servers
}
except (AttributeError, KeyError):
# Handle situation were we had only one url for royal render.
return rr_settings["rr_paths"]["default"]
rr_settings = instance.context.data["project_settings"]["royalrender"]
rr_paths = rr_settings["rr_paths"]
selected_paths = rr_settings["selected_rr_paths"]
return list(rr_servers.keys())[int(instance.data.get("rrPaths"))]
rr_servers = {
path_key
for path_key in selected_paths
if path_key in rr_paths
}
for instance_rr_path in instance_rr_paths:
if instance_rr_path in rr_servers:
return instance_rr_path
return "default"

31
client/ayon_core/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py
View file

@ -104,28 +104,13 @@ class SubmitJobsToRoyalRender(pyblish.api.ContextPlugin):
@staticmethod
def _resolve_rr_path(context, rr_path_name):
# type: (pyblish.api.Context, str) -> str
rr_settings = (
context.data
["system_settings"]
["modules"]
["royalrender"]
)
try:
default_servers = rr_settings["rr_paths"]
project_servers = (
context.data
["project_settings"]
["royalrender"]
["rr_paths"]
)
rr_servers = {
k: default_servers[k]
for k in project_servers
if k in default_servers
}
except (AttributeError, KeyError):
# Handle situation were we had only one url for royal render.
return context.data["defaultRRPath"][platform.system().lower()]
rr_settings = context.data["project_settings"]["royalrender"]
rr_paths = rr_settings["rr_paths"]
selected_paths = rr_settings["selected_rr_paths"]
rr_servers = {
path_key: rr_paths[path_key]
for path_key in selected_paths
if path_key in rr_paths
}
return rr_servers[rr_path_name][platform.system().lower()]