From e675d8e79a361525f1dc178d392f4525ef1d7268 Mon Sep 17 00:00:00 2001 From: John Donaldson Date: Fri, 13 Jul 2018 15:35:35 -0700 Subject: [PATCH 1/2] Fix issue with mothballer compiling --- tools/mothballer.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tools/mothballer.py b/tools/mothballer.py index 76832a5..894fc94 100755 --- a/tools/mothballer.py +++ b/tools/mothballer.py @@ -2,7 +2,6 @@ import argparse import binascii -import glob import hashlib import io import json @@ -10,11 +9,12 @@ import logging import moth import os import shutil -import string -import sys import tempfile import zipfile +SEEDFN = "SEED" + + def write_kv_pairs(ziphandle, filename, kv): """ Write out a sorted map to file :param ziphandle: a zipfile object @@ -24,17 +24,19 @@ def write_kv_pairs(ziphandle, filename, kv): """ filehandle = io.StringIO() for key in sorted(kv.keys()): - if type(kv[key]) == type([]): + if isinstance(kv[key], type([])): for val in kv[key]: filehandle.write("%s %s\n" % (key, val)) else: filehandle.write("%s %s\n" % (key, kv[key])) filehandle.seek(0) ziphandle.writestr(filename, filehandle.read()) - + + def escape(s): return s.replace('&', '&').replace('<', '<').replace('>', '>') - + + def generate_html(ziphandle, puzzle, puzzledir, category, points, authors, files): html_content = io.StringIO() file_content = io.StringIO() @@ -51,7 +53,7 @@ def generate_html(ziphandle, puzzle, puzzledir, category, points, authors, files ''') scripts = [''.format(s) for s in puzzle.scripts] - + html_content.write( ''' @@ -84,14 +86,13 @@ def generate_html(ziphandle, puzzle, puzzledir, category, points, authors, files file_content=file_content.getvalue(), authors=', '.join(authors), scripts='\n'.join(scripts), - ) + ) ) ziphandle.writestr(os.path.join(puzzledir, 'index.html'), html_content.getvalue()) + def build_category(categorydir, outdir): category_seed = binascii.b2a_hex(os.urandom(20)) - puzzles_dict = {} - secrets = {} categoryname = os.path.basename(categorydir.strip(os.sep)) zipfilename = os.path.join(outdir, "%s.zip" % categoryname) @@ -101,14 +102,14 @@ def build_category(categorydir, outdir): # open and gather some state existing = zipfile.ZipFile(zipfilename, 'r') try: - category_seed = existing.open(seedfn).read().strip() - except: + category_seed = existing.open(SEEDFN).read().strip() + except Exception: pass existing.close() logging.debug("Using PRNG seed {}".format(category_seed)) zipfileraw = tempfile.NamedTemporaryFile(delete=False) - mothball = package(categoryname, categorydir, zfraw) + mothball = package(categoryname, categorydir, category_seed) shutil.copyfileobj(mothball, zipfileraw) zipfileraw.close() shutil.move(zipfileraw.name, zipfilename) @@ -127,10 +128,10 @@ def package(categoryname, categorydir, seed): for puzzle in cat: logging.info("Processing point value {}".format(puzzle.points)) - hashmap = hashlib.sha1(seed.encode('utf-8')) + hashmap = hashlib.sha1(seed) hashmap.update(str(puzzle.points).encode('utf-8')) puzzlehash = hashmap.hexdigest() - + mapping[puzzle.points] = puzzlehash answers[puzzle.points] = puzzle.answers summary[puzzle.points] = puzzle.summary @@ -161,8 +162,8 @@ def package(categoryname, categorydir, seed): zf.close() zfraw.seek(0) return zfraw - - + + if __name__ == '__main__': parser = argparse.ArgumentParser(description='Build a category package') parser.add_argument('outdir', help='Output directory') @@ -173,4 +174,3 @@ if __name__ == '__main__': for categorydir in args.categorydirs: build_category(categorydir, args.outdir) - From 5aa2eb787cc04816350e7bd72622ef70bd7431e1 Mon Sep 17 00:00:00 2001 From: John Donaldson Date: Fri, 13 Jul 2018 15:51:49 -0700 Subject: [PATCH 2/2] Doing better isinstanceof check --- tools/mothballer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mothballer.py b/tools/mothballer.py index 894fc94..5b368ab 100755 --- a/tools/mothballer.py +++ b/tools/mothballer.py @@ -24,7 +24,7 @@ def write_kv_pairs(ziphandle, filename, kv): """ filehandle = io.StringIO() for key in sorted(kv.keys()): - if isinstance(kv[key], type([])): + if isinstance(kv[key], list): for val in kv[key]: filehandle.write("%s %s\n" % (key, val)) else: