Merge pull request #598 from pypeclub/feature/environments_to_settings

convert remaining environments
This commit is contained in:
Milan Kolar 2020-10-02 18:57:05 +02:00 committed by GitHub
commit 384c6e32bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 404 additions and 280 deletions

View file

@ -1,4 +1,53 @@
{
"studio_name": "",
"studio_code": ""
"studio_name": "convert from \"PYPE_STUDIO_NAME\"",
"studio_code": "convert from \"PYPE_STUDIO_CODE\"",
"project_plugins": {
"windows": "convert from \"PYPE_PROJECT_PLUGINS\"",
"darwin": "",
"linux": ""
},
"studio_soft": {
"windows": "convert from \"STUDIO_SOFT\"",
"darwin": "",
"linux": ""
},
"environment": {
"__environment_keys__": {
"global": [
"PYPE_APP_ROOT",
"PYPE_MODULE_ROOT",
"FFMPEG_PATH",
"PATH",
"PYTHONPATH",
"PYPE_PROJECT_CONFIGS",
"PYPE_PYTHON_EXE",
"PYBLISH_GUI"
]
},
"PYPE_APP_ROOT": "{PYPE_SETUP_PATH}/pypeapp",
"PYPE_MODULE_ROOT": "{PYPE_SETUP_PATH}/repos/pype",
"FFMPEG_PATH": {
"windows": "{VIRTUAL_ENV}/localized/ffmpeg_exec/windows/bin;{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/windows/bin",
"darwin": "{VIRTUAL_ENV}/localized/ffmpeg_exec/darwin/bin:{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/darwin/bin",
"linux": "{VIRTUAL_ENV}/localized/ffmpeg_exec/linux:{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/linux"
},
"PATH": [
"{PYPE_CONFIG}/launchers",
"{PYPE_APP_ROOT}",
"{FFMPEG_PATH}",
"{PATH}"
],
"PYTHONPATH": {
"windows": "{VIRTUAL_ENV}/Lib/site-packages;{PYPE_MODULE_ROOT}/pype/tools;{PYPE_MODULE_ROOT}/pype/vendor;{PYTHONPATH}",
"linux": "{VIRTUAL_ENV}/lib/python{PYTHON_VERSION}/site-packages:{PYPE_MODULE_ROOT}/pype/tools:{PYPE_MODULE_ROOT}/pype/vendor:{PYTHONPATH}",
"darwin": "{VIRTUAL_ENV}/lib/python{PYTHON_VERSION}/site-packages:{PYPE_MODULE_ROOT}/pype/tools:{PYPE_MODULE_ROOT}/pype/vendor:{PYTHONPATH}"
},
"PYPE_PROJECT_CONFIGS": "{PYPE_SETUP_PATH}/../studio-project-configs",
"PYPE_PYTHON_EXE": {
"windows": "{VIRTUAL_ENV}/Scripts/python.exe",
"linux": "{VIRTUAL_ENV}/Scripts/python",
"darwin": "{VIRTUAL_ENV}/bin/python"
},
"PYBLISH_GUI": "pyblish_pype"
}
}

View file

@ -2,7 +2,23 @@
"Avalon": {
"AVALON_MONGO": "mongodb://localhost:2707",
"AVALON_DB_DATA": "{PYPE_SETUP_PATH}/../mongo_db_data",
"AVALON_THUMBNAIL_ROOT": "{PYPE_SETUP_PATH}/../avalon_thumails"
"AVALON_THUMBNAIL_ROOT": "{PYPE_SETUP_PATH}/../avalon_thumails",
"environment": {
"__environment_keys__": {
"avalon": [
"AVALON_CONFIG",
"AVALON_PROJECTS",
"AVALON_SCHEMA",
"AVALON_LABEL",
"AVALON_TIMEOUT"
]
},
"AVALON_CONFIG": "pype",
"AVALON_PROJECTS": "{PYPE_PROJECTS_PATH}",
"AVALON_SCHEMA": "{PYPE_MODULE_ROOT}/schema",
"AVALON_LABEL": "Pype",
"AVALON_TIMEOUT": "1000"
}
},
"Ftrack": {
"enabled": true,
@ -34,6 +50,24 @@
"test": "Test"
},
"default": "-"
},
"environment": {
"__environment_keys__": {
"ftrack": [
"FTRACK_ACTIONS_PATH",
"FTRACK_EVENTS_PATH",
"PYBLISHPLUGINPATH"
]
},
"FTRACK_ACTIONS_PATH": [
"{PYPE_MODULE_ROOT}/pype/modules/ftrack/actions"
],
"FTRACK_EVENTS_PATH": [
"{PYPE_MODULE_ROOT}/pype/modules/ftrack/events"
],
"PYBLISHPLUGINPATH": [
"{PYPE_MODULE_ROOT}/pype/plugins/ftrack/publish"
]
}
},
"Rest Api": {

View file

@ -7,7 +7,7 @@
"key": "global",
"children": [{
"type": "schema",
"name": "1_intents_gui_schema"
"name": "1_general_gui_schema"
},{
"type": "schema",
"name": "1_modules_gui_schema"

View file

@ -0,0 +1,39 @@
{
"key": "general",
"type": "dict",
"label": "General",
"collapsable": true,
"is_file": true,
"children": [{
"key": "studio_name",
"type": "text",
"label": "Studio Name"
}, {
"key": "studio_code",
"type": "text",
"label": "Studio Short Code"
}, {
"type": "splitter"
}, {
"key": "project_plugins",
"type": "path-widget",
"label": "Additional Project Plugins Path",
"multiplatform": true,
"multipath": false
}, {
"key": "studio_soft",
"type": "path-widget",
"label": "Studio Software Location",
"multiplatform": true,
"multipath": false
}, {
"type": "splitter"
},
{
"key": "environment",
"label": "Environment",
"type": "raw-json",
"env_group_key": "global"
}
]
}

View file

@ -1,16 +0,0 @@
{
"key": "general",
"type": "dict",
"label": "General",
"collapsable": true,
"is_file": true,
"children": [{
"key": "studio_name",
"type": "text",
"label": "Studio Name"
},{
"key": "studio_code",
"type": "text",
"label": "Studio Short Code"
}
]}

View file

@ -1,283 +1,301 @@
{
"key": "modules",
"type": "dict",
"label": "Modules",
"collapsable": true,
"is_file": true,
"children": [{
"type": "dict",
"key": "Avalon",
"label": "Avalon",
"collapsable": true,
"children": [
{
"type": "text",
"key": "AVALON_MONGO",
"label": "Avalon Mongo URL"
},
{
"type": "text",
"key": "AVALON_DB_DATA",
"label": "Avalon Mongo Data Location"
},
{
"type": "text",
"key": "AVALON_THUMBNAIL_ROOT",
"label": "Thumbnail Storage Location"
}
]
},{
"key": "modules",
"type": "dict",
"label": "Modules",
"collapsable": true,
"is_file": true,
"children": [{
"type": "dict",
"key": "Avalon",
"label": "Avalon",
"collapsable": true,
"children": [{
"type": "text",
"key": "AVALON_MONGO",
"label": "Avalon Mongo URL"
},
{
"type": "text",
"key": "AVALON_DB_DATA",
"label": "Avalon Mongo Data Location"
},
{
"type": "text",
"key": "AVALON_THUMBNAIL_ROOT",
"label": "Thumbnail Storage Location"
},
{
"key": "environment",
"label": "Environment",
"type": "raw-json",
"env_group_key": "avalon"
}
]
}, {
"type": "dict",
"key": "Ftrack",
"label": "Ftrack",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "text",
"key": "ftrack_server",
"label": "Server"
},
{
"type": "splitter"
},
{
"type": "label",
"label": "Additional Ftrack paths"
},
{
"type": "list",
"key": "ftrack_actions_path",
"label": "Action paths",
"object_type": "text"
},
{
"type": "list",
"key": "ftrack_events_path",
"label": "Event paths",
"object_type": "text"
},
{
"type": "splitter"
},
{
"type": "label",
"label": "Ftrack event server advanced settings"
},
{
"type": "text",
"key": "FTRACK_EVENTS_MONGO_DB",
"label": "Event Mongo DB"
},
{
"type": "text",
"key": "FTRACK_EVENTS_MONGO_COL",
"label": "Events Mongo Collection"
},
{
"type": "dict",
"key": "sync_to_avalon",
"label": "Sync to avalon",
"children": [{
"type": "list",
"key": "statuses_name_change",
"label": "Status name change",
"object_type": {
"type": "text",
"multiline": false
}
}]
},
{
"type": "dict-modifiable",
"key": "status_version_to_task",
"label": "Version to Task status mapping",
"object_type": "text"
},
{
"type": "dict-modifiable",
"key": "status_update",
"label": "Status Updates",
"object_type": {
"type": "list",
"object_type": "text"
}
},
{
"key": "intent",
"type": "dict-invisible",
"children": [{
"type": "dict-modifiable",
"object_type": "text",
"key": "items",
"label": "Intent Key/Label"
},
{
"key": "default",
"type": "text",
"label": "Default Intent"
}
]
},
{
"type": "splitter"
},
{
"key": "environment",
"label": "Environment",
"type": "raw-json",
"env_group_key": "ftrack"
}
]
}, {
"type": "dict",
"key": "Rest Api",
"label": "Rest Api",
"collapsable": true,
"children": [{
"type": "number",
"key": "default_port",
"label": "Default Port",
"minimum": 1,
"maximum": 65535
},
{
"type": "list",
"key": "exclude_ports",
"label": "Exclude ports",
"object_type": {
"type": "number",
"minimum": 1,
"maximum": 65535
}
}
]
}, {
"type": "dict",
"key": "Timers Manager",
"label": "Timers Manager",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "number",
"decimal": 2,
"key": "full_time",
"label": "Max idle time"
}, {
"type": "number",
"decimal": 2,
"key": "message_time",
"label": "When dialog will show"
}
]
}, {
"type": "dict",
"key": "Clockify",
"label": "Clockify",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "text",
"key": "workspace_name",
"label": "Workspace name"
}
]
}, {
"type": "dict",
"key": "Deadline",
"label": "Deadline",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "text",
"key": "ftrack_server",
"label": "Server"
},
{
"type": "label",
"label": "Additional Ftrack paths"
},
{
"type": "list",
"key": "ftrack_actions_path",
"label": "Action paths",
"object_type": "text"
},
{
"type": "list",
"key": "ftrack_events_path",
"label": "Event paths",
"object_type": "text"
},
{
"type": "label",
"label": "Ftrack event server advanced settings"
},
{
"type": "text",
"key": "FTRACK_EVENTS_MONGO_DB",
"label": "Event Mongo DB"
},
{
"type": "text",
"key": "FTRACK_EVENTS_MONGO_COL",
"label": "Events Mongo Collection"
},
{
"type": "dict",
"key": "sync_to_avalon",
"label": "Sync to avalon",
"children": [{
"type": "list",
"key": "statuses_name_change",
"label": "Status name change",
"object_type": {
"type": "text",
"multiline": false
}
}]
},
{
"type": "dict-modifiable",
"key": "status_version_to_task",
"label": "Version to Task status mapping",
"object_type": "text"
},
{
"type": "dict-modifiable",
"key": "status_update",
"label": "Status Updates",
"object_type": {
"type": "list",
"object_type": "text"
}
},
{
"key": "intent",
"type": "dict-invisible",
"children": [
{
"type": "dict-modifiable",
"object_type": "text",
"key": "items",
"label": "Intent Key/Label"
},
{
"key": "default",
"type": "text",
"label": "Defautl Intent"
}
]
}
]
}, {
"type": "dict",
"key": "Rest Api",
"label": "Rest Api",
"collapsable": true,
"children": [{
"type": "number",
"key": "default_port",
"label": "Default Port",
"minimum": 1,
"maximum": 65535
},
{
"type": "list",
"key": "exclude_ports",
"label": "Exclude ports",
"object_type": {
"type": "number",
"minimum": 1,
"maximum": 65535
}
}
]
}, {
"type": "dict",
"key": "Timers Manager",
"label": "Timers Manager",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "number",
"decimal": 2,
"key": "full_time",
"label": "Max idle time"
}, {
"type": "number",
"decimal": 2,
"key": "message_time",
"label": "When dialog will show"
}
]
}, {
"type": "dict",
"key": "Clockify",
"label": "Clockify",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "text",
"key": "workspace_name",
"label": "Workspace name"
}
]
}, {
"type": "dict",
"key": "Deadline",
"label": "Deadline",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},{
"type": "text",
"key": "DEADLINE_REST_URL",
"label": "Deadline Resl URL"
"type": "text",
"key": "DEADLINE_REST_URL",
"label": "Deadline Resl URL"
}]
}, {
"type": "dict",
"key": "Muster",
"label": "Muster",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},{
"type": "text",
"key": "MUSTER_REST_URL",
"label": "Muster Resl URL"
},{
"type": "dict-modifiable",
"object_type": {
"type": "number",
"minimum": 0,
"maximum": 300
},
"is_group": true,
"key": "templates_mapping",
"label": "Templates mapping",
"is_file": true
}]
}, {
"type": "dict",
"key": "Logging",
"label": "Logging",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
"type": "dict",
"key": "Muster",
"label": "Muster",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
}, {
"type": "text",
"key": "MUSTER_REST_URL",
"label": "Muster Resl URL"
}, {
"type": "dict-modifiable",
"object_type": {
"type": "number",
"minimum": 0,
"maximum": 300
},
"is_group": true,
"key": "templates_mapping",
"label": "Templates mapping",
"is_file": true
}]
}, {
"type": "dict",
"key": "Adobe Communicator",
"label": "Adobe Communicator",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
"type": "dict",
"key": "Logging",
"label": "Logging",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
}]
}, {
"type": "dict",
"key": "User setting",
"label": "User setting",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
"type": "dict",
"key": "Adobe Communicator",
"label": "Adobe Communicator",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
}]
}, {
"type": "dict",
"key": "Standalone Publish",
"label": "Standalone Publish",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
"type": "dict",
"key": "User setting",
"label": "User setting",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
}]
}, {
"type": "dict",
"key": "Idle Manager",
"label": "Idle Manager",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
"type": "dict",
"key": "Standalone Publish",
"label": "Standalone Publish",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
}]
}
]
}, {
"type": "dict",
"key": "Idle Manager",
"label": "Idle Manager",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
}]
}]
}