mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-24 12:54:40 +01:00
shut the hound up
This commit is contained in:
Ondrej Samohel
parent
ae986058cf
commit
9c8131bef3
4 changed files with 119 additions and 91 deletions
|
|
@ -1139,7 +1139,7 @@ class RootItem:
|
|||
"""
|
||||
|
||||
def __init__(
|
||||
self, root_raw_data, name=None, parent_keys=[], parent=None
|
||||
self, root_raw_data, name=None, parent_keys=None, parent=None
|
||||
):
|
||||
lowered_platform_keys = {}
|
||||
for key, value in root_raw_data.items():
|
||||
|
|
@ -1147,7 +1147,7 @@ class RootItem:
|
|||
self.raw_data = lowered_platform_keys
|
||||
self.cleaned_data = self._clean_roots(lowered_platform_keys)
|
||||
self.name = name
|
||||
self.parent_keys = parent_keys
|
||||
self.parent_keys = parent_keys or []
|
||||
self.parent = parent
|
||||
|
||||
self.available_platforms = list(lowered_platform_keys.keys())
|
||||
|
|
@ -1510,7 +1510,9 @@ class Roots:
|
|||
output.extend(self.all_root_paths(_roots))
|
||||
return output
|
||||
|
||||
def _root_environments(self, keys=[], roots=None):
|
||||
def _root_environments(self, keys=None, roots=None):
|
||||
if not keys:
|
||||
keys = []
|
||||
if roots is None:
|
||||
roots = self.roots
|
||||
|
||||
|
|
@ -1629,7 +1631,7 @@ class Roots:
|
|||
return self._parse_dict(raw_project_roots, parent=self)
|
||||
|
||||
@staticmethod
|
||||
def _parse_dict(data, key=None, parent_keys=[], parent=None):
|
||||
def _parse_dict(data, key=None, parent_keys=None, parent=None):
|
||||
"""Parse roots raw data into RootItem or dictionary with RootItems.
|
||||
|
||||
Converting raw roots data to `RootItem` helps to handle platform keys.
|
||||
|
|
@ -1647,6 +1649,8 @@ class Roots:
|
|||
`RootItem` or `dict` with multiple `RootItem`s when multiroot
|
||||
setting is used.
|
||||
"""
|
||||
if not parent_keys:
|
||||
parent_keys = []
|
||||
is_last = False
|
||||
for value in data.values():
|
||||
if isinstance(value, StringType):
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
"""Get configuration data."""
|
||||
import os
|
||||
import json
|
||||
import datetime
|
||||
|
|
@ -9,31 +11,32 @@ log = PypeLogger().get_logger(__name__)
|
|||
def get_datetime_data(datetime_obj=None):
|
||||
"""Returns current datetime data as dictionary.
|
||||
|
||||
:param datetime_obj: may return data for specific datetime object
|
||||
:type datetime_obj: datetime, optional
|
||||
:return: prepared date & time data
|
||||
:rtype: dict
|
||||
Args:
|
||||
datetime_obj (datetime): Specific datetime object
|
||||
|
||||
Returns:
|
||||
dict: prepared date & time data
|
||||
|
||||
Available keys:
|
||||
"d" - <Day of month number> in shortest possible way.
|
||||
"dd" - <Day of month number> with 2 digits.
|
||||
"ddd" - <Week day name> shortened week day. e.g.: `Mon`, ...
|
||||
"dddd" - <Week day name> full name of week day. e.g.: `Monday`, ...
|
||||
"m" - <Month number> in shortest possible way. e.g.: `1` if January
|
||||
"mm" - <Month number> with 2 digits.
|
||||
"mmm" - <Month name> shortened month name. e.g.: `Jan`, ...
|
||||
"mmmm" - <Month name> full month name. e.g.: `January`, ...
|
||||
"yy" - <Year number> shortened year. e.g.: `19`, `20`, ...
|
||||
"yyyy" - <Year number> full year. e.g.: `2019`, `2020`, ...
|
||||
"H" - <Hours number 24-hour> shortened hours.
|
||||
"HH" - <Hours number 24-hour> with 2 digits.
|
||||
"h" - <Hours number 12-hour> shortened hours.
|
||||
"hh" - <Hours number 12-hour> with 2 digits.
|
||||
"ht" - <Midday type> AM or PM.
|
||||
"M" - <Minutes number> shortened minutes.
|
||||
"MM" - <Minutes number> with 2 digits.
|
||||
"S" - <Seconds number> shortened seconds.
|
||||
"SS" - <Seconds number> with 2 digits.
|
||||
"d" - <Day of month number> in shortest possible way.
|
||||
"dd" - <Day of month number> with 2 digits.
|
||||
"ddd" - <Week day name> shortened week day. e.g.: `Mon`, ...
|
||||
"dddd" - <Week day name> full name of week day. e.g.: `Monday`, ...
|
||||
"m" - <Month number> in shortest possible way. e.g.: `1` if January
|
||||
"mm" - <Month number> with 2 digits.
|
||||
"mmm" - <Month name> shortened month name. e.g.: `Jan`, ...
|
||||
"mmmm" - <Month name> full month name. e.g.: `January`, ...
|
||||
"yy" - <Year number> shortened year. e.g.: `19`, `20`, ...
|
||||
"yyyy" - <Year number> full year. e.g.: `2019`, `2020`, ...
|
||||
"H" - <Hours number 24-hour> shortened hours.
|
||||
"HH" - <Hours number 24-hour> with 2 digits.
|
||||
"h" - <Hours number 12-hour> shortened hours.
|
||||
"hh" - <Hours number 12-hour> with 2 digits.
|
||||
"ht" - <Midday type> AM or PM.
|
||||
"M" - <Minutes number> shortened minutes.
|
||||
"MM" - <Minutes number> with 2 digits.
|
||||
"S" - <Seconds number> shortened seconds.
|
||||
"SS" - <Seconds number> with 2 digits.
|
||||
"""
|
||||
|
||||
if not datetime_obj:
|
||||
|
|
@ -79,6 +82,16 @@ def get_datetime_data(datetime_obj=None):
|
|||
|
||||
|
||||
def load_json(fpath, first_run=False):
|
||||
"""Load JSON data.
|
||||
|
||||
Args:
|
||||
fpath (str): Path to JSON file.
|
||||
first_run (bool): Flag to run checks if file is loaded for the first
|
||||
time.
|
||||
Returns:
|
||||
dict: parsed JSON object.
|
||||
|
||||
"""
|
||||
# Load json data
|
||||
with open(fpath, "r") as opened_file:
|
||||
lines = opened_file.read().splitlines()
|
||||
|
|
@ -136,17 +149,27 @@ def load_json(fpath, first_run=False):
|
|||
|
||||
|
||||
def collect_json_from_path(input_path, first_run=False):
|
||||
r""" Json collector
|
||||
iterate through all subfolders and json files in *input_path*
|
||||
"""Collect JSON file from path.
|
||||
|
||||
Example:
|
||||
``{input_path}/path/to/file.json`` will return dictionary
|
||||
Iterate through all subfolders and JSON files in `input_path`.
|
||||
|
||||
.. code-block:: none
|
||||
Args:
|
||||
input_path (str): Path from JSONs will be collected.
|
||||
first_run (bool): Flag to run checks if file is loaded for the first
|
||||
time.
|
||||
|
||||
Returns:
|
||||
dict: Collected JSONs.
|
||||
|
||||
Examples:
|
||||
|
||||
Imagine path::
|
||||
`{input_path}/path/to/file.json`
|
||||
|
||||
>>> collect_json_from_path(input_path)
|
||||
{'path':
|
||||
{'to':
|
||||
{'file': {file.json data}
|
||||
{'file': {JSON}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -173,25 +196,25 @@ def collect_json_from_path(input_path, first_run=False):
|
|||
|
||||
|
||||
def get_presets(project=None, first_run=False):
|
||||
""" Loads preset files with usage of 'collect_json_from_path'
|
||||
Default preset path is set to: ``{PYPE_CONFIG}/presets``
|
||||
Project preset path is set to: ``{PYPE_PROJECT_CONFIGS}/*project_name*``
|
||||
- environment variable **PYPE_STUDIO_CONFIG** is required
|
||||
- **PYPE_STUDIO_CONFIGS** only if want to use overrides per project
|
||||
"""Loads preset files with usage of ``collect_json_from_path``.
|
||||
|
||||
Default preset path is set to: `{PYPE_CONFIG}/presets`
|
||||
Project preset path is set to: `{PYPE_PROJECT_CONFIGS}/project_name`
|
||||
|
||||
Environment variable `PYPE_STUDIO_CONFIG` is required
|
||||
`PYPE_STUDIO_CONFIGS` only if want to use overrides per project.
|
||||
|
||||
Args:
|
||||
project (str): Project name.
|
||||
first_run (bool): Flag to run checks if file is loaded for the first
|
||||
time.
|
||||
|
||||
Returns:
|
||||
- None
|
||||
|
||||
- if default path does not exist
|
||||
|
||||
- default presets (dict)
|
||||
|
||||
- if project_name is not set
|
||||
- if project's presets folder does not exist
|
||||
|
||||
- project presets (dict)
|
||||
|
||||
- if project_name is set and include override data
|
||||
None: If default path does not exist.
|
||||
default presets (dict): If project_name is not set or
|
||||
if project's presets folder does not exist.
|
||||
project presets (dict): If project_name is set and include
|
||||
override data.
|
||||
|
||||
"""
|
||||
# config_path should be set from environments?
|
||||
|
|
@ -228,22 +251,20 @@ def get_presets(project=None, first_run=False):
|
|||
|
||||
|
||||
def get_init_presets(project=None):
|
||||
""" Loads content of presets like get_presets() but also evaluate init.json ponter to default presets
|
||||
"""Loads content of presets.
|
||||
|
||||
Llike :func:`get_presets()`` but also evaluate `init.json`
|
||||
pointer to default presets.
|
||||
|
||||
Args:
|
||||
project(str): Project name.
|
||||
|
||||
Returns:
|
||||
- None
|
||||
|
||||
- if default path does not exist
|
||||
|
||||
- default presets (dict)
|
||||
|
||||
- if project_name is not set
|
||||
- if project's presets folder does not exist
|
||||
|
||||
- project presets (dict)
|
||||
|
||||
- if project_name is set and include override data
|
||||
|
||||
None: If default path does not exist
|
||||
default presets (dict): If project_name is not set or if project's
|
||||
presets folder does not exist.
|
||||
project presets (dict): If project_name is set and include
|
||||
override data.
|
||||
"""
|
||||
presets = get_presets(project)
|
||||
|
||||
|
|
@ -258,17 +279,27 @@ def get_init_presets(project=None):
|
|||
log.warning("No projects custom preset available...")
|
||||
presets["colorspace"] = presets["colorspace"]["default"]
|
||||
presets["dataflow"] = presets["dataflow"]["default"]
|
||||
log.info("Presets `colorspace` and `dataflow` loaded from `default`...")
|
||||
log.info(("Presets `colorspace` and `dataflow` "
|
||||
"loaded from `default`..."))
|
||||
|
||||
return presets
|
||||
|
||||
|
||||
def update_dict(main_dict, enhance_dict):
|
||||
""" Merges dictionaries by keys.
|
||||
Function call itself if value on key is again dictionary
|
||||
"""Merges dictionaries by keys.
|
||||
|
||||
Function call itself if value on key is again dictionary.
|
||||
|
||||
Args:
|
||||
main_dict (dict): First dict to merge second one into.
|
||||
enhance_dict (dict): Second dict to be merged.
|
||||
|
||||
Returns:
|
||||
dict: Merged result.
|
||||
|
||||
.. note:: does not overrides whole value on first found key
|
||||
but only values differences from enhance_dict
|
||||
|
||||
"""
|
||||
for key, value in enhance_dict.items():
|
||||
if key not in main_dict:
|
||||
|
|
|
|||
|
|
@ -1,11 +1,8 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
"""Implementation of Pype commands."""
|
||||
import os
|
||||
import sys
|
||||
import platform
|
||||
|
||||
|
||||
class PypeCommands():
|
||||
class PypeCommands:
|
||||
"""Class implementing commands used by Pype.
|
||||
|
||||
Most of its methods are called by :mod:`cli` module.
|
||||
|
|
|
|||
36
setup.py
36
setup.py
|
|
@ -5,40 +5,36 @@ from cx_Freeze import setup, Executable
|
|||
from version import __version__
|
||||
|
||||
|
||||
install_requires = ['clique',
|
||||
'jsonschema',
|
||||
'OpenTimelineIO',
|
||||
'pathlib2',
|
||||
'PIL',
|
||||
'pymongo',
|
||||
'Qt',
|
||||
'speedcopy']
|
||||
install_requires = [
|
||||
"clique",
|
||||
"jsonschema",
|
||||
"OpenTimelineIO",
|
||||
"pathlib2",
|
||||
"PIL",
|
||||
"pymongo",
|
||||
"Qt",
|
||||
"speedcopy",
|
||||
]
|
||||
|
||||
base = None
|
||||
if sys.platform == 'win32':
|
||||
base = 'Win32GUI'
|
||||
if sys.platform == "win32":
|
||||
base = "Win32GUI"
|
||||
|
||||
# Build options for cx_Freeze. Manually add/exclude packages and binaries
|
||||
buildOptions = dict(
|
||||
packages=install_requires,
|
||||
excludes=[],
|
||||
bin_includes=[],
|
||||
include_files=['schema', 'setup', 'vendor']
|
||||
include_files=["schema", "setup", "vendor"],
|
||||
)
|
||||
|
||||
|
||||
executables = [
|
||||
Executable(
|
||||
'pype.py',
|
||||
base=None,
|
||||
targetName='pype'
|
||||
)
|
||||
]
|
||||
executables = [Executable("pype.py", base=None, targetName="pype")]
|
||||
|
||||
setup(
|
||||
name='pype',
|
||||
name="pype",
|
||||
version=__version__,
|
||||
description='Ultimate pipeline',
|
||||
description="Ultimate pipeline",
|
||||
options=dict(build_exe=buildOptions),
|
||||
executables=executables,
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue