Skip to content
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

Options: Add an OptionError to specify bad options caused the failure #2343

Merged
merged 4 commits into from
May 2, 2024
Merged

Options: Add an OptionError to specify bad options caused the failure #2343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ea88b3
Options: Add an OptionError to specify bad options caused the failure
alwaysintreble Oct 22, 2023
aba5922
Merge branch 'main' into option_error
alwaysintreble Mar 14, 2024
bdf1457
inherit from ValueError instead of RuntimeError since this error shou…
alwaysintreble Mar 14, 2024
dc1bd62
Merge branch 'main' into option_error
NewSoupVi May 2, 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
4 changes: 2 additions & 2 deletions Generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ def roll_meta_option(option_key, game: str, category_dict: Dict) -> Any:
if options[option_key].supports_weighting:
return get_choice(option_key, category_dict)
return category_dict[option_key]
raise Exception(f"Error generating meta option {option_key} for {game}.")
raise Options.OptionError(f"Error generating meta option {option_key} for {game}.")


def roll_linked_options(weights: dict) -> dict:
Expand Down Expand Up @@ -417,7 +417,7 @@ def handle_option(ret: argparse.Namespace, game_weights: dict, option_key: str,
player_option = option.from_any(get_choice(option_key, game_weights))
setattr(ret, option_key, player_option)
except Exception as e:
raise Exception(f"Error generating option {option_key} in {ret.game}") from e
raise Options.OptionError(f"Error generating option {option_key} in {ret.game}") from e
else:
player_option.verify(AutoWorldRegister.world_types[ret.game], ret.name, plando_options)
else:
Expand Down
4 changes: 4 additions & 0 deletions Options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
import pathlib


class OptionError(ValueError):
pass


class Visibility(enum.IntFlag):
none = 0b0000
template = 0b0001
Expand Down
Loading