Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(resolve): moving resolve to pype3

Browse source
This commit is contained in:
Jakub Jezek 2020-12-18 14:37:36 +01:00
parent 5d68514ee3
commit c04093e2b8
No known key found for this signature in database
GPG key ID: C4B96E101D2A47F3
5 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pype/hooks/global/pre_with_windows_shell.py
View file

@ -11,7 +11,7 @@ class LaunchWithWindowsShell(PreLaunchHook):
""" """
order = 10 order = 10
app_groups = ["nuke", "nukex", "hiero", "nukestudio"] app_groups = ["resolve", "nuke", "nukex", "hiero", "nukestudio"]
platforms = ["windows"] platforms = ["windows"]
def execute(self): def execute(self):

13
pype/hooks/resolve/pre_resolve_setup.py
View file

@ -15,7 +15,8 @@ class ResolvePrelaunch(PreLaunchHook):
def execute(self): def execute(self):
# making sure pyton 3.6 is installed at provided path # making sure pyton 3.6 is installed at provided path
py36_dir = os.path.normpath(self.env.get("PYTHON36_RESOLVE", "")) py36_dir = os.path.normpath(
self.launch_context.env.get("PYTHON36_RESOLVE", ""))
assert os.path.isdir(py36_dir), ( assert os.path.isdir(py36_dir), (
"Python 3.6 is not installed at the provided folder path. Either " "Python 3.6 is not installed at the provided folder path. Either "
"make sure the `environments\resolve.json` is having correctly " "make sure the `environments\resolve.json` is having correctly "
@ -23,11 +24,10 @@ class ResolvePrelaunch(PreLaunchHook):
f"in given path. \nPYTHON36_RESOLVE: `{py36_dir}`" f"in given path. \nPYTHON36_RESOLVE: `{py36_dir}`"
) )
self.log.info(f"Path to Resolve Python folder: `{py36_dir}`...") self.log.info(f"Path to Resolve Python folder: `{py36_dir}`...")
self.env["PYTHON36_RESOLVE"] = py36_dir
# setting utility scripts dir for scripts syncing # setting utility scripts dir for scripts syncing
us_dir = os.path.normpath( us_dir = os.path.normpath(
self.env.get("RESOLVE_UTILITY_SCRIPTS_DIR", "") self.launch_context.env.get("RESOLVE_UTILITY_SCRIPTS_DIR", "")
) )
assert os.path.isdir(us_dir), ( assert os.path.isdir(us_dir), (
"Resolve utility script dir does not exists. Either make sure " "Resolve utility script dir does not exists. Either make sure "
@ -38,8 +38,9 @@ class ResolvePrelaunch(PreLaunchHook):
self.log.debug(f"-- us_dir: `{us_dir}`") self.log.debug(f"-- us_dir: `{us_dir}`")
# correctly format path for pre python script # correctly format path for pre python script
pre_py_sc = os.path.normpath(self.env.get("PRE_PYTHON_SCRIPT", "")) pre_py_sc = os.path.normpath(
self.env["PRE_PYTHON_SCRIPT"] = pre_py_sc self.launch_context.env.get("PRE_PYTHON_SCRIPT", ""))
self.launch_context.env["PRE_PYTHON_SCRIPT"] = pre_py_sc
self.log.debug(f"-- pre_py_sc: `{pre_py_sc}`...") self.log.debug(f"-- pre_py_sc: `{pre_py_sc}`...")
try: try:
__import__("pype.hosts.resolve") __import__("pype.hosts.resolve")
@ -55,4 +56,4 @@ class ResolvePrelaunch(PreLaunchHook):
# Resolve Setup integration # Resolve Setup integration
importlib.reload(utils) importlib.reload(utils)
self.log.debug(f"-- utils.__file__: `{utils.__file__}`") self.log.debug(f"-- utils.__file__: `{utils.__file__}`")
utils.setup(self.env) utils.setup(self.launch_context.env)

11
pype/settings/defaults/system_settings/applications.json
View file

@ -788,9 +788,7 @@
"RESOLVE_DEV" "RESOLVE_DEV"
] ]
}, },
"RESOLVE_UTILITY_SCRIPTS_SOURCE_DIR": [ "RESOLVE_UTILITY_SCRIPTS_SOURCE_DIR": [],
"{STUDIO_SOFT}/davinci_resolve/scripts/python"
],
"RESOLVE_SCRIPT_API": { "RESOLVE_SCRIPT_API": {
"windows": "{PROGRAMDATA}/Blackmagic Design/DaVinci Resolve/Support/Developer/Scripting", "windows": "{PROGRAMDATA}/Blackmagic Design/DaVinci Resolve/Support/Developer/Scripting",
"darvin": "/Library/Application Support/Blackmagic Design/DaVinci Resolve/Developer/Scripting", "darvin": "/Library/Application Support/Blackmagic Design/DaVinci Resolve/Developer/Scripting",
@ -834,7 +832,12 @@
"variant_label": "16", "variant_label": "16",
"icon": "", "icon": "",
"executables": { "executables": {
"windows": [], "windows": [
[
"C:/Program Files/Blackmagic Design/DaVinci Resolve/Resolve.exe",
""
]
],
"darwin": [], "darwin": [],
"linux": [] "linux": []
}, },

2
pype/settings/defaults/system_settings/modules.json
View file

@ -153,4 +153,4 @@
"idle_manager": { "idle_manager": {
"enabled": true "enabled": true
} }
} }

2
requirements.txt
View file

@ -14,7 +14,7 @@ google-api-python-client
jsonschema jsonschema
keyring keyring
log4mongo log4mongo
OpenTimelineIO OpenTimelineIO==0.11.0
pathlib2 pathlib2
Pillow Pillow
pynput pynput