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

replaced os.environ lookups with session

Browse source
This commit is contained in:
aardschok 2017-10-20 16:40:32 +02:00
parent a294b6ca62
commit a21ee37975
5 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
colorbleed/maya/lib.py
View file

@ -12,14 +12,14 @@ from collections import OrderedDict, defaultdict
from maya import cmds, mel from maya import cmds, mel
from avalon import maya, io from avalon import Session, maya, io
from cb.utils.maya import core from cb.utils.maya import core
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
project = io.find_one({"type": "project", project = io.find_one({"type": "project",
"name": os.environ["AVALON_PROJECT"]}, "name": Session["AVALON_PROJECT"]},
projection={"config.template.publish": True, projection={"config.template.publish": True,
"_id": False}) "_id": False})
TEMPLATE = project["config"]["template"]["publish"] TEMPLATE = project["config"]["template"]["publish"]
@ -656,8 +656,7 @@ def generate_ids(nodes):
"""Assign a new id of the current active context to the nodes""" """Assign a new id of the current active context to the nodes"""
# Get the asset ID from the database for the asset of current context # Get the asset ID from the database for the asset of current context
asset = os.environ["AVALON_ASSET"] asset_id = io.find_one({"type": "asset", "name": Session["AVALON_ASSET"]},
asset_id = io.find_one({"type": "asset", "name": asset},
projection={"_id": True}) projection={"_id": True})
for node in nodes: for node in nodes:
@ -700,7 +699,7 @@ def get_representation_file(representation, template=TEMPLATE):
""" """
context = representation["context"].copy() context = representation["context"].copy()
context["root"] = os.environ["AVALON_ROOT"] context["root"] = Session["AVALON_ROOT"]
return template.format(**context) return template.format(**context)

6
colorbleed/plugins/maya/load/load_rig.py
View file

@ -1,8 +1,6 @@
import os
from maya import cmds from maya import cmds
from avalon import api, maya from avalon import api, Session, maya
class RigLoader(api.Loader): class RigLoader(api.Loader):
@ -56,7 +54,7 @@ class RigLoader(api.Loader):
roots = cmds.ls(self[:], assemblies=True, long=True) roots = cmds.ls(self[:], assemblies=True, long=True)
assert roots, "No root nodes in rig, this is a bug." assert roots, "No root nodes in rig, this is a bug."
asset = os.environ["AVALON_ASSET"] asset = Session["AVALON_ASSET"]
dependency = str(context["representation"]["_id"]) dependency = str(context["representation"]["_id"])
# Create the animation instance # Create the animation instance

5
colorbleed/plugins/maya/publish/collect_renderlayers.py
View file

@ -1,9 +1,8 @@
import os
from maya import cmds from maya import cmds
import pyblish.api import pyblish.api
from avalon import maya, api from avalon import Session, maya, api
import colorbleed.maya.lib as lib import colorbleed.maya.lib as lib
@ -18,7 +17,7 @@ class CollectMindbenderMayaRenderlayers(pyblish.api.ContextPlugin):
def process(self, context): def process(self, context):
registered_root = api.registered_root() registered_root = api.registered_root()
asset_name = os.environ["AVALON_ASSET"] asset_name = Session["AVALON_ASSET"]
current_file = context.data["currentFile"] current_file = context.data["currentFile"]
relative_file = current_file.replace(registered_root, "{root}") relative_file = current_file.replace(registered_root, "{root}")

8
colorbleed/plugins/publish/collect_assumed_destination.py
View file

@ -1,7 +1,7 @@
import pyblish.api import pyblish.api
import os import os
import avalon.io as io from avalon import Session, io
class CollectAssumedDestination(pyblish.api.InstancePlugin): class CollectAssumedDestination(pyblish.api.InstancePlugin):
@ -64,7 +64,7 @@ class CollectAssumedDestination(pyblish.api.InstancePlugin):
# get all the stuff from the database # get all the stuff from the database
subset_name = instance.data["subset"] subset_name = instance.data["subset"]
asset_name = instance.data["asset"] asset_name = instance.data["asset"]
project_name = os.environ["AVALON_PROJECT"] project_name = Session["AVALON_PROJECT"]
project = io.find_one({"type": "project", project = io.find_one({"type": "project",
"name": project_name}, "name": project_name},
@ -95,9 +95,9 @@ class CollectAssumedDestination(pyblish.api.InstancePlugin):
if version is not None: if version is not None:
version_number += version["name"] version_number += version["name"]
template_data = {"root": os.environ["AVALON_PROJECTS"], template_data = {"root": Session["AVALON_PROJECTS"],
"project": project_name, "project": project_name,
"silo": os.environ["AVALON_SILO"], "silo": Session["AVALON_SILO"],
"asset": asset_name, "asset": asset_name,
"subset": subset_name, "subset": subset_name,
"version": version_number, "version": version_number,

10
colorbleed/plugins/publish/integrate.py
View file

@ -4,7 +4,7 @@ import shutil
import errno import errno
import pyblish.api import pyblish.api
from avalon import api, io from avalon import Session, api, io
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -47,10 +47,10 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
def register(self, instance): def register(self, instance):
# Required environment variables # Required environment variables
PROJECT = os.environ["AVALON_PROJECT"] PROJECT = Session["AVALON_PROJECT"]
ASSET = instance.data.get("asset") or os.environ["AVALON_ASSET"] ASSET = instance.data.get("asset") or Session["AVALON_ASSET"]
SILO = os.environ["AVALON_SILO"] SILO = Session["AVALON_SILO"]
LOCATION = os.getenv("AVALON_LOCATION") LOCATION = Session("AVALON_LOCATION")
context = instance.context context = instance.context
# Atomicity # Atomicity