Skip to content

Commit 786af01

Browse files
committed
merge same logic into one loop
1 parent 61f5ce8 commit 786af01

File tree

1 file changed

+11
-25
lines changed

1 file changed

+11
-25
lines changed

ayon_api/server_api.py

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9024,45 +9024,31 @@ def _prepare_fields(
90249024
fields.remove("bundle")
90259025
fields.add("data")
90269026

9027+
maj_v, min_v, patch_v, _, _ = self.server_version_tuple
90279028
if "folderTypes" in fields:
90289029
fields.remove("folderTypes")
90299030
folder_types_fields = set(DEFAULT_FOLDER_TYPE_FIELDS)
9030-
maj_v, min_v, patch_v, _, _ = self.server_version_tuple
90319031
if (maj_v, min_v, patch_v) > (1, 10, 0):
90329032
folder_types_fields |= {"shortName"}
90339033
fields |= {f"folderTypes.{name}" for name in folder_types_fields}
90349034

90359035
if "taskTypes" in fields:
90369036
fields.remove("taskTypes")
90379037
task_types_fields = set(DEFAULT_TASK_TYPE_FIELDS)
9038-
maj_v, min_v, patch_v, _, _ = self.server_version_tuple
90399038
if (maj_v, min_v, patch_v) > (1, 10, 0):
90409039
task_types_fields |= {"color", "icon", "shortName"}
90419040
fields |= {f"taskTypes.{name}" for name in task_types_fields}
90429041

9043-
if "statuses" in fields:
9044-
fields.remove("statuses")
9045-
statuses_fields = set()
9046-
maj_v, min_v, patch_v, _, _ = self.server_version_tuple
9047-
if (maj_v, min_v, patch_v) > (1, 10, 0):
9048-
statuses_fields = set(DEFAULT_PROJECT_STATUSES_FIELDS)
9049-
fields |= {f"statuses.{name}" for name in statuses_fields}
9050-
9051-
if "tags" in fields:
9052-
fields.remove("tags")
9053-
tags_fields = set()
9054-
maj_v, min_v, patch_v, _, _ = self.server_version_tuple
9055-
if (maj_v, min_v, patch_v) > (1, 10, 0):
9056-
tags_fields = set(DEFAULT_PROJECT_TAGS_FIELDS)
9057-
fields |= {f"tags.{name}" for name in tags_fields}
9058-
9059-
if "linkTypes" in fields:
9060-
fields.remove("linkTypes")
9061-
link_types_fields = set()
9062-
maj_v, min_v, patch_v, _, _ = self.server_version_tuple
9063-
if (maj_v, min_v, patch_v) > (1, 10, 0):
9064-
link_types_fields = set(DEFAULT_PROJECT_LINK_TYPES_FIELDS)
9065-
fields |= {f"linkTypes.{name}" for name in link_types_fields}
9042+
for field, default_fields in (
9043+
("statuses", DEFAULT_PROJECT_STATUSES_FIELDS),
9044+
("tags", DEFAULT_PROJECT_TAGS_FIELDS),
9045+
("linkTypes", DEFAULT_PROJECT_TAGS_FIELDS),
9046+
):
9047+
if (maj_v, min_v, patch_v) <= (1, 10, 0):
9048+
break
9049+
if field in fields:
9050+
fields.remove(field)
9051+
fields |= {f"{field}.{name}" for name in default_fields}
90669052

90679053
if "productTypes" in fields:
90689054
fields.remove("productTypes")

0 commit comments

Comments
 (0)