X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=html_generator.py;h=7227eae30f754c8ca3914fce6257e2890f85eeb4;hb=c143928ee9e6b76d710a210690077337f3f19e7c;hp=de7291c2518076e0e8e17b02cfd3e6cfe5652fae;hpb=95d1e0c60e2f514fd67f8f619c15e9820a873cb4;p=turbot-web
diff --git a/html_generator.py b/html_generator.py
index de7291c..7227eae 100644
--- a/html_generator.py
+++ b/html_generator.py
@@ -18,11 +18,10 @@ import boto3
from boto3.dynamodb.conditions import Key
import os
import re
+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.
@@ -182,7 +181,7 @@ def overview(hunt, puzzles, rounds):
expanding += [
'
\n'.format(i, status),
'
x\n',
- '
{}
\n'.format(link(website + filename_from_name(rnd) + "_round.html", rnd)),
+ '
{}
\n'.format(link(hunt_file(hunt, filename_from_name(rnd)) + "_round.html", rnd)),
'
\n',
' \n',
' Puzzle | \n',
@@ -196,12 +195,12 @@ def overview(hunt, puzzles, rounds):
meta = ''
if puzzle['status'] == 'solved':
expanding += ['
\n',
- ' {} | \n'.format(link(website + filename_from_name(puzzle['name']) + ".html", puzzle['name']+meta)),
- ' {} | \n'.format(puzzle['solution']),
+ ' {} | \n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", puzzle['name']+meta)),
+ ' {} | \n'.format(", ".join(puzzle['solution']).upper()),
'
\n']
else:
expanding += [' \n',
- ' {} | \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']
expanding.append('
\n')
@@ -211,10 +210,11 @@ def overview(hunt, puzzles, rounds):
end = ['