From 8d8db58f73512c91cab4788dcc1257198ef7c0d2 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Sat, 22 Feb 2020 17:25:46 -0600 Subject: [PATCH] Now you can add scripts from puzzle.py --- devel/moth.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/devel/moth.py b/devel/moth.py index 95c2c5a..0c8af68 100644 --- a/devel/moth.py +++ b/devel/moth.py @@ -260,15 +260,12 @@ class Puzzle: elif key == 'script': stream = open(val, 'rb') - # Make sure this shows up in the header block of the HTML output. - self.files[val] = PuzzleFile(stream, val, visible=False) - self.scripts.append(val) + self.add_script_stream(stream, 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) + self.add_script_stream(stream, val) elif key == "objective": self.objective = val @@ -322,6 +319,11 @@ class Puzzle: self.add_stream(stream, name, visible) return stream + def add_script_stream(self, stream, name): + # Make sure this shows up in the header block of the HTML output. + self.files[name] = PuzzleFile(stream, name, visible=False) + self.scripts.append(name) + def add_stream(self, stream, name=None, visible=True): if name is None: name = self.random_hash()