Skip to content

Commit

Permalink
Standardize to AYON case when possible
Browse files Browse the repository at this point in the history
Ayon name stays as plugin name to match other plugins
  • Loading branch information
kalisp committed Feb 13, 2025
1 parent 7ade0b4 commit b474e1b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
18 changes: 9 additions & 9 deletions client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.param
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,30 @@ Description=Not configurable

[AyonExecutable]
Type=multilinemultifilename
Label=Ayon Executable
Category=Ayon Executables
Label=AYON Executable
Category=AYON Executables
CategoryOrder=1
Index=0
Default=
Description=The path to the Ayon executable. Enter alternative paths on separate lines.
Description=The path to the AYON executable. Enter alternative paths on separate lines.

[AyonServerUrl]
Type=string
Label=Ayon Server Url
Category=Ayon Credentials
Label=AYON Server Url
Category=AYON Credentials
CategoryOrder=2
Index=0
Default=
Description=Url to Ayon server
Description=Url to AYON server

[AyonApiKey]
Type=password
Label=Ayon API key
Category=Ayon Credentials
Label=AYON API key
Category=AYON Credentials
CategoryOrder=2
Index=0
Default=
Description=API key for service account on Ayon Server
Description=API key for service account on AYON Server

[AyonAdditionalServerUrls]
Type=multilinestring
Expand Down
8 changes: 4 additions & 4 deletions client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def CleanupDeadlinePlugin(deadlinePlugin):

class AyonDeadlinePlugin(DeadlinePlugin):
"""
Standalone plugin for publishing from Ayon
Standalone plugin for publishing from AYON
Calls Ayonexecutable 'ayon_console' from first correctly found
file based on plugin configuration. Uses 'publish' command and passes
Expand Down Expand Up @@ -68,9 +68,9 @@ def InitializeProcess(self):
def RenderExecutable(self):
job = self.GetJob()

# set required env vars for Ayon
# set required env vars for AYON
# cannot be in InitializeProcess as it is too soon
config = RepositoryUtils.GetPluginConfig("Ayon")
config = RepositoryUtils.GetPluginConfig("Ayon") # plugin name stays
ayon_server_url = (
job.GetJobEnvironmentKeyValue("AYON_SERVER_URL") or
config.GetConfigEntryWithDefault("AyonServerUrl", "")
Expand Down Expand Up @@ -104,7 +104,7 @@ def RenderExecutable(self):

if exe == "":
self.FailRender(
"Ayon executable was not found in the semicolon separated "
"AYON executable was not found in the semicolon separated "
"list: \"{}\". The path to the render executable can be "
"configured from the Plugin Configuration in the Deadline "
"Monitor.".format(exe_list)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -464,13 +464,13 @@ def inject_ayon_environment(deadlinePlugin):

if not exe:
raise RuntimeError((
"Ayon executable was not found in the semicolon "
"AYON executable was not found in the semicolon "
"separated list \"{}\"."
"The path to the render executable can be configured"
" from the Plugin Configuration in the Deadline Monitor."
).format(exe_list))

print("--- Ayon executable: {}".format(exe))
print("--- AYON executable: {}".format(exe))

ayon_bundle_name = job.GetJobEnvironmentKeyValue("AYON_BUNDLE_NAME")
if not ayon_bundle_name:
Expand Down Expand Up @@ -512,7 +512,7 @@ def inject_ayon_environment(deadlinePlugin):
if not all([ayon_server_url, ayon_api_key]):
raise RuntimeError((
"Missing required values for server url and api key. "
"Please fill in Ayon Deadline plugin or provide by "
"Please fill in AYON Deadline plugin or provide by "
"AYON_SERVER_URL and AYON_API_KEY"
))

Expand Down Expand Up @@ -660,7 +660,7 @@ def get_ayon_executable():
if not exe_list:
raise RuntimeError(
"Path to AYON executable not configured."
"Please set it in Ayon Deadline Plugin."
"Please set it in AYON Deadline Plugin."
)

# clean '\ ' for MacOS pasting
Expand Down

0 comments on commit b474e1b

Please sign in to comment.