some changes to package puzzles, still gluing

This commit is contained in:
slackish 2016-10-18 15:43:14 -06:00
parent 36c93973cc
commit 4ba361e276
1 changed files with 29 additions and 23 deletions

View File

@ -10,6 +10,7 @@ import json
import os import os
import markdown import markdown
import random import random
import sys
import zipfile import zipfile
import puzzles import puzzles
@ -32,25 +33,23 @@ def write_kv_pairs(ziphandle, filename, kv):
ziphandle.writestr(filename, filehandle.read()) ziphandle.writestr(filename, filehandle.read())
if __name__ == '__main__': if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Build a puzzle category') parser = argparse.ArgumentParser(description='Build a category package')
parser.add_argument('seed', help='contest seed') parser.add_argument('seed', help='contest seed')
parser.add_argument('puzzledir', nargs='+', help='Directory of puzzle source') parser.add_argument('categorydirs', nargs='+', help='Directory of category source')
parser.add_argument('outdir', help='Output directory') parser.add_argument('outdir', help='Output directory')
args = parser.parse_args() args = parser.parse_args()
for categorydir in args.categorydirs:
for puzzledir in args.puzzledir: puzzles_dict = {}
puzzles = {}
secrets = {} secrets = {}
categoryname = os.path.basename(categorydir.strip(os.sep))
categoryname = os.path.basename(puzzledir.strip(os.sep)) # build category seed
category_seed = hashlib.new('sha1')
# build puzzle seed category_seed.update(categoryname.encode('utf-8'))
puzzle_seed = hashlib.new('sha1') category_seed.update(args.seed.encode('utf-8'))
puzzle_seed.update(categoryname.encode('utf-8')) category_seed = category_seed.hexdigest()
puzzle_seed.update(args.seed.encode('utf-8'))
puzzle_seed = puzzle_seed.hexdigest()
# create zipfile # create zipfile
zipfilename = os.path.join(args.outdir, "%s.zip" % categoryname) zipfilename = os.path.join(args.outdir, "%s.zip" % categoryname)
@ -63,20 +62,24 @@ if __name__ == '__main__':
# create and read in state # create and read in state
zf = zipfile.ZipFile(zipfilename, 'w') zf = zipfile.ZipFile(zipfilename, 'w')
# read in puzzle details (will be pflarr in future) # read in category details (will be pflarr in future)
for puzzlePath in glob.glob(os.path.join(puzzledir, "*.moth")): for categorypath in glob.glob(os.path.join(categorydir, "*", "puzzle.moth")):
filename = os.path.basename(puzzlePath) points = categorypath.split(os.sep)[-2] # directory before '/puzzle.moth'
points, ext = os.path.splitext(filename) categorypath = os.path.dirname(categorypath)
points = int(points) try:
puzzle = puzzles.Puzzle(open(puzzlePath)) points = int(points)
puzzles[points] = puzzle except:
print("Failed to identify points on: %s" % categorypath, file=sys.stderr)
continue
puzzle = puzzles.Puzzle(open(categorypath), category_seed)
puzzles_dict[points] = puzzle
# build mapping, answers, and summary # build mapping, answers, and summary
mapping = {} mapping = {}
answers = {} answers = {}
summary = {} summary = {}
for points in sorted(puzzles): for points in sorted(puzzles_dict):
puzzle = puzzles[points] puzzle = puzzles_dict[points]
hashmap = hashlib.sha1(args.seed.encode('utf-8')) hashmap = hashlib.sha1(args.seed.encode('utf-8'))
hashmap.update(categoryname.encode('utf-8')) hashmap.update(categoryname.encode('utf-8'))
hashmap.update(str(points).encode('utf-8')) hashmap.update(str(points).encode('utf-8'))
@ -90,13 +93,16 @@ if __name__ == '__main__':
write_kv_pairs(zf, os.path.join(categoryname, 'summary.txt'), summary) write_kv_pairs(zf, os.path.join(categoryname, 'summary.txt'), summary)
# write out puzzles # write out puzzles
for points in sorted(puzzles): for points in sorted(puzzles_dict):
puzzle = puzzles[points] puzzle = puzzles_dict[points]
puzzledir = os.path.join(categoryname, 'content', mapping[points]) puzzledir = os.path.join(categoryname, 'content', mapping[points])
# build/write json # build/write json
ziphandle.writestr(filename, filehandle.read()) ziphandle.writestr(filename, filehandle.read())
zf.writestr(os.path.join(puzzledir, 'puzzle.json'), \ zf.writestr(os.path.join(puzzledir, 'puzzle.json'), \
json.dumps(puzzle.publish())) json.dumps(puzzle.publish()))
# write associated files # write associated files
for fobj in puzzle['files']:
zf.writestr(os.path.join(puzzledir, fobj.name), \
fobj.handle.read())
#vim:py #vim:py