Skip to content

remove spaces from user's options names to avoid crashes #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 16, 2024
Merged

remove spaces from user's options names to avoid crashes #116

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
729ded1
remove spaces from user's options names to avoid crashes
nicopop Dec 13, 2024
74cb9c9
convert option_name format to function
nicopop Dec 14, 2024
0341863
keep a copy of option_name as display_name
nicopop Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ def is_category_enabled(multiworld: MultiWorld, player: int, category_name: str)
def resolve_yaml_option(multiworld: MultiWorld, player: int, data: dict) -> bool:
if "yaml_option" in data:
for option_name in data["yaml_option"]:
option_name = option_name.strip().replace(" ", "_")
required = True
if option_name.startswith("!"):
option_name = option_name[1:]
Expand Down
4 changes: 4 additions & 0 deletions src/Options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ def addOptionToGroup(option_name: str, group: str):
######################

for option_name, option in option_table.get('core', {}).items():
option_name = option_name.strip().replace(" ", "_")
if option_name.startswith('_'): #To allow commenting out options
continue

Expand Down Expand Up @@ -144,6 +145,7 @@ def addOptionToGroup(option_name: str, group: str):

supported_option_types = ["Toggle", "Choice", "Range"]
for option_name, option in option_table.get('user', {}).items():
option_name = option_name.strip().replace(" ", "_")
if option_name.startswith('_'): #To allow commenting out options
continue

Expand Down Expand Up @@ -197,6 +199,7 @@ def addOptionToGroup(option_name: str, group: str):

for category in category_table:
for option_name in category_table[category].get("yaml_option", []):
option_name = option_name.strip().replace(" ", "_")
if option_name[0] == "!":
option_name = option_name[1:]
if option_name not in manual_options:
Expand All @@ -207,6 +210,7 @@ def addOptionToGroup(option_name: str, group: str):
for starting_items in starting_items:
if starting_items.get("yaml_option"):
for option_name in starting_items["yaml_option"]:
option_name = option_name.strip().replace(" ", "_")
if option_name[0] == "!":
option_name = option_name[1:]
if option_name not in manual_options:
Expand Down