mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 16:34:53 +01:00
use query functions on remaining places
This commit is contained in:
parent
aad42517d2
commit
ad4aeb0071
7 changed files with 25 additions and 54 deletions
|
|
@ -1,3 +1,4 @@
|
||||||
|
from openpype.client import get_project, get_asset_by_name
|
||||||
from openpype.lib import (
|
from openpype.lib import (
|
||||||
PreLaunchHook,
|
PreLaunchHook,
|
||||||
EnvironmentPrepData,
|
EnvironmentPrepData,
|
||||||
|
|
@ -69,7 +70,7 @@ class GlobalHostDataHook(PreLaunchHook):
|
||||||
self.data["dbcon"] = dbcon
|
self.data["dbcon"] = dbcon
|
||||||
|
|
||||||
# Project document
|
# Project document
|
||||||
project_doc = dbcon.find_one({"type": "project"})
|
project_doc = get_project(project_name)
|
||||||
self.data["project_doc"] = project_doc
|
self.data["project_doc"] = project_doc
|
||||||
|
|
||||||
asset_name = self.data.get("asset_name")
|
asset_name = self.data.get("asset_name")
|
||||||
|
|
@ -79,8 +80,5 @@ class GlobalHostDataHook(PreLaunchHook):
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
asset_doc = dbcon.find_one({
|
asset_doc = get_asset_by_name(project_name, asset_name)
|
||||||
"type": "asset",
|
|
||||||
"name": asset_name
|
|
||||||
})
|
|
||||||
self.data["asset_doc"] = asset_doc
|
self.data["asset_doc"] = asset_doc
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,7 @@ import re
|
||||||
import sys
|
import sys
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
# Pipeline imports
|
|
||||||
from openpype.client import (
|
from openpype.client import (
|
||||||
get_project,
|
|
||||||
get_asset_by_name,
|
get_asset_by_name,
|
||||||
get_versions,
|
get_versions,
|
||||||
)
|
)
|
||||||
|
|
@ -21,9 +19,6 @@ from openpype.lib.avalon_context import get_workdir_from_session
|
||||||
|
|
||||||
log = logging.getLogger("Update Slap Comp")
|
log = logging.getLogger("Update Slap Comp")
|
||||||
|
|
||||||
self = sys.modules[__name__]
|
|
||||||
self._project = None
|
|
||||||
|
|
||||||
|
|
||||||
def _format_version_folder(folder):
|
def _format_version_folder(folder):
|
||||||
"""Format a version folder based on the filepath
|
"""Format a version folder based on the filepath
|
||||||
|
|
@ -212,9 +207,6 @@ def switch(asset_name, filepath=None, new=True):
|
||||||
asset = get_asset_by_name(project_name, asset_name)
|
asset = get_asset_by_name(project_name, asset_name)
|
||||||
assert asset, "Could not find '%s' in the database" % asset_name
|
assert asset, "Could not find '%s' in the database" % asset_name
|
||||||
|
|
||||||
# Get current project
|
|
||||||
self._project = get_project(project_name)
|
|
||||||
|
|
||||||
# Go to comp
|
# Go to comp
|
||||||
if not filepath:
|
if not filepath:
|
||||||
current_comp = api.get_current_comp()
|
current_comp = api.get_current_comp()
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import os
|
import os
|
||||||
import json
|
import json
|
||||||
from openpype.pipeline import legacy_io
|
from openpype.client import get_asset_by_name
|
||||||
|
|
||||||
|
|
||||||
class HostContext:
|
class HostContext:
|
||||||
|
|
@ -17,10 +17,10 @@ class HostContext:
|
||||||
if not asset_name:
|
if not asset_name:
|
||||||
return project_name
|
return project_name
|
||||||
|
|
||||||
asset_doc = legacy_io.find_one(
|
asset_doc = get_asset_by_name(
|
||||||
{"type": "asset", "name": asset_name},
|
project_name, asset_name, fields=["data.parents"]
|
||||||
{"data.parents": 1}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
parents = asset_doc.get("data", {}).get("parents") or []
|
parents = asset_doc.get("data", {}).get("parents") or []
|
||||||
|
|
||||||
hierarchy = [project_name]
|
hierarchy = [project_name]
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,11 @@
|
||||||
from openpype.lib import NumberDef
|
from openpype.lib import NumberDef
|
||||||
from openpype.hosts.testhost.api import pipeline
|
from openpype.client import get_asset_by_name
|
||||||
from openpype.pipeline import (
|
from openpype.pipeline import (
|
||||||
legacy_io,
|
legacy_io,
|
||||||
AutoCreator,
|
AutoCreator,
|
||||||
CreatedInstance,
|
CreatedInstance,
|
||||||
)
|
)
|
||||||
|
from openpype.hosts.testhost.api import pipeline
|
||||||
|
|
||||||
|
|
||||||
class MyAutoCreator(AutoCreator):
|
class MyAutoCreator(AutoCreator):
|
||||||
|
|
@ -44,10 +45,7 @@ class MyAutoCreator(AutoCreator):
|
||||||
host_name = legacy_io.Session["AVALON_APP"]
|
host_name = legacy_io.Session["AVALON_APP"]
|
||||||
|
|
||||||
if existing_instance is None:
|
if existing_instance is None:
|
||||||
asset_doc = legacy_io.find_one({
|
asset_doc = get_asset_by_name(project_name, asset_name)
|
||||||
"type": "asset",
|
|
||||||
"name": asset_name
|
|
||||||
})
|
|
||||||
subset_name = self.get_subset_name(
|
subset_name = self.get_subset_name(
|
||||||
variant, task_name, asset_doc, project_name, host_name
|
variant, task_name, asset_doc, project_name, host_name
|
||||||
)
|
)
|
||||||
|
|
@ -69,10 +67,7 @@ class MyAutoCreator(AutoCreator):
|
||||||
existing_instance["asset"] != asset_name
|
existing_instance["asset"] != asset_name
|
||||||
or existing_instance["task"] != task_name
|
or existing_instance["task"] != task_name
|
||||||
):
|
):
|
||||||
asset_doc = legacy_io.find_one({
|
asset_doc = get_asset_by_name(project_name, asset_name)
|
||||||
"type": "asset",
|
|
||||||
"name": asset_name
|
|
||||||
})
|
|
||||||
subset_name = self.get_subset_name(
|
subset_name = self.get_subset_name(
|
||||||
variant, task_name, asset_doc, project_name, host_name
|
variant, task_name, asset_doc, project_name, host_name
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import inspect
|
||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
from contextlib import contextmanager
|
from contextlib import contextmanager
|
||||||
|
|
||||||
|
from openpype.client import get_assets
|
||||||
from openpype.host import INewPublisher
|
from openpype.host import INewPublisher
|
||||||
from openpype.pipeline import legacy_io
|
from openpype.pipeline import legacy_io
|
||||||
from openpype.pipeline.mongodb import (
|
from openpype.pipeline.mongodb import (
|
||||||
|
|
@ -1082,15 +1083,10 @@ class CreateContext:
|
||||||
for asset_name in task_names_by_asset_name.keys()
|
for asset_name in task_names_by_asset_name.keys()
|
||||||
if asset_name is not None
|
if asset_name is not None
|
||||||
]
|
]
|
||||||
asset_docs = list(self.dbcon.find(
|
asset_docs = list(get_assets(
|
||||||
{
|
self.project_name,
|
||||||
"type": "asset",
|
asset_names=asset_names,
|
||||||
"name": {"$in": asset_names}
|
fields=["name", "data.tasks"]
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": True,
|
|
||||||
"data.tasks": True
|
|
||||||
}
|
|
||||||
))
|
))
|
||||||
|
|
||||||
task_names_by_asset_name = {}
|
task_names_by_asset_name = {}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ import os
|
||||||
import copy
|
import copy
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from openpype.client import get_project
|
||||||
from . import legacy_io
|
from . import legacy_io
|
||||||
from .plugin_discover import (
|
from .plugin_discover import (
|
||||||
discover,
|
discover,
|
||||||
|
|
@ -85,13 +86,8 @@ class TemplateResolver(ThumbnailResolver):
|
||||||
self.log.debug("Thumbnail entity does not have set template")
|
self.log.debug("Thumbnail entity does not have set template")
|
||||||
return
|
return
|
||||||
|
|
||||||
project = self.dbcon.find_one(
|
project_name = self.dbcon.active_project()
|
||||||
{"type": "project"},
|
project = get_project(project_name, fields=["name", "data.code"])
|
||||||
{
|
|
||||||
"name": True,
|
|
||||||
"data.code": True
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
template_data = copy.deepcopy(
|
template_data = copy.deepcopy(
|
||||||
thumbnail_entity["data"].get("template_data") or {}
|
thumbnail_entity["data"].get("template_data") or {}
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,8 @@ import re
|
||||||
import sys
|
import sys
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from openpype.client import get_project, get_asset_by_name, get_versions
|
||||||
|
|
||||||
# Pipeline imports
|
# Pipeline imports
|
||||||
from openpype.hosts.fusion import api
|
from openpype.hosts.fusion import api
|
||||||
import openpype.hosts.fusion.api.lib as fusion_lib
|
import openpype.hosts.fusion.api.lib as fusion_lib
|
||||||
|
|
@ -19,9 +21,6 @@ from openpype.lib.avalon_context import get_workdir_from_session
|
||||||
|
|
||||||
log = logging.getLogger("Update Slap Comp")
|
log = logging.getLogger("Update Slap Comp")
|
||||||
|
|
||||||
self = sys.modules[__name__]
|
|
||||||
self._project = None
|
|
||||||
|
|
||||||
|
|
||||||
def _format_version_folder(folder):
|
def _format_version_folder(folder):
|
||||||
"""Format a version folder based on the filepath
|
"""Format a version folder based on the filepath
|
||||||
|
|
@ -131,8 +130,8 @@ def update_frame_range(comp, representations):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
version_ids = [r["parent"] for r in representations]
|
version_ids = [r["parent"] for r in representations]
|
||||||
versions = legacy_io.find({"type": "version", "_id": {"$in": version_ids}})
|
project_name = legacy_io.active_project()
|
||||||
versions = list(versions)
|
versions = list(get_versions(project_name, version_ids=version_ids))
|
||||||
|
|
||||||
start = min(v["data"]["frameStart"] for v in versions)
|
start = min(v["data"]["frameStart"] for v in versions)
|
||||||
end = max(v["data"]["frameEnd"] for v in versions)
|
end = max(v["data"]["frameEnd"] for v in versions)
|
||||||
|
|
@ -162,15 +161,10 @@ def switch(asset_name, filepath=None, new=True):
|
||||||
|
|
||||||
# Assert asset name exists
|
# Assert asset name exists
|
||||||
# It is better to do this here then to wait till switch_shot does it
|
# It is better to do this here then to wait till switch_shot does it
|
||||||
asset = legacy_io.find_one({"type": "asset", "name": asset_name})
|
project_name = legacy_io.active_project()
|
||||||
|
asset = get_asset_by_name(project_name, asset_name)
|
||||||
assert asset, "Could not find '%s' in the database" % asset_name
|
assert asset, "Could not find '%s' in the database" % asset_name
|
||||||
|
|
||||||
# Get current project
|
|
||||||
self._project = legacy_io.find_one({
|
|
||||||
"type": "project",
|
|
||||||
"name": legacy_io.Session["AVALON_PROJECT"]
|
|
||||||
})
|
|
||||||
|
|
||||||
# Go to comp
|
# Go to comp
|
||||||
if not filepath:
|
if not filepath:
|
||||||
current_comp = api.get_current_comp()
|
current_comp = api.get_current_comp()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue