lordwelch/settngs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deduplication

Browse Source
This commit is contained in:
Timmy Welch 2024-05-18 16:46:44 -07:00
parent 43f6bf1eac
commit 58daa4b274
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
settngs/__init__.py
View File

@ -322,6 +322,7 @@ def generate_ns(definitions: Definitions) -> tuple[str, str]:
imports = set() imports = set()
attributes = [] attributes = []
used_attributes: set[str] = set()
for group in definitions.values(): for group in definitions.values():
for setting in group.v.values(): for setting in group.v.values():
t, noneable = setting._guess_type() t, noneable = setting._guess_type()
@ -353,7 +354,8 @@ def generate_ns(definitions: Definitions) -> tuple[str, str]:
attribute = f' {setting.internal_name}: {type_name} | None' attribute = f' {setting.internal_name}: {type_name} | None'
else: else:
attribute = f' {setting.internal_name}: {type_name}' attribute = f' {setting.internal_name}: {type_name}'
if attribute not in attributes: if setting.internal_name not in used_attributes:
used_attributes.add(setting.internal_name)
attributes.append(attribute) attributes.append(attribute)
# Add a blank line between groups # Add a blank line between groups
if attributes and attributes[-1] != '': if attributes and attributes[-1] != '':
@ -385,6 +387,7 @@ def generate_dict(definitions: Definitions) -> tuple[str, str]:
classes = [] classes = []
for group_name, group in definitions.items(): for group_name, group in definitions.items():
attributes = [] attributes = []
used_attributes: set[str] = set()
for setting in group.v.values(): for setting in group.v.values():
t, no_default = setting._guess_type() t, no_default = setting._guess_type()
if t is None: if t is None:
@ -415,7 +418,8 @@ def generate_dict(definitions: Definitions) -> tuple[str, str]:
attribute = f' {setting.dest}: {type_name} | None' attribute = f' {setting.dest}: {type_name} | None'
else: else:
attribute = f' {setting.dest}: {type_name}' attribute = f' {setting.dest}: {type_name}'
if attribute not in attributes: if setting.dest not in used_attributes:
used_attributes.add(setting.dest)
attributes.append(attribute) attributes.append(attribute)
if not attributes or all(x == '' for x in attributes): if not attributes or all(x == '' for x in attributes):
attributes = [' ...'] attributes = [' ...']