From bb39f87f81ae3b7a0dcbaf0d1c3d85dcf58e5f13 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Sat, 13 Apr 2019 18:13:34 +0200 Subject: [PATCH] changin ftrack_api imports to run from pype.vendor for now --- pype/ftrack/actions/action_clockify_start.py | 2 +- pype/ftrack/actions/action_clockify_sync.py | 2 +- pype/ftrack/actions/action_create_folders.py | 33 +++++++------ .../actions/action_create_project_folders.py | 49 +++++++++---------- pype/ftrack/actions/action_djvview.py | 13 +++-- pype/ftrack/actions/action_multiple_notes.py | 4 +- pype/ftrack/actions/action_rv.py | 10 ++-- 7 files changed, 55 insertions(+), 58 deletions(-) diff --git a/pype/ftrack/actions/action_clockify_start.py b/pype/ftrack/actions/action_clockify_start.py index b1c60a2525..594ec21b78 100644 --- a/pype/ftrack/actions/action_clockify_start.py +++ b/pype/ftrack/actions/action_clockify_start.py @@ -2,7 +2,7 @@ import sys import argparse import logging -import ftrack_api +from pype.vendor import ftrack_api from pype.ftrack import BaseAction from pype.clockify import ClockifyAPI diff --git a/pype/ftrack/actions/action_clockify_sync.py b/pype/ftrack/actions/action_clockify_sync.py index 202bb7b912..4cc00225e2 100644 --- a/pype/ftrack/actions/action_clockify_sync.py +++ b/pype/ftrack/actions/action_clockify_sync.py @@ -2,7 +2,7 @@ import sys import argparse import logging import json -import ftrack_api +from pype.vendor import ftrack_api from pype.ftrack import BaseAction, MissingPermision from pype.clockify import ClockifyAPI diff --git a/pype/ftrack/actions/action_create_folders.py b/pype/ftrack/actions/action_create_folders.py index c871201701..4426fb9650 100644 --- a/pype/ftrack/actions/action_create_folders.py +++ b/pype/ftrack/actions/action_create_folders.py @@ -3,13 +3,14 @@ import sys import logging import argparse import re -import json +# import json from pype.vendor import ftrack_api from pype.ftrack import BaseAction -from pype import api as pype, lib as pypelib +# from pype import api as pype, lib as pypelib from avalon import lib as avalonlib from avalon.tools.libraryloader.io_nonsingleton import DbConnector +from pypeapp import config, Anatomy class CreateFolders(BaseAction): @@ -130,12 +131,12 @@ class CreateFolders(BaseAction): template_publish = av_project['config']['template']['publish'] self.db.uninstall() except Exception: - anatomy = pype.Anatomy - template_work = anatomy.avalon.work - template_publish = anatomy.avalon.publish + templates = Anatomy().templates + template_work = templates["avalon"]["work"] + template_publish = templates["avalon"]["publish"] collected_paths = [] - presets = self.get_presets() + presets = config.get_presets()['tools']['sw_folders'] for entity in all_entities: if entity.entity_type.lower() == 'project': continue @@ -238,16 +239,16 @@ class CreateFolders(BaseAction): output.extend(self.get_notask_children(child)) return output - def get_presets(self): - fpath_items = [pypelib.get_presets_path(), 'tools', 'sw_folders.json'] - filepath = os.path.normpath(os.path.sep.join(fpath_items)) - presets = dict() - try: - with open(filepath) as data_file: - presets = json.load(data_file) - except Exception as e: - self.log.warning('Wasn\'t able to load presets') - return dict(presets) + # def get_presets(self): + # fpath_items = [pypelib.get_presets_path(), 'tools', 'sw_folders.json'] + # filepath = os.path.normpath(os.path.sep.join(fpath_items)) + # presets = dict() + # try: + # with open(filepath) as data_file: + # presets = json.load(data_file) + # except Exception as e: + # self.log.warning('Wasn\'t able to load presets') + # return dict(presets) def template_format(self, template, data): diff --git a/pype/ftrack/actions/action_create_project_folders.py b/pype/ftrack/actions/action_create_project_folders.py index 15bd18cb5f..66e2e153e6 100644 --- a/pype/ftrack/actions/action_create_project_folders.py +++ b/pype/ftrack/actions/action_create_project_folders.py @@ -3,11 +3,10 @@ import sys import re import argparse import logging -import json -import ftrack_api -from pype import lib as pypelib +from pype.vendor import ftrack_api from pype.ftrack import BaseAction +from pypeapp import config class CreateProjectFolders(BaseAction): @@ -43,7 +42,7 @@ class CreateProjectFolders(BaseAction): else: project = entity['project'] - presets = self.load_presets() + presets = config.load_presets()['tools']['project_folder_structure'] try: # Get paths based on presets basic_paths = self.get_path_items(presets) @@ -143,27 +142,27 @@ class CreateProjectFolders(BaseAction): self.session.commit() return new_ent - def load_presets(self): - preset_items = [ - pypelib.get_presets_path(), - 'tools', - 'project_folder_structure.json' - ] - filepath = os.path.sep.join(preset_items) - - # Load folder structure template from presets - presets = dict() - try: - with open(filepath) as data_file: - presets = json.load(data_file) - except Exception as e: - msg = 'Unable to load Folder structure preset' - self.log.warning(msg) - return { - 'success': False, - 'message': msg - } - return presets + # def load_presets(self): + # preset_items = [ + # pypelib.get_presets_path(), + # 'tools', + # 'project_folder_structure.json' + # ] + # filepath = os.path.sep.join(preset_items) + # + # # Load folder structure template from presets + # presets = dict() + # try: + # with open(filepath) as data_file: + # presets = json.load(data_file) + # except Exception as e: + # msg = 'Unable to load Folder structure preset' + # self.log.warning(msg) + # return { + # 'success': False, + # 'message': msg + # } + # return presets def get_path_items(self, in_dict): output = [] diff --git a/pype/ftrack/actions/action_djvview.py b/pype/ftrack/actions/action_djvview.py index 3a4298fa02..942aa7a327 100644 --- a/pype/ftrack/actions/action_djvview.py +++ b/pype/ftrack/actions/action_djvview.py @@ -1,15 +1,12 @@ import os import sys -import re import json import logging import subprocess from operator import itemgetter -import ftrack_api +from pype.vendor import ftrack_api from pype.ftrack import BaseAction -from pypeapp import Logger -from pype import lib as pypelib - +from pypeapp import Logger, config log = Logger().get_logger(__name__) @@ -28,7 +25,8 @@ class DJVViewAction(BaseAction): self.djv_path = None self.config_data = None - self.load_config_data() + # self.load_config_data() + self.config_data = config.get_presets()['djv_view']['config'] self.set_djv_path() if self.djv_path is None: @@ -57,7 +55,8 @@ class DJVViewAction(BaseAction): return False def load_config_data(self): - path_items = [pypelib.get_presets_path(), 'djv_view', 'config.json'] + # path_items = [pypelib.get_presets_path(), 'djv_view', 'config.json'] + path_items = config.get_presets()['djv_view']['config'] filepath = os.path.sep.join(path_items) data = dict() diff --git a/pype/ftrack/actions/action_multiple_notes.py b/pype/ftrack/actions/action_multiple_notes.py index c61f5b1e9c..2d93f64242 100644 --- a/pype/ftrack/actions/action_multiple_notes.py +++ b/pype/ftrack/actions/action_multiple_notes.py @@ -1,9 +1,7 @@ -import os import sys import argparse import logging -import json -import ftrack_api +from pype.vendor import ftrack_api from pype.ftrack import BaseAction diff --git a/pype/ftrack/actions/action_rv.py b/pype/ftrack/actions/action_rv.py index 89a426ab9d..15689ae811 100644 --- a/pype/ftrack/actions/action_rv.py +++ b/pype/ftrack/actions/action_rv.py @@ -3,12 +3,11 @@ import os import sys import json import subprocess -import ftrack_api +from pype.vendor import ftrack_api import logging import operator import re -from pype import lib as pypelib -from pypeapp import Logger +from pypeapp import Logger, config log = Logger().get_logger(__name__) @@ -40,7 +39,8 @@ class RVAction(BaseAction): ) else: # if not, fallback to config file location - self.load_config_data() + # self.load_config_data() + self.config_data = config.get_presets()['djv_view']['config'] self.set_rv_path() if self.rv_path is None: @@ -62,7 +62,7 @@ class RVAction(BaseAction): return False def load_config_data(self): - path_items = [pypelib.get_presets_path(), 'rv', 'config.json'] + path_items = config.get_presets['rv']['config.json'] filepath = os.path.sep.join(path_items) data = dict()