Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 13:24:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add sync server to settings

Browse source
This commit is contained in:
Milan Kolar 2020-12-04 12:11:31 +01:00 • committed by Petr Kalis
parent 4af38b1318
commit ecf220156e
8 changed files with 179 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pype/modules/sync_server/providers/gdrive.py
View file

@ -6,7 +6,7 @@ from googleapiclient import errors
from .abstract_provider import AbstractProvider
from googleapiclient.http import MediaFileUpload, MediaIoBaseDownload
from pype.api import Logger
from pype.api import config
from pype.api import get_system_settings
from ..utils import time_function
SCOPES = ['https://www.googleapis.com/auth/drive.metadata.readonly',
@ -597,7 +597,12 @@ class GDriveHandler(AbstractProvider):
"""
provider_presets = None
try:
provider_presets = config.get_presets()["sync_server"]["gdrive"]
provider_presets = (
get_system_settings()["modules"]
["sync_server"]
["providers"]
["gdrive"]
)
except KeyError:
log.info(("Sync Server: There are no presets for Gdrive " +
"provider.").

4
pype/modules/sync_server/sync_server.py
View file

@ -1,4 +1,4 @@
from pype.api import config, Logger
from pype.api import get_system_settings, Logger
import threading
import asyncio
@ -92,7 +92,7 @@ class SyncServer():
self.connection = AvalonMongoDB()
try:
self.presets = config.get_presets()["sync_server"]["config"]
self.presets = get_system_settings()["sync_server"]["config"]
self.sync_server_thread = SyncServerThread(self)

13
pype/settings/defaults/project_settings/global.json
View file

@ -178,5 +178,18 @@
"editorial[ftrack.Folder]": {}
}
}
},
"sync_server": {
"enabled": false,
"config": {
"local_id": "",
"retry_cnt": "",
"loop_delay": "",
"active_site": "",
"remote_site": ""
},
"providers": {
"gdrive": {}
}
}
}

15
pype/settings/defaults/system_settings/modules.json
View file

@ -146,6 +146,21 @@
"enabled": false,
"workspace_name": "studio name"
},
"sync_server": {
"enabled": false,
"config": {
"local_id": "local_0",
"retry_cnt": "3",
"loop_delay": "60",
"active_site": "studio",
"remote_site": "gdrive"
},
"providers": {
"gdrive": {
"credentials_url": ""
}
}
},
"deadline": {
"enabled": true,
"DEADLINE_REST_URL": "http://localhost:8082"

134
pype/tools/settings/settings/gui_schemas/projects_schema/schema_main.json
View file

@ -2,73 +2,71 @@
"key": "project",
"type": "dict",
"children": [
{
"type": "anatomy",
"key": "project_anatomy",
"children": [
{
"type": "anatomy",
"key": "project_anatomy",
"children": [
{
"type": "anatomy_roots",
"key": "roots",
"is_file": true
},
{
"type": "schema",
"name": "schema_anatomy_templates"
},
{
"type": "schema",
"name": "schema_anatomy_attributes"
},
{
"type": "schema",
"name": "schema_anatomy_imageio"
}
]
}, {
"type": "dict",
"key": "project_settings",
"children": [
{
"type": "schema",
"name": "schema_project_global"
},
{
"type": "schema",
"name": "schema_project_ftrack"
},
{
"type": "schema",
"name": "schema_project_maya"
},
{
"type": "schema",
"name": "schema_project_nuke"
},
{
"type": "schema",
"name": "schema_project_hiero"
},
{
"type": "schema",
"name": "schema_project_harmony"
},
{
"type": "schema",
"name": "schema_project_celaction"
},
{
"type": "schema",
"name": "schema_project_resolve"
},
{
"type": "schema",
"name": "schema_project_standalonepublisher"
},
{
"type": "schema",
"name": "schema_project_unreal"
}
]
}
]
"type": "anatomy_roots",
"key": "roots",
"is_file": true
},
{
"type": "schema",
"name": "schema_anatomy_templates"
},
{
"type": "schema",
"name": "schema_anatomy_attributes"
},
{
"type": "schema",
"name": "schema_anatomy_imageio"
}]
},
{
"type": "dict",
"key": "project_settings",
"children": [
{
"type": "schema",
"name": "schema_project_global"
},
{
"type": "schema",
"name": "schema_project_ftrack"
},
{
"type": "schema",
"name": "schema_project_maya"
},
{
"type": "schema",
"name": "schema_project_nuke"
},
{
"type": "schema",
"name": "schema_project_hiero"
},
{
"type": "schema",
"name": "schema_project_harmony"
},
{
"type": "schema",
"name": "schema_project_celaction"
},
{
"type": "schema",
"name": "schema_project_resolve"
},
{
"type": "schema",
"name": "schema_project_standalonepublisher"
},
{
"type": "schema",
"name": "schema_project_unreal"
}]
}]
}

5
pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_global.json
View file

@ -23,6 +23,11 @@
"key": "project_folder_structure",
"label": ""
}]
},
{
"type": "schema",
"name": "schema_project_syncserver"
}
]
}

60
pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_syncserver.json Normal file
View file

@ -0,0 +1,60 @@
{
"type": "dict",
"key": "sync_server",
"label": "Sync Server (currently unused)",
"collapsable": true,
"checkbox_key": "enabled",
"is_file": true,
"children": [
{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "dict",
"key": "config",
"label": "Config",
"collapsable": true,
"children": [
{
"type": "text",
"key": "local_id",
"label": "Local ID"
},
{
"type": "text",
"key": "retry_cnt",
"label": "Retry Count"
},
{
"type": "text",
"key": "loop_delay",
"label": "Loop Delay"
},
{
"type": "text",
"key": "active_site",
"label": "Active Site"
},
{
"type": "text",
"key": "remote_site",
"label": "Remote Site"
}
]
}, {
"type": "dict",
"key": "providers",
"label": "Providers",
"collapsable": true,
"checkbox_key": "enabled",
"children": [
{
"type": "raw-json",
"key": "gdrive",
"label": "Gdrive Provider"
}]
}]
}

11
pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json
View file

@ -99,6 +99,17 @@
}
]
}, {
"type": "dict",
"key": "sync_server",
"label": "Sync Server",
"collapsable": true,
"checkbox_key": "enabled",
"children": [{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
}]
}, {
"type": "dict",
"key": "deadline",
"label": "Deadline",