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

Fix validation of campaign configs #143

Merged
merged 2 commits into from
Oct 7, 2021
Merged

Fix validation of campaign configs #143

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bc7af5
Fix validation of campaign configs
xylar Oct 6, 2021
245b735
Add testing and documentation
forsyth2 Oct 7, 2021
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
16 changes: 9 additions & 7 deletions zppy/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,23 @@ def main():
# Read configuration file and validate it
default_config = os.path.join(templateDir, "default.ini")
user_config = ConfigObj(args.config, configspec=default_config)
_validate_config(user_config)
campaign = user_config["default"]["campaign"]
if "campaign" in user_config["default"]:
campaign = user_config["default"]["campaign"]
else:
campaign = "none"
if campaign != "none":
campaign_file = os.path.join(templateDir, "{}.cfg".format(campaign))
if not os.path.exists(campaign_file):
raise ValueError(
"{} does not appear to be a known campaign".format(campaign)
)
config = ConfigObj(campaign_file, configspec=default_config)
_validate_config(config)
# merge such that user_config takes priority
config.merge(user_config)
campaign_config = ConfigObj(campaign_file, configspec=default_config)
# merge such that user_config takes priority over campaign_config
campaign_config.merge(user_config)
config = campaign_config
else:
# no need to merge
config = user_config
_validate_config(config)

# Add templateDir to config
config["default"]["templateDir"] = templateDir
Expand Down