WEBROOT = "/srv/halibut.cworth.org/www"
-website = "https://halibut.cworth.org/"
-#change this if we're using AWS or some other subdomain instead
def hunt_file(hunt, name):
"""Return a path file 'name' within the given hunt.
expanding += [
' <div id="b{}" class="containerTab {}" style="display:none;">\n'.format(i, status),
' <span onclick="this.parentElement.style.display=\'none\'" class="closebtn">x</span>\n',
- ' <h2>{}</h2>\n'.format(link(website + filename_from_name(rnd) + "_round.html", rnd)),
+ ' <h2>{}</h2>\n'.format(link(hunt_file(hunt, filename_from_name(rnd)) + "_round.html", rnd)),
' <table class="sortable">\n',
' <tr>\n',
' <th><u>Puzzle</u></th>\n',
meta = ''
if puzzle['status'] == 'solved':
expanding += [' <tr class=\'solved\';>\n',
- ' <td>{}</td>\n'.format(link(website + filename_from_name(puzzle['name']) + ".html", puzzle['name']+meta)),
- ' <td>{}</td>\n'.format(puzzle['solution']),
+ ' <td>{}</td>\n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", puzzle['name']+meta)),
+ ' <td>{}</td>\n'.format(", ".join(puzzle['solution']).upper()),
' </tr>\n']
else:
expanding += [' <tr class=\'unsolved\';>\n',
- ' <td><b>{}</b></td>\n'.format(link(website + filename_from_name(puzzle['name']) + ".html", puzzle['name']+meta)),
+ ' <td><b>{}</b></td>\n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", puzzle['name']+meta)),
' <td></td>\n',
' </tr>\n']
expanding.append(' </table>\n')
' </head>\n',
' <body class="{}">\n'.format(status),
' <h1><b>{}</b></h1>\n'.format(rnd),
- ' <p>{}</p>\n'.format(link(website + "index.html", 'Hunt Overview')),
+ ' <p>{}</p>\n'.format(link(hunt_file(hunt, "index") + ".html", 'Hunt Overview')),
' <div>\n',
' <table class="center sortable">\n',
' <thead>\n',
' <td>{}</td>\n'.format(elink(slack_url, puzzle['name']+meta)),
' <td>{}</td>\n'.format(elink(puzzle.get('url',''), 'Puzzle')),
' <td>{}</td>\n'.format(elink(puzzle['sheet_url'], 'Sheet')),
- ' <td>{}</td>\n'.format(link(website + filename_from_name(puzzle['name']) + '.html', 'Overview')),
- ' <td>{}</td>\n'.format(puzzle['solution']),
+ ' <td>{}</td>\n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", 'Overview')),
+ ' <td>{}</td>\n'.format(", ".join(puzzle['solution']).upper()),
# ' <td></td>\n',
- ' <td>{}</td>\n'.format("".join(puzzle.get('tags',[]))),
+ ' <td>{}</td>\n'.format(", ".join(puzzle.get('tags',[]))),
' </tr>\n']
else:
puzzle_list += [ ' <tr>\n',
' <td><b>{}</b></td>\n'.format(elink(slack_url, puzzle['name']+meta)),
' <td>{}</td>\n'.format(elink(puzzle.get('url',''), 'Puzzle')),
' <td>{}</td>\n'.format(elink(puzzle['sheet_url'], 'Sheet')),
- ' <td>{}</td>\n'.format(link(website + filename_from_name(puzzle['name']) + '.html', 'Overview')),
+ ' <td>{}</td>\n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", 'Overview')),
' <td></td>\n',
# ' <td></td>\n',
- ' <td>{}</td>\n'.format(" ".join(puzzle.get('tags',[]))),
+ ' <td>{}</td>\n'.format(", ".join(puzzle.get('tags',[]))),
' </tr>\n']
end = [' </tbody>\n',
' </table>\n',
meta = ''
slack_url = channel_url(puzzle['channel_id'])
if 'rounds' in puzzle:
- round_url = [link(website + filename_from_name(rnd) + "_round.html", rnd) for rnd in puzzle['rounds']]
+ round_url = [link(hunt_file(hunt, filename_from_name(rnd)) + "_round.html", rnd) for rnd in puzzle['rounds']]
else:
round_url = ''
if puzzle['status'] == 'solved':
- solution = puzzle['solution']
+ solution = ", ".join(puzzle['solution']).upper()
status = 'solved'
else:
solution = ""
' <meta name="viewport" content="width=device-width, initial-scale=1">\n',
' <link rel="stylesheet" href="/individual.css">\n',
' <title>{}</title>\n'.format(name+meta),
- ' <p>{}</p>'.format(link(website + 'index.html', 'Hunt Overview')),
+ ' <p>{}</p>'.format(link(hunt_file(hunt, 'index') + ".html", 'Hunt Overview')),
'\n',
'</head>\n',
'<body class="{}">\n'.format(status),
' <table class="center">\n',
' <tr>\n',
' <td>Round(s): {}</td>\n'.format(" ".join(round_url)), #round page on our site
- ' <td>Tags: {}</td>\n'.format(" ".join(puzzle.get('tags',[]))), #add tags
+ ' <td>Tags: {}</td>\n'.format(", ".join(puzzle.get('tags',[]))), #add tags
' </tr>\n',
' <tr>\n',
' <td>Answer: {}</td>\n'.format(solution),
' </div>\n'
' <body>\n',
' <h1><b>{}</b></h1>\n'.format('{} Puzzles').format(filt),
- ' <p>{}</p>\n'.format(link(website + "index.html", 'Hunt Overview')),
+ ' <p>{}</p>\n'.format(link(hunt_file(hunt, 'index') + ".html", 'Hunt Overview')),
' <div>\n',
' <table class="center sortable">\n',
' <thead>\n',
meta = ''
slack_url = channel_url(puzzle['channel_id'])
if 'rounds' in puzzle:
- round_url = link(website + filename_from_name(puzzle['rounds'][0]) + "_round.html", puzzle['rounds'][0])
+ round_url = link(hunt_file(hunt, filename_from_name(puzzle['rounds'][0])) + "_round.html", puzzle['rounds'][0])
else:
round_url = ''
#assuming one round per puzzle for now
' <td>{}</td>\n'.format(elink(slack_url, puzzle['name']+meta)),
' <td>{}</td>\n'.format(elink(puzzle.get('url',''), 'Puzzle')),
' <td>{}</td>\n'.format(elink(puzzle['sheet_url'], 'Sheet')),
- ' <td>{}</td>\n'.format(link(website + filename_from_name(puzzle['name']) + '.html', 'Overview')),
- ' <td>{}</td>\n'.format(puzzle['solution']),
+ ' <td>{}</td>\n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", 'Overview')),
+ ' <td>{}</td>\n'.format(", ".join(puzzle['solution']).upper()),
' <td>{}</td>\n'.format(round_url),
- ' <td>{}</td>\n'.format("".join(puzzle.get('tags',[]))),
+ ' <td>{}</td>\n'.format(", ".join(puzzle.get('tags',[]))),
' </tr>\n']
for puzzle in unsolved_puzzles:
if puzzle['type'] == 'meta':
meta = ''
slack_url = channel_url(puzzle['channel_id'])
if 'rounds' in puzzle:
- round_url = link(website + filename_from_name(puzzle['rounds'][0]) + "_round.html", puzzle['rounds'][0])
+ round_url = link(hunt_file(hunt, filename_from_name(puzzle['rounds'][0])) + "_round.html", puzzle['rounds'][0])
else:
round_url = ''
#assuming one round per puzzle for now
' <td>{}</td>\n'.format(elink(slack_url, puzzle['name']+meta)),
' <td>{}</td>\n'.format(elink(puzzle.get('url',''), 'Puzzle')),
' <td>{}</td>\n'.format(elink(puzzle['sheet_url'], 'Sheet')),
- ' <td>{}</td>\n'.format(link(website + filename_from_name(puzzle['name']) + '.html', 'Overview')),
+ ' <td>{}</td>\n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", 'Overview')),
' <td></td>\n',
' <td>{}</td>\n'.format(round_url),
- ' <td>{}</td>\n'.format("".join(puzzle.get('tags',[]))),
+ ' <td>{}</td>\n'.format(", ".join(puzzle.get('tags',[]))),
' </tr>\n']
end = [' </tbody>\n',
' </table>\n',
overview(hunt, puzzles, rounds)
for rnd in rounds:
round_overview(hunt, rnd, puzzles)
- for puzzle in puzzles:
- puzzle_overview(hunt, puzzle)
- puzzle_lists(hunt, puzzles, "All")
- puzzle_lists(hunt, puzzles, "Solved")
- puzzle_lists(hunt, puzzles, "Unsolved")
+ for puzzle in puzzles:
+ puzzle_overview(hunt, puzzle)
+ puzzle_lists(hunt, puzzles, "All")
+ puzzle_lists(hunt, puzzles, "Solved")
+ puzzle_lists(hunt, puzzles, "Unsolved")
+
# Initialize AWS resources to talk to the database
db = boto3.resource('dynamodb')