handel long lines

This commit is contained in:
Michael reda 2023-05-02 11:12:18 +02:00
parent 122a4dc9db
commit 84cef9d3cf
2 changed files with 40 additions and 27 deletions

View file

@ -124,10 +124,23 @@ def push_to_zou(login, password):
@cli_main.command()
@click.option("-prjs", "--projects", envvar="SYNC_PROJECTS", help="Sync specific kitsu projects")
@click.option("-l", "--login", envvar="KITSU_LOGIN", help="Kitsu login")
@click.option(
"-p", "--password", envvar="KITSU_PWD", help="Password for kitsu username"
"-prjs",
"--projects",
envvar="SYNC_PROJECTS",
help="Sync specific kitsu projects"
)
@click.option(
"-l",
"--login",
envvar="KITSU_LOGIN",
help="Kitsu login"
)
@click.option(
"-p",
"--password",
envvar="KITSU_PWD",
help="Password for kitsu username"
)
def sync_service(login, password, projects="^"):
"""Synchronize openpype database from Zou sever database.

View file

@ -63,11 +63,11 @@ def set_op_project(dbcon: AvalonMongoDB, project_id: str):
def update_op_assets(
dbcon: AvalonMongoDB,
gazu_project: dict,
project_doc: dict,
entities_list: List[dict],
asset_doc_ids: Dict[str, dict],
dbcon: AvalonMongoDB,
gazu_project: dict,
project_doc: dict,
entities_list: List[dict],
asset_doc_ids: Dict[str, dict],
) -> List[Dict[str, dict]]:
"""Update OpenPype assets.
Set 'data' and 'parent' fields.
@ -210,10 +210,10 @@ def update_op_assets(
item.get("entity_type_id")
if item_type == "Asset"
else None
# Else, fallback on usual hierarchy
or item.get("parent_id")
or item.get("episode_id")
or item.get("source_id")
# Else, fallback on usual hierarchy
or item.get("parent_id")
or item.get("episode_id")
or item.get("source_id")
)
# Substitute item type for general classification (assets or shots)
@ -350,7 +350,7 @@ def write_project_to_op(project: dict, dbcon: AvalonMongoDB) -> UpdateOne:
"config.tasks": {
t["name"]: {"short_name": t.get("short_name", t["name"])}
for t in gazu.task.all_task_types_for_project(project)
or gazu.task.all_task_types()
or gazu.task.all_task_types()
},
"data": project_data,
}
@ -359,7 +359,8 @@ def write_project_to_op(project: dict, dbcon: AvalonMongoDB) -> UpdateOne:
def sync_all_projects(
login: str, password: str, ignore_projects: list = None, specific_projects: list = None
login: str, password: str, ignore_projects: list = None,
specific_projects: list = None
):
"""Update all OP projects in DB with Zou data.
@ -383,7 +384,6 @@ def sync_all_projects(
dbcon.install()
all_projects = gazu.project.all_projects()
project_to_sync = []
if specific_projects == ['*']:
project_to_sync = all_projects
@ -435,8 +435,8 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
# Do not sync closed kitsu project that is not found in openpype
if (
project['project_status_name'] == "Closed"
and not get_project(project['name'])
project['project_status_name'] == "Closed"
and not get_project(project['name'])
):
return
@ -451,10 +451,10 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
all_entities = [
item
for item in all_assets
+ all_asset_types
+ all_episodes
+ all_seqs
+ all_shots
+ all_asset_types
+ all_episodes
+ all_seqs
+ all_shots
if naming_pattern.match(item["name"])
]
@ -526,12 +526,12 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
[
UpdateOne({"_id": id}, update)
for id, update in update_op_assets(
dbcon,
project,
project_dict,
all_entities,
zou_ids_and_asset_docs,
)
dbcon,
project,
project_dict,
all_entities,
zou_ids_and_asset_docs,
)
]
)