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

fixed wrong lib importing

Browse source
This commit is contained in:
Jakub Trllo 2019-01-28 18:07:24 +01:00
parent b1a519c72a
commit 3a7ec9abe0
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pype/ftrack/actions/action_sync_to_avalon_local.py
View file

@ -5,7 +5,7 @@ import logging
import json import json
import ftrack_api import ftrack_api
from pype.ftrack import BaseAction, lib from pype.ftrack import BaseAction, lib as ftracklib
class SyncToAvalon(BaseAction): class SyncToAvalon(BaseAction):
@ -117,12 +117,12 @@ class SyncToAvalon(BaseAction):
all_names = [] all_names = []
duplicates = [] duplicates = []
for e in self.importable: for entity in self.importable:
lib.avalon_check_name(e) ftracklib.avalon_check_name(entity)
if e['name'] in all_names: if entity['name'] in all_names:
duplicates.append("'{}'".format(e['name'])) duplicates.append("'{}'".format(e['name']))
else: else:
all_names.append(e['name']) all_names.append(entity['name'])
if len(duplicates) > 0: if len(duplicates) > 0:
raise ValueError( raise ValueError(
@ -132,12 +132,12 @@ class SyncToAvalon(BaseAction):
# ----- PROJECT ------ # ----- PROJECT ------
# store Ftrack project- self.importable[0] must be project entity!! # store Ftrack project- self.importable[0] must be project entity!!
ft_project = self.importable[0] ft_project = self.importable[0]
avalon_project = lib.get_avalon_project(ft_project) avalon_project = ftracklib.get_avalon_project(ft_project)
custom_attributes = lib.get_avalon_attr(session) custom_attributes = ftracklib.get_avalon_attr(session)
# Import all entities to Avalon DB # Import all entities to Avalon DB
for entity in self.importable: for entity in self.importable:
result = lib.import_to_avalon( result = ftracklib.import_to_avalon(
session=session, session=session,
entity=entity, entity=entity,
ft_project=ft_project, ft_project=ft_project,

12
pype/ftrack/lib/avalon_sync.py
View file

@ -1,7 +1,7 @@
import os import os
import re import re
import json import json
from pype import lib from pype import lib as pypelib
from pype.lib import get_avalon_database from pype.lib import get_avalon_database
from bson.objectid import ObjectId from bson.objectid import ObjectId
import avalon import avalon
@ -62,7 +62,7 @@ def import_to_avalon(
ft_project_code = ft_project['name'] ft_project_code = ft_project['name']
if av_project is None: if av_project is None:
project_schema = lib.get_avalon_project_template_schema() project_schema = pypelib.get_avalon_project_template_schema()
item = { item = {
'schema': project_schema, 'schema': project_schema,
'type': type, 'type': type,
@ -188,7 +188,7 @@ def import_to_avalon(
{'type': 'asset', 'name': name} {'type': 'asset', 'name': name}
) )
if avalon_asset is None: if avalon_asset is None:
asset_schema = lib.get_avalon_asset_template_schema() asset_schema = pypelib.get_avalon_asset_template_schema()
item = { item = {
'schema': asset_schema, 'schema': asset_schema,
'name': name, 'name': name,
@ -437,10 +437,10 @@ def get_avalon_project(ft_project):
def get_project_config(entity): def get_project_config(entity):
config = {} config = {}
config['schema'] = lib.get_avalon_project_config_schema() config['schema'] = pypelib.get_avalon_project_config_schema()
config['tasks'] = [{'name': ''}] config['tasks'] = [{'name': ''}]
config['apps'] = get_project_apps(entity) config['apps'] = get_project_apps(entity)
config['template'] = lib.get_avalon_project_template() config['template'] = pypelib.get_avalon_project_template()
return config return config
@ -502,7 +502,7 @@ def avalon_check_name(entity, inSchema=None):
def get_config_data(): def get_config_data():
path_items = [lib.get_presets_path(), 'ftrack', 'ftrack_config.json'] path_items = [pypelib.get_presets_path(), 'ftrack', 'ftrack_config.json']
filepath = os.path.sep.join(path_items) filepath = os.path.sep.join(path_items)
data = dict() data = dict()
try: try:

6
pype/ftrack/lib/ftrack_app_handler.py
View file

@ -3,7 +3,7 @@
import os import os
import sys import sys
import platform import platform
from avalon import lib from avalon import lib as avalonlib
import acre import acre
from pype import api as pype from pype import api as pype
from pype import lib as pypelib from pype import lib as pypelib
@ -240,7 +240,7 @@ class AppAction(BaseHandler):
# Run SW if was found executable # Run SW if was found executable
if execfile is not None: if execfile is not None:
lib.launch(executable=execfile, args=[], environment=env) avalonlib.launch(executable=execfile, args=[], environment=env)
else: else:
return { return {
'success': False, 'success': False,
@ -283,7 +283,7 @@ class AppAction(BaseHandler):
pass pass
# Run SW if was found executable # Run SW if was found executable
if execfile is not None: if execfile is not None:
lib.launch( avalonlib.launch(
'/usr/bin/env', args=['bash', execfile], environment=env '/usr/bin/env', args=['bash', execfile], environment=env
) )
else: else: