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

Apply suggestions from code review

Browse source 
Co-authored-by: Robin De Lillo <robin@ynput.io>
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
This commit is contained in:
Jakub Ježek 2025-05-08 17:27:52 +02:00 • committed by GitHub
parent bc911f4dbc
commit 93b59710b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/ayon_core/plugins/publish/collect_explicit_resolution.py
View file

@ -50,21 +50,21 @@ class CollectExplicitResolution(
dict: dictionary with width, height and pixel_aspect
"""
resolution_items = self._get_resolution_items()
item_values = None
# check if resolution_value is in cached items
if resolution_value in resolution_items:
item_values = resolution_items[resolution_value]
# ensure resolution_value is part of expected items
item_values = resolution_items.get(resolution_value)
# if the item is in the cache, get the values from it
if item_values:
# if the item is in the cache, get the values from it
return {
"resolutionWidth": item_values["width"],
"resolutionHeight": item_values["height"],
"pixelAspect": item_values["pixel_aspect"],
}
else:
raise PublishError(
f"Invalid resolution value: {resolution_value}")
raise PublishError(
f"Invalid resolution value: {resolution_value} "
f"expected choices: {resolution_items}"
)
@classmethod
def _get_resolution_items(cls):
@ -72,7 +72,7 @@ class CollectExplicitResolution(
resolution_items = {}
for item in cls.options:
item_text = (
f"{item['width']}x{item['height']}x{item['pixel_aspect']}")
f"{item['width']}x{item['height']} ({item['pixel_aspect']})")
resolution_items[item_text] = item
cls.resolution_items = resolution_items

16
server/settings/publish_plugins.py
View file

@ -191,21 +191,21 @@ class ResolutionOptionsModel(BaseSettingsModel):
def ensure_unique_resolution_option(
objects: Iterable[Any], field_name: str | None = None) -> None: # noqa: C901
objects: list[Any], field_name: str | None = None) -> None: # noqa: C901
"""Ensure a list of objects have unique option attributes.
This function checks if the list of objects has unique 'width',
'height' and 'pixel_aspect' properties.
"""
options = []
options = set()
for obj in objects:
item_test_text = f"{obj.width}x{obj.height}x{obj.pixel_aspect}"
if item_test_text not in options:
options.append(item_test_text)
else:
if item_test_text in options:
raise BadRequestException(
f"Duplicate option '{item_test_text}'")
options.add(item_test_text)
class CollectExplicitResolutionModel(BaseSettingsModel):
enabled: bool = SettingsField(True, title="Enabled")
@ -218,14 +218,14 @@ class CollectExplicitResolutionModel(BaseSettingsModel):
)
options: list[ResolutionOptionsModel] = SettingsField(
default_factory=list,
title="Resolution options",
title="Resolution choices",
description=(
"Options to be provided in publisher attribute"
"Available resolution choices to be displayed in the publishers attribute."
)
)
@validator("options")
def validate_unique_options(cls, value):
def validate_unique_resolution_options(cls, value):
ensure_unique_resolution_option(value)
return value