X-Git-Url: https://git.cworth.org/git?p=turbot-web;a=blobdiff_plain;f=html_generator.py;h=7227eae30f754c8ca3914fce6257e2890f85eeb4;hp=01cecdea7e521c48fb844db5c52e40865d27f58b;hb=c143928ee9e6b76d710a210690077337f3f19e7c;hpb=46ee43c674ec697c6740b9a531ac0b6ff3a05ab4 diff --git a/html_generator.py b/html_generator.py index 01cecde..7227eae 100644 --- a/html_generator.py +++ b/html_generator.py @@ -22,8 +22,6 @@ import sys 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. @@ -183,7 +181,7 @@ def overview(hunt, puzzles, rounds): expanding += [ '
Puzzle | \n', @@ -197,12 +195,12 @@ def overview(hunt, puzzles, rounds): meta = '' if puzzle['status'] == 'solved': expanding += ['||
---|---|---|
{} | \n'.format(link(website + filename_from_name(puzzle['name']) + ".html", puzzle['name']+meta)), + '{} | \n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", puzzle['name']+meta)), '{} | \n'.format(", ".join(puzzle['solution']).upper()), '
{} | \n'.format(link(website + filename_from_name(puzzle['name']) + ".html", puzzle['name']+meta)), + '{} | \n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", puzzle['name']+meta)), '\n', ' |
{}
\n'.format(link(website + "index.html", 'Hunt Overview')), + '{}
\n'.format(link(hunt_file(hunt, "index") + ".html", 'Hunt Overview')), '{} | \n'.format(elink(slack_url, puzzle['name']+meta)), '{} | \n'.format(elink(puzzle.get('url',''), 'Puzzle')), '{} | \n'.format(elink(puzzle['sheet_url'], 'Sheet')), - '{} | \n'.format(link(website + filename_from_name(puzzle['name']) + '.html', 'Overview')), + '{} | \n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", 'Overview')), '{} | \n'.format(", ".join(puzzle['solution']).upper()), # '\n', ' | {} | \n'.format(", ".join(puzzle.get('tags',[]))), @@ -275,7 +273,7 @@ def round_overview(hunt, rnd, puzzles): '{} | \n'.format(elink(slack_url, puzzle['name']+meta)), '{} | \n'.format(elink(puzzle.get('url',''), 'Puzzle')), '{} | \n'.format(elink(puzzle['sheet_url'], 'Sheet')), - '{} | \n'.format(link(website + filename_from_name(puzzle['name']) + '.html', 'Overview')), + '{} | \n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", 'Overview')), '\n', # ' | \n', ' | {} | \n'.format(", ".join(puzzle.get('tags',[]))), @@ -304,7 +302,7 @@ def puzzle_overview(hunt, puzzle): 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': @@ -320,7 +318,7 @@ def puzzle_overview(hunt, puzzle): ' \n', ' \n', '
{} | \n'.format(elink(slack_url, puzzle['name']+meta)), '{} | \n'.format(elink(puzzle.get('url',''), 'Puzzle')), '{} | \n'.format(elink(puzzle['sheet_url'], 'Sheet')), - '{} | \n'.format(link(website + filename_from_name(puzzle['name']) + '.html', 'Overview')), + '{} | \n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", 'Overview')), '{} | \n'.format(", ".join(puzzle['solution']).upper()), '{} | \n'.format(round_url), '{} | \n'.format(", ".join(puzzle.get('tags',[]))), @@ -421,7 +419,7 @@ def puzzle_lists(hunt, puzzles, filt): 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 @@ -430,7 +428,7 @@ def puzzle_lists(hunt, puzzles, filt): '{} | \n'.format(elink(slack_url, puzzle['name']+meta)), '{} | \n'.format(elink(puzzle.get('url',''), 'Puzzle')), '{} | \n'.format(elink(puzzle['sheet_url'], 'Sheet')), - '{} | \n'.format(link(website + filename_from_name(puzzle['name']) + '.html', 'Overview')), + '{} | \n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", 'Overview')), '\n', ' | {} | \n'.format(round_url), '{} | \n'.format(", ".join(puzzle.get('tags',[]))), @@ -477,8 +475,8 @@ def generate_for_hunt_id(table, hunt_id): overview(hunt, puzzles, rounds) for rnd in rounds: round_overview(hunt, rnd, puzzles) - for puzzle in puzzles: - puzzle_overview(hunt, puzzle) + for puzzle in puzzles: + puzzle_overview(hunt, puzzle) puzzle_lists(hunt, puzzles, "All") puzzle_lists(hunt, puzzles, "Solved") puzzle_lists(hunt, puzzles, "Unsolved")