Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

[draft] Resolve: tagging and renaming for publish #307

Merged
merged 34 commits into from
Jul 17, 2020
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ae7a655
fix(resolve): transition to new structure
jakubjezek001 Jun 12, 2020
a4d3b40
feat(resolve): adding currentFile to collect project
jakubjezek001 Jun 12, 2020
9c16429
Merge remote-tracking branch 'origin/2.x/develop' into feature/239-re…
jakubjezek001 Jun 15, 2020
42b30e0
Merge branch 'develop' into feature/239-resolve_tagging_for_publish
jakubjezek001 Jun 16, 2020
f4e8d75
Merge branch 'release/2.10.0' into feature/239-resolve_tagging_for_pu…
jakubjezek001 Jun 17, 2020
700c626
feat(resolve): adding create shot clip
jakubjezek001 Jun 17, 2020
37fff09
feat(resolve): wip create plugins
jakubjezek001 Jun 17, 2020
48c163a
feat(resolve): updating resolve integration wip
jakubjezek001 Jun 22, 2020
8e91764
feat(resolve): create compound clip wip
jakubjezek001 Jun 23, 2020
34c27c3
feat(resolve): compound clip create with sequencial rename
jakubjezek001 Jun 23, 2020
4f3565d
feat(resolve): basic publish collecting of clips
jakubjezek001 Jun 24, 2020
43e0b48
Merge branch 'develop' into feature/239-resolve_tagging_for_publish
jakubjezek001 Jun 24, 2020
7465d8c
feat(resolve): creator with sequencial rename gui
jakubjezek001 Jun 24, 2020
ccadf98
feat(resolve): update creator input widget
jakubjezek001 Jun 25, 2020
3fb4460
feat(resolve): creator plugin with dynamic widget
jakubjezek001 Jun 26, 2020
4391a14
feat(resolve): adding Create widget with style
jakubjezek001 Jun 26, 2020
2fadb70
Merge branch 'develop' into feature/239-resolve_tagging_for_publish
jakubjezek001 Jun 26, 2020
72dadc7
hierachical entities are filtered to avoid deletion of parent and the…
iLLiCiTiT Jul 2, 2020
900f07d
do not use self.session but session in code
iLLiCiTiT Jul 2, 2020
25a1a56
formatting changes
iLLiCiTiT Jul 2, 2020
b278287
Priority was forced to 50
tokejepsen Jul 9, 2020
10914dc
Merge pull request #344 from pypeclub/develop
mkolar Jul 9, 2020
0faf397
tray attributes fix
iLLiCiTiT Jul 9, 2020
6fd146b
feat(premiere): adding key to registry from prelaunch
jakubjezek001 Jul 9, 2020
862e233
fix(premiere): order of plugins were wrong
jakubjezek001 Jul 9, 2020
5af3251
fix(premiere): repair function was not working
jakubjezek001 Jul 9, 2020
cf95827
Merge pull request #345 from tokejepsen/2.x/bugfix/nuke_deadline_prio…
mkolar Jul 10, 2020
17a21df
Merge pull request #346 from pypeclub/feature/premiere_hook_with_regi…
mkolar Jul 10, 2020
1c676d9
Merge pull request #335 from pypeclub/bugfix/206-Ftrack_delete_action…
mkolar Jul 10, 2020
b1afb62
Merge branch '2.x/develop' into feature/239-resolve_tagging_for_publish
jakubjezek001 Jul 10, 2020
76fe88f
feat(resolve): config moved to plugins and widget rename
jakubjezek001 Jul 13, 2020
3095154
feat(resolve): hound fixes
jakubjezek001 Jul 13, 2020
e259a55
feat(resolve): hound fixes
jakubjezek001 Jul 13, 2020
a26292b
Merge branch '2.x/develop' into feature/239-resolve_tagging_for_publish
jakubjezek001 Jul 13, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pype/hooks/resolve/prelaunch.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,14 @@ def execute(self, *args, env: dict = None) -> bool:
"`RESOLVE_UTILITY_SCRIPTS_DIR` or reinstall DaVinci Resolve. \n"
f"RESOLVE_UTILITY_SCRIPTS_DIR: `{us_dir}`"
)
self.log.debug(f"-- us_dir: `{us_dir}`")

# correctly format path for pre python script
pre_py_sc = os.path.normpath(env.get("PRE_PYTHON_SCRIPT", ""))
env["PRE_PYTHON_SCRIPT"] = pre_py_sc

self.log.debug(f"-- pre_py_sc: `{pre_py_sc}`...")
try:
__import__("pype.resolve")
__import__("pype.hosts.resolve")
__import__("pyblish")

except ImportError as e:
Expand All @@ -62,6 +63,7 @@ def execute(self, *args, env: dict = None) -> bool:
else:
# Resolve Setup integration
importlib.reload(utils)
self.log.debug(f"-- utils.__file__: `{utils.__file__}`")
utils.setup(env)

return True
50 changes: 39 additions & 11 deletions pype/hosts/resolve/__init__.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,34 @@
from .utils import (
setup,
get_resolve_module
)

from .pipeline import (
install,
uninstall,
ls,
containerise,
publish,
launch_workfiles_app
launch_workfiles_app,
maintained_selection
)

from .utils import (
setup,
get_resolve_module
from .lib import (
get_project_manager,
get_current_project,
get_current_sequence,
get_current_track_items,
create_current_sequence_media_bin,
create_compound_clip,
swap_clips,
get_pype_clip_metadata,
set_project_manager_to_folder_name
)

from .menu import launch_pype_menu

from .plugin import Creator

from .workio import (
open_file,
save_file,
Expand All @@ -21,12 +38,8 @@
work_root
)

from .lib import (
get_project_manager,
set_project_manager_to_folder_name
)

from .menu import launch_pype_menu
bmdvr = None
bmdvf = None

__all__ = [
# pipeline
Expand All @@ -37,23 +50,38 @@
"reload_pipeline",
"publish",
"launch_workfiles_app",
"maintained_selection",

# utils
"setup",
"get_resolve_module",

# lib
"get_project_manager",
"get_current_project",
"get_current_sequence",
"get_current_track_items",
"create_current_sequence_media_bin",
"create_compound_clip",
"swap_clips",
"get_pype_clip_metadata",
"set_project_manager_to_folder_name",

# menu
"launch_pype_menu",

# plugin
"Creator",

# workio
"open_file",
"save_file",
"current_file",
"has_unsaved_changes",
"file_extensions",
"work_root"
"work_root",

# singleton with black magic resolve module
"bmdvr",
"bmdvf"
]
6 changes: 3 additions & 3 deletions pype/hosts/resolve/action.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ class SelectInvalidAction(pyblish.api.Action):
def process(self, context, plugin):

try:
from pype.hosts.resolve.utils import get_resolve_module
resolve = get_resolve_module()
self.log.debug(resolve)
from . import get_project_manager
pm = get_project_manager()
self.log.debug(pm)
except ImportError:
raise ImportError("Current host is not Resolve")

Expand Down
Loading