Merge pull request #127 from dirtbags/fix_yaml_files

Fixed handling of multiple files and scripts in YAML-formatted puzzles
This commit is contained in:
int00h5525 2020-01-29 18:04:43 -06:00 committed by GitHub
commit 77ba3e0415
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 0 deletions

View File

@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ### Added
- URL parameter to points.json to allow returning only the JSON for a single - URL parameter to points.json to allow returning only the JSON for a single
team by its team id (e.g., points.json?id=abc123). team by its team id (e.g., points.json?id=abc123).
### Fixed
- Handle YAML-formatted file and script lists as expected
- YAML-formatted example puzzle actually works as expected
## [3.4.3] - 2019-11-20 ## [3.4.3] - 2019-11-20
### Fixed ### Fixed

View File

@ -233,11 +233,39 @@ class Puzzle:
except IndexError: except IndexError:
pass pass
self.files[name] = PuzzleFile(stream, name, not hidden) self.files[name] = PuzzleFile(stream, name, not hidden)
elif key == 'files' and isinstance(val, dict):
for filename, options in val.items():
if "source" in options:
source = options["source"]
else:
source = filename
if "hidden" in options and options["hidden"]:
hidden = True
else:
hidden = False
stream = open(source, "rb")
self.files[filename] = PuzzleFile(stream, filename, not hidden)
elif key == 'files' and isinstance(val, list):
for filename in val:
stream = open(filename, "rb")
self.files[filename] = PuzzleFile(stream, filename)
elif key == 'script': elif key == 'script':
stream = open(val, 'rb') stream = open(val, 'rb')
# Make sure this shows up in the header block of the HTML output. # Make sure this shows up in the header block of the HTML output.
self.files[val] = PuzzleFile(stream, val, visible=False) self.files[val] = PuzzleFile(stream, val, visible=False)
self.scripts.append(val) self.scripts.append(val)
elif key == "scripts" and isinstance(val, list):
for script in val:
stream = open(script, "rb")
self.files[script] = PuzzleFile(stream, script, visible=False)
self.scripts.append(script)
elif key == "objective": elif key == "objective":
self.objective = val self.objective = val
elif key == "success": elif key == "success":