Refactor DCCsi to work better with O3DE changes (#4226)
* moving files in refactor/re-org Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * dev env refactor/re-org Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * moving/re-org so we can deprate the SDK nomiclature Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * moving/re-org so we can deprate the SDK nomiclature Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Refactoring env so I can replace SDK with Tools folder Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * re-org and prune, from SKD to Tools Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Removing old .bat files from SDK Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * updated how to retreive PYTHONHOME Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Can't use/set PYTHONHOME with DCC Tools Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * small refactor Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * repaired a missed typo (causes error) Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Added missing EntityId.h include to FocusModeInterface.h Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * refactor additional LY to O3DE tags Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Some design scaffold file stubs Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * stubbing in scaffold file pattern Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Removal of corrupted prefabs Signed-off-by: Benjamin Black <benblac@amazon.com> * refactored config_utils to maintain py2.7 support for maya 2020 Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * refactored config_utils to maintain py2.7 support for maya 2020 Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * pruning and cleanup Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * .env is for local dev overrides Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * .env is for local dev overrides Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * clean up init and logging patterns Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Core refactoring, config.py functional standalone Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * cleaned up some bad logging, fixed up boostrap Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * fixed validation errors Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * fix logging issue, tiddy up Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * tiddy up maya for .bat bootstraping and launch Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * name stub, fix validation Signed-off-by: Jonny Gallowy <gallowj@amazon.com> Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Co-authored-by: Benjamin Black <benblac@amazon.com>
This commit is contained in:
@@ -11,23 +11,27 @@
|
||||
|
||||
"""azpy.shared.__init__"""
|
||||
|
||||
import os
|
||||
import logging as _logging
|
||||
|
||||
from azpy.env_bool import env_bool
|
||||
import azpy.env_bool as env_bool
|
||||
from azpy.constants import ENVAR_DCCSI_GDEBUG
|
||||
from azpy.constants import ENVAR_DCCSI_DEV_MODE
|
||||
from azpy.constants import FRMT_LOG_LONG
|
||||
|
||||
# global space
|
||||
_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
_DCCSI_GDEBUG = env_bool.env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool.env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
|
||||
_PACKAGENAME = __name__
|
||||
if _PACKAGENAME is '__main__':
|
||||
_PACKAGENAME = 'azpy.shared'
|
||||
|
||||
import azpy
|
||||
_LOGGER = azpy.initialize_logger(_PACKAGENAME)
|
||||
_LOGGER.debug('Invoking __init__.py for {0}.'.format({_PACKAGENAME}))
|
||||
# set up module logging
|
||||
for handler in _logging.root.handlers[:]:
|
||||
_logging.root.removeHandler(handler)
|
||||
_LOGGER = _logging.getLogger(_PACKAGENAME)
|
||||
_logging.basicConfig(format=FRMT_LOG_LONG)
|
||||
_LOGGER.debug('Initializing: {0}.'.format({_PACKAGENAME}))
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
|
||||
-17
@@ -1,17 +0,0 @@
|
||||
{
|
||||
"ordered_box": true,
|
||||
"COMPANY": "Amazon.Lumberyard",
|
||||
"LY_PROJECT": "DccScriptingInterface",
|
||||
"LY_DEV": "G:\\depot\\JG_PC1_spectrAtom\\dev",
|
||||
"LY_BUILD_DIR_NAME": "windows_vs2019",
|
||||
"LY_BUILD_PATH": "G:\\depot\\JG_PC1_spectrAtom\\dev\\windows_vs2019",
|
||||
"QT_PLUGIN_PATH": "G:\\depot\\JG_PC1_spectrAtom\\dev\\bin\\profile\\EditorPlugins",
|
||||
"LY_PROJECT_PATH": "G:\\depot\\JG_PC1_spectrAtom\\dev\\Gems\\AtomLyIntegration\\TechnicalArt\\DccScriptingInterface",
|
||||
"DCCSIG_PATH": "G:\\depot\\JG_PC1_spectrAtom\\dev\\Gems\\AtomLyIntegration\\TechnicalArt\\DccScriptingInterface",
|
||||
"DCCSI_AZPY_PATH": "G:\\depot\\JG_PC1_spectrAtom\\dev\\Gems\\AtomLyIntegration\\TechnicalArt\\DccScriptingInterface\\azpy",
|
||||
"DCCSI_SDK_PATH": "G:\\depot\\JG_PC1_spectrAtom\\dev\\Gems\\AtomLyIntegration\\TechnicalArt\\DccScriptingInterface\\SDK",
|
||||
"DCCSI_WING_VERSION_MAJOR": "7",
|
||||
"DCCSI_WING_VERSION_MINOR": "1",
|
||||
"WINGHOME": "C:\\Program Files (x86)\\Wing Pro 7.1",
|
||||
"DCCSI_PY_DEFAULT": "G:\\depot\\JG_PC1_spectrAtom\\dev\\Tools\\Python\\3.7.5\\windows\\python.exe"
|
||||
}
|
||||
+11
-7
@@ -12,23 +12,27 @@
|
||||
# importing all of the modules
|
||||
"""azpy.shared.common.__init__"""
|
||||
|
||||
import os
|
||||
import logging as _logging
|
||||
|
||||
from azpy.env_bool import env_bool
|
||||
import azpy.env_bool as env_bool
|
||||
from azpy.constants import ENVAR_DCCSI_GDEBUG
|
||||
from azpy.constants import ENVAR_DCCSI_DEV_MODE
|
||||
from azpy.constants import FRMT_LOG_LONG
|
||||
|
||||
# global space
|
||||
_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
_DCCSI_GDEBUG = env_bool.env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool.env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
|
||||
_PACKAGENAME = __name__
|
||||
if _PACKAGENAME is '__main__':
|
||||
_PACKAGENAME = 'azpy.shared.common'
|
||||
|
||||
import azpy
|
||||
_LOGGER = azpy.initialize_logger(_PACKAGENAME)
|
||||
_LOGGER.debug('Invoking __init__.py for {0}.'.format({_PACKAGENAME}))
|
||||
# set up module logging
|
||||
for handler in _logging.root.handlers[:]:
|
||||
_logging.root.removeHandler(handler)
|
||||
_LOGGER = _logging.getLogger(_PACKAGENAME)
|
||||
_logging.basicConfig(format=FRMT_LOG_LONG)
|
||||
_LOGGER.debug('Initializing: {0}.'.format({_PACKAGENAME}))
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
+17
-17
@@ -48,34 +48,34 @@ import os
|
||||
import sys
|
||||
import site
|
||||
import fnmatch
|
||||
import logging as _logging
|
||||
|
||||
# 3rd Party
|
||||
from pathlib import Path
|
||||
# from progress.spinner import Spinner # deprecate use (or refactor)
|
||||
|
||||
# Lumberyard extensions
|
||||
from azpy.constants import *
|
||||
from azpy import initialize_logger
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# global space debug flag
|
||||
from azpy.env_bool import env_bool
|
||||
# global space
|
||||
import azpy.env_bool as env_bool
|
||||
from azpy.constants import ENVAR_DCCSI_GDEBUG
|
||||
from azpy.constants import ENVAR_DCCSI_DEV_MODE
|
||||
from azpy.constants import FRMT_LOG_LONG
|
||||
|
||||
# global space
|
||||
_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
_DCCSI_GDEBUG = env_bool.env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool.env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
|
||||
_PACKAGENAME = __name__
|
||||
if _PACKAGENAME is '__main__':
|
||||
_PACKAGENAME = 'azpy.shared.common.core_utils'
|
||||
_MODULENAME = __name__
|
||||
if _MODULENAME is '__main__':
|
||||
_MODULENAME = 'azpy.shared.common.core_utils'
|
||||
|
||||
import azpy
|
||||
_LOGGER = azpy.initialize_logger(_PACKAGENAME)
|
||||
_LOGGER.debug('Invoking __init__.py for {0}.'.format({_PACKAGENAME}))
|
||||
# set up module logging
|
||||
for handler in _logging.root.handlers[:]:
|
||||
_logging.root.removeHandler(handler)
|
||||
_LOGGER = _logging.getLogger(_MODULENAME)
|
||||
_logging.basicConfig(format=FRMT_LOG_LONG)
|
||||
_LOGGER.debug('Initializing: {0}.'.format({_MODULENAME}))
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -421,7 +421,7 @@ def return_stub(stub):
|
||||
if __name__ == "__main__":
|
||||
'''To Do: Document'''
|
||||
# constants for shared use.
|
||||
_G_DEBUG = True
|
||||
_DCCSI_GDEBUG = True
|
||||
|
||||
# happy _LOGGER.info
|
||||
_LOGGER.info("# {0} #".format('-' * 72))
|
||||
@@ -435,7 +435,7 @@ if __name__ == "__main__":
|
||||
_KNOWN_SITEDIR_PATHS = site._init_pathinfo()
|
||||
|
||||
# this is just a debug developer convenience _LOGGER.info (for testing acess)
|
||||
if _G_DEBUG:
|
||||
if _DCCSI_GDEBUG:
|
||||
import pkgutil
|
||||
_LOGGER.info('Current working dir: {0}'.format(cwd))
|
||||
search_path = ['.'] # set to None to see all modules importable from sys.path
|
||||
|
||||
+25
-22
@@ -12,7 +12,7 @@ from __future__ import unicode_literals
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
'''
|
||||
Module: <DCCsi>\azpy\shared\common\config_utils.py
|
||||
Module: <DCCsi>\\azpy\\shared\\common\\config_utils.py
|
||||
|
||||
A set of utility functions
|
||||
|
||||
@@ -33,28 +33,31 @@ import logging as _logging
|
||||
# 3rd Party
|
||||
from box import Box
|
||||
from unipath import Path
|
||||
|
||||
# Lumberyard extensions
|
||||
from azpy.constants import *
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
from azpy.env_bool import env_bool
|
||||
# global space
|
||||
import azpy.env_bool as env_bool
|
||||
from azpy.constants import ENVAR_O3DE_DEV
|
||||
from azpy.constants import ENVAR_O3DE_PROJECT
|
||||
from azpy.constants import ENVAR_DCCSI_GDEBUG
|
||||
from azpy.constants import ENVAR_DCCSI_DEV_MODE
|
||||
from azpy.constants import FRMT_LOG_LONG
|
||||
|
||||
# global space
|
||||
_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
_DCCSI_GDEBUG = env_bool.env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool.env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
|
||||
_PACKAGENAME = __name__
|
||||
if _PACKAGENAME is '__main__':
|
||||
_PACKAGENAME = 'azpy.shared.common.envar_utils'
|
||||
_MODULENAME = __name__
|
||||
if _MODULENAME is '__main__':
|
||||
_MODULENAME = 'azpy.shared.common.envar_utils'
|
||||
|
||||
import azpy
|
||||
_LOGGER = azpy.initialize_logger(_PACKAGENAME)
|
||||
_LOGGER.debug('Invoking __init__.py for {0}.'.format({_PACKAGENAME}))
|
||||
# set up module logging
|
||||
for handler in _logging.root.handlers[:]:
|
||||
_logging.root.removeHandler(handler)
|
||||
_LOGGER = _logging.getLogger(_MODULENAME)
|
||||
_logging.basicConfig(format=FRMT_LOG_LONG)
|
||||
_LOGGER.debug('Initializing: {0}.'.format({_MODULENAME}))
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -65,7 +68,7 @@ def get_envar_default(envar, envar_default=None, envar_set=Box(ordered_box=True)
|
||||
Get from the system environment, or the module dictionary (a Box):
|
||||
like the test one in __main__ below,
|
||||
TEST_ENV_VALUES = Box(ordered_box=True)
|
||||
TEST_ENV_VALUES[ENVAR_LY_PROJECT] = '${0}'.format(ENVAR_LY_PROJECT)
|
||||
TEST_ENV_VALUES[ENVAR_O3DE_PROJECT] = '${0}'.format(ENVAR_O3DE_PROJECT)
|
||||
|
||||
This dictionary provides a simple way to pack a default set into a
|
||||
structure and decouple the getter implementation.
|
||||
@@ -88,7 +91,7 @@ def get_envar_default(envar, envar_default=None, envar_set=Box(ordered_box=True)
|
||||
|
||||
|
||||
# -- envar util ----------------------------------------------------------
|
||||
def set_envar_defaults(envar_set, env_root=get_envar_default(ENVAR_LY_DEV)):
|
||||
def set_envar_defaults(envar_set, env_root=get_envar_default(ENVAR_O3DE_DEV)):
|
||||
"""
|
||||
Set each environment variable if not alreay set with value.
|
||||
Must be safe, will not over-write existing.
|
||||
@@ -98,8 +101,8 @@ def set_envar_defaults(envar_set, env_root=get_envar_default(ENVAR_LY_DEV)):
|
||||
env_root = Path(env_root)
|
||||
|
||||
if env_root.exists():
|
||||
os.environ[ENVAR_LY_DEV] = env_root
|
||||
envar_set[ENVAR_LY_DEV] = env_root
|
||||
os.environ[ENVAR_O3DE_DEV] = env_root
|
||||
envar_set[ENVAR_O3DE_DEV] = env_root
|
||||
else:
|
||||
raise ValueError("EnvVar Root is not valid: {0}".format(env_root))
|
||||
|
||||
@@ -107,7 +110,7 @@ def set_envar_defaults(envar_set, env_root=get_envar_default(ENVAR_LY_DEV)):
|
||||
envar = str(envar)
|
||||
value = os.getenv(envar)
|
||||
|
||||
if _G_DEBUG:
|
||||
if _DCCSI_GDEBUG:
|
||||
if not value:
|
||||
_LOGGER.debug('~ EnVar value NOT found: {0}\r'.format(envar))
|
||||
|
||||
@@ -191,8 +194,8 @@ if __name__ == '__main__':
|
||||
# it should be benign but leaving this comment here in case of funk
|
||||
|
||||
# tes envars
|
||||
TEST_ENV_VALUES[ENVAR_LY_PROJECT] = '${0}'.format(ENVAR_LY_PROJECT)
|
||||
TEST_ENV_VALUES[ENVAR_LY_DEV] = Path('${0}'.format(ENVAR_LY_DEV))
|
||||
TEST_ENV_VALUES[ENVAR_O3DE_PROJECT] = '${0}'.format(ENVAR_O3DE_PROJECT)
|
||||
TEST_ENV_VALUES[ENVAR_O3DE_DEV] = Path('${0}'.format(ENVAR_O3DE_DEV))
|
||||
|
||||
# try to fetch and set the base values from the environment
|
||||
# this makes sure all envars set, are resolved on import
|
||||
@@ -204,7 +207,7 @@ if __name__ == '__main__':
|
||||
ensure_ascii=False), '\r')
|
||||
|
||||
# simple tests
|
||||
_ENV_TAG = 'LY_DEV'
|
||||
_ENV_TAG = 'O3DE_DEV'
|
||||
foo = get_envar_default(_ENV_TAG)
|
||||
_LOGGER.info("~ Results of getVar on tag, '{0}':'{1}'\r".format(_ENV_TAG, foo))
|
||||
|
||||
|
||||
+14
-10
@@ -13,31 +13,35 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||
import os
|
||||
from pathlib import Path
|
||||
import logging as _logging
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
from azpy.env_bool import env_bool
|
||||
# -------------------------------------------------------------------------
|
||||
# global space
|
||||
import azpy.env_bool as env_bool
|
||||
from azpy.constants import ENVAR_DCCSI_GDEBUG
|
||||
from azpy.constants import ENVAR_DCCSI_DEV_MODE
|
||||
from azpy.constants import FRMT_LOG_LONG
|
||||
|
||||
# global space
|
||||
_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
_DCCSI_GDEBUG = env_bool.env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool.env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
|
||||
_PACKAGENAME = __name__
|
||||
if _PACKAGENAME is '__main__':
|
||||
_PACKAGENAME = 'azpy.shared.noodely'
|
||||
|
||||
import azpy
|
||||
_LOGGER = azpy.initialize_logger(_PACKAGENAME)
|
||||
_LOGGER.debug('Invoking __init__.py for {0}.'.format({_PACKAGENAME}))
|
||||
# -------------------------------------------------------------------------
|
||||
#
|
||||
# set up module logging
|
||||
for handler in _logging.root.handlers[:]:
|
||||
_logging.root.removeHandler(handler)
|
||||
_LOGGER = _logging.getLogger(_PACKAGENAME)
|
||||
_logging.basicConfig(format=FRMT_LOG_LONG)
|
||||
_LOGGER.debug('Initializing: {0}.'.format({_PACKAGENAME}))
|
||||
|
||||
__all__ = ['find_arg',
|
||||
'helpers',
|
||||
'node',
|
||||
'synth',
|
||||
'synth_arg_kwarg',
|
||||
'test_foo']
|
||||
#
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -74,7 +74,7 @@ if __name__ == "__main__":
|
||||
print ('~ find_arg.py ... Running script as __main__')
|
||||
print ("# ----------------------------------------------------------------------- #\r")
|
||||
|
||||
_G_DEBUG = True
|
||||
_DCCSI_GDEBUG = True
|
||||
|
||||
from test_foo import Foo
|
||||
|
||||
@@ -102,7 +102,7 @@ if __name__ == "__main__":
|
||||
self._kwargsDict[key] = value
|
||||
# synthesize(self, '{0}'.format(key), value) <-- I have a method,
|
||||
# which synthesizes properties... with gettr, settr, etc.
|
||||
if _G_DEBUG:
|
||||
if _DCCSI_GDEBUG:
|
||||
print("{0}:{1}".format(key, value))
|
||||
|
||||
# representation
|
||||
|
||||
+4
-4
@@ -47,13 +47,13 @@ from azpy.constants import ENVAR_DCCSI_DEV_MODE
|
||||
|
||||
# global space
|
||||
# To Do: update to dynaconf dynamic env and settings?
|
||||
_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_GDEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
|
||||
_MODULENAME = 'azpy.shared.noodely.node'
|
||||
|
||||
_log_level = int(20)
|
||||
if _G_DEBUG:
|
||||
if _DCCSI_GDEBUG:
|
||||
_log_level = int(10)
|
||||
_LOGGER = azpy.initialize_logger(_MODULENAME,
|
||||
log_to_file=False,
|
||||
@@ -66,7 +66,7 @@ _LOGGER.debug('Starting:: {}.'.format({_MODULENAME}))
|
||||
# quick test code (remove later)
|
||||
from hashids import Hashids
|
||||
hashids = Hashids(min_length=16, salt='DCCsi')
|
||||
if _G_DEBUG:
|
||||
if _DCCSI_GDEBUG:
|
||||
print (hashids.encrypt(193487)) # test hash
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
@@ -107,7 +107,7 @@ class Node(object):
|
||||
"""Class constructor: makes a node."""
|
||||
|
||||
# share the debug state
|
||||
_DEBUG = _G_DEBUG
|
||||
_DEBUG = _DCCSI_GDEBUG
|
||||
|
||||
# logger
|
||||
_LOGGER = _G_LOGGER
|
||||
|
||||
+3
-3
@@ -47,13 +47,13 @@ from azpy.constants import ENVAR_DCCSI_DEV_MODE
|
||||
# -------------------------------------------------------------------------
|
||||
# global space
|
||||
# To Do: update to dynaconf dynamic env and settings?
|
||||
_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_GDEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
|
||||
_MODULENAME = 'azpy.shared.noodely.pathnode'
|
||||
|
||||
_log_level = int(20)
|
||||
if _G_DEBUG:
|
||||
if _DCCSI_GDEBUG:
|
||||
_log_level = int(10)
|
||||
_LOGGER = azpy.initialize_logger(_MODULENAME,
|
||||
log_to_file=False,
|
||||
@@ -78,7 +78,7 @@ class PathNode(Node):
|
||||
"""doc string"""
|
||||
|
||||
# share the debug state
|
||||
_DEBUG = _G_DEBUG
|
||||
_DEBUG = _DCCSI_GDEBUG
|
||||
|
||||
# class header
|
||||
_message_header = 'noodly, PathNode(): Message'
|
||||
|
||||
+11
-9
@@ -11,24 +11,26 @@
|
||||
|
||||
"""azpy.shared.ui.__init__"""
|
||||
|
||||
import os
|
||||
import logging as _logging
|
||||
|
||||
from azpy.env_bool import env_bool
|
||||
import azpy.env_bool as env_bool
|
||||
from azpy.constants import ENVAR_DCCSI_GDEBUG
|
||||
from azpy.constants import ENVAR_DCCSI_DEV_MODE
|
||||
from azpy.constants import FRMT_LOG_LONG
|
||||
|
||||
# global space
|
||||
_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
_DCCSI_GDEBUG = env_bool.env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool.env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
|
||||
_PACKAGENAME = __name__
|
||||
if _PACKAGENAME is '__main__':
|
||||
_PACKAGENAME = 'azpy.shared.ui'
|
||||
|
||||
import azpy
|
||||
_LOGGER = azpy.initialize_logger(_PACKAGENAME)
|
||||
_LOGGER.debug('Invoking __init__.py for {0}.'.format({_PACKAGENAME}))
|
||||
|
||||
# set up module logging
|
||||
for handler in _logging.root.handlers[:]:
|
||||
_logging.root.removeHandler(handler)
|
||||
_LOGGER = _logging.getLogger(_PACKAGENAME)
|
||||
_logging.basicConfig(format=FRMT_LOG_LONG)
|
||||
_LOGGER.debug('Initializing: {0}.'.format({_PACKAGENAME}))
|
||||
# -------------------------------------------------------------------------
|
||||
#
|
||||
__all__ = []
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ from shiboken2 import wrapInstance
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# global space debug flag
|
||||
_G_DEBUG = settings.DCCSI_GDEBUG
|
||||
_DCCSI_GDEBUG = settings.DCCSI_GDEBUG
|
||||
|
||||
# global space debug flag
|
||||
_DCCSI_DEV_MODE = settings.DCCSI_DEV_MODE
|
||||
|
||||
+2
-2
@@ -30,7 +30,7 @@ import PySide2.QtGui as QtGui
|
||||
# -------------------------------------------------------------------------
|
||||
# global space
|
||||
# To Do: update to dynaconf dynamic env and settings?
|
||||
_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_GDEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
|
||||
_MODULE_PATH = Path(__file__)
|
||||
@@ -38,7 +38,7 @@ _MODULE_PATH = Path(__file__)
|
||||
_MODULENAME = 'azpy.shared.ui.custom_treemodel'
|
||||
|
||||
_log_level = int(20)
|
||||
if _G_DEBUG:
|
||||
if _DCCSI_GDEBUG:
|
||||
_log_level = int(10)
|
||||
_LOGGER = azpy.initialize_logger(_MODULENAME,
|
||||
log_to_file=False,
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ import PySide2.QtWidgets as QtWidgets
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# global space debug flag
|
||||
_G_DEBUG = os.getenv('DCCSI_GDEBUG', False)
|
||||
_DCCSI_GDEBUG = os.getenv('DCCSI_GDEBUG', False)
|
||||
|
||||
# global space developer mode flag
|
||||
_DCCSI_DEV_MODE = os.getenv('DCCSI_DEV_MODE', False)
|
||||
|
||||
+4
-4
@@ -32,7 +32,7 @@ from PySide2.QtCore import QTimer
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# global space debug flag
|
||||
_G_DEBUG = os.getenv('DCCSI_GDEBUG', False)
|
||||
_DCCSI_GDEBUG = os.getenv('DCCSI_GDEBUG', False)
|
||||
|
||||
# global space debug flag
|
||||
_DCCSI_DEV_MODE = os.getenv('DCCSI_DEV_MODE', False)
|
||||
@@ -48,7 +48,7 @@ _MODULENAME = __name__
|
||||
if _MODULENAME is '__main__':
|
||||
_MODULENAME = _TOOL_TAG
|
||||
|
||||
if _G_DEBUG:
|
||||
if _DCCSI_GDEBUG:
|
||||
_LOGGER = initialize_logger(_MODULENAME, log_to_file=True)
|
||||
_LOGGER.debug('Something invoked :: {0}.'.format({_MODULENAME}))
|
||||
else:
|
||||
@@ -130,7 +130,7 @@ if __name__ == '__main__':
|
||||
_TOOL_TAG = 'azpy.shared.ui.pyside2_qtextedit_stdout'
|
||||
_TYPE_TAG = 'test'
|
||||
|
||||
if _G_DEBUG:
|
||||
if _DCCSI_GDEBUG:
|
||||
_LOGGER = initialize_logger('{0}-TEST'.format(_TOOL_TAG), log_to_file=True)
|
||||
_LOGGER.debug('Something invoked :: {0}.'.format({_MODULENAME}))
|
||||
|
||||
@@ -155,7 +155,7 @@ if __name__ == '__main__':
|
||||
_READER.start('python', ['-u', _TEST_PY_FILE]) # start the process
|
||||
|
||||
# after that starts, this will show the console
|
||||
# LY_QSS = Path(_MODULE_PATH.parent, 'resources', 'stylesheets', 'LYstyle.qss')
|
||||
# O3DE_QSS = Path(_MODULE_PATH.parent, 'resources', 'stylesheets', 'LYstyle.qss')
|
||||
_DARK_STYLE = Path(_MODULE_PATH.parent, 'resources', 'qdarkstyle', 'style.qss')
|
||||
_CONSOLE.qapp.setStyleSheet(_DARK_STYLE.read_file())
|
||||
_CONSOLE.show() # make the console visible
|
||||
|
||||
+2
-2
@@ -51,7 +51,7 @@ import azpy.shared.ui.help_menu as help_menu
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# global space debug flag
|
||||
_G_DEBUG = settings.DCCSI_GDEBUG
|
||||
_DCCSI_GDEBUG = settings.DCCSI_GDEBUG
|
||||
|
||||
# global space debug flag
|
||||
_DCCSI_DEV_MODE = settings.DCCSI_DEV_MODE
|
||||
@@ -112,7 +112,7 @@ def from_ui_generate_form_and_base_class(filename, return_output=False):
|
||||
ui_file.exists()
|
||||
except FileNotFoundError as error:
|
||||
output += 'File does not exist: {0}/r'.format(error)
|
||||
if _G_DEBUG:
|
||||
if _DCCSI_GDEBUG:
|
||||
print(error)
|
||||
if return_output:
|
||||
return False, output
|
||||
|
||||
+2
-2
@@ -24,7 +24,7 @@ import azpy.config_utils
|
||||
_config = azpy.config_utils.get_dccsi_config()
|
||||
# ^ this is effectively an import and retreive of <dccsi>\config.py
|
||||
# init lumberyard Qy/PySide2 access
|
||||
_config.init_ly_pyside(settings.LY_DEV)
|
||||
_config.init_o3de_pyside(settings.O3DE_DEV)
|
||||
|
||||
# now we can import lumberyards PySide2
|
||||
import PySide2.QtCore as QtCore
|
||||
@@ -32,7 +32,7 @@ import PySide2.QtWidgets as QtWidgets
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# global space debug flag
|
||||
_G_DEBUG = settings.DCCSI_GDEBUG
|
||||
_DCCSI_GDEBUG = settings.DCCSI_GDEBUG
|
||||
|
||||
# global space debug flag
|
||||
_DCCSI_DEV_MODE = settings.DCCSI_DEV_MODE
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@ import PySide2.QtUiTools as QtUiTools
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# global space debug flag
|
||||
_G_DEBUG = settings.DCCSI_GDEBUG
|
||||
_DCCSI_GDEBUG = settings.DCCSI_GDEBUG
|
||||
|
||||
# global space debug flag
|
||||
_DCCSI_DEV_MODE = settings.DCCSI_DEV_MODE
|
||||
|
||||
Reference in New Issue
Block a user