bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Campbell Barton 2024-07-01 15:59:29 +10:00
commit 29cf0e4f8c
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/addons_core/bl_pkg/cli/blender_ext.py
View File

@ -1416,6 +1416,32 @@ def pkg_manifest_validate_field_tagline(value: str, strict: bool) -> Optional[st
return None
def pkg_manifest_validate_field_copyright(
value: List[str],
strict: bool,
) -> Optional[str]:
if strict:
for i, copyrignt_text in enumerate(value):
if not isinstance(copyrignt_text, str):
return "at index {:d} must be a string not a {:s}".format(i, str(type(copyrignt_text)))
year, name = copyrignt_text.partition(" ")[0::2]
year_valid = False
if (year_split := year.partition("-"))[1]:
if year_split[0].isdigit() and year_split[2].isdigit():
year_valid = True
else:
if year.isdigit():
year_valid = True
if not year_valid:
return "at index {:d} must be a number or two numbers separated by \"-\"".format(i)
if not name.strip():
return "at index {:d} name may not be empty".format(i)
else:
return pkg_manifest_validate_field_any_list_of_non_empty_strings(value, strict)
def pkg_manifest_validate_field_permissions(
value: Union[
# `Dict[str, str]` is expected but at this point it's only guaranteed to be a dict.
@ -1589,7 +1615,7 @@ pkg_manifest_known_keys_and_types: Tuple[
# Optional.
("blender_version_max", str, pkg_manifest_validate_field_any_version_primitive_or_empty),
("website", str, pkg_manifest_validate_field_any_non_empty_string_stripped_no_control_chars),
("copyright", list, pkg_manifest_validate_field_any_non_empty_list_of_non_empty_strings),
("copyright", list, pkg_manifest_validate_field_copyright),
# Type should be `dict` eventually, some existing packages will have a list of strings instead.
("permissions", (dict, list), pkg_manifest_validate_field_permissions),
("tags", list, pkg_manifest_validate_field_any_non_empty_list_of_non_empty_strings),

2
scripts/addons_core/bl_pkg/example_extension/blender_manifest.toml
View File

@ -13,7 +13,7 @@ license = [
"SPDX:CC-0",
]
copyright = [
"Developer Name",
"2020-2024 Developer Name",
]
[permissions]