X-Git-Url: https://git.cworth.org/git?p=turbot-web;a=blobdiff_plain;f=html_generator.py;h=0fef3d421c3f1b9158a7e97932f07b43342b24a6;hp=9b1b1147bb966012b97aeef4331aefb0899fa27a;hb=HEAD;hpb=2190ac00d55a00d00f141fc14f0e8a65a47a49dd
diff --git a/html_generator.py b/html_generator.py
index 9b1b114..f187032 100644
--- a/html_generator.py
+++ b/html_generator.py
@@ -14,20 +14,46 @@ that would be great
Requires sorttable.js, which should be included
"""
-from turbot.channel import channel_url
+import boto3
from boto3.dynamodb.conditions import Key
+import os
+import re
+import sys
-website = "https://halibut.cworth.org/"
-#change this if we're using AWS or some other subdomain instead
+WEBROOT = "/srv/halibut.cworth.org/www"
-def find_hunt_for_hunt_id(turb, hunt_id):
+
+def hunt_file(hunt, name):
+ """Return a path file 'name' within the given hunt.
+
+ This will be withing WEBROOT and in a hunt-specific path."""
+
+ return "{}/{}/{}".format(WEBROOT, hunt['channel_id'], name)
+
+def internal_link(hunt, name):
+ """Returns a path for a link on this site."""
+
+ # Just generate a relative link, (which is just the name itself)
+ return "{}".format(name)
+
+def filename_from_name(name):
+ """Returns a string derived from name, but with all spaces and slashes
+ replaced with underscores, (for making a clean filename)"""
+ return re.sub(r'[ /]', '_', name)
+
+def channel_url(channel_id):
+ """Given a channel ID, return the URL for that channel."""
+
+ return "https://halibutthatbass.slack.com/archives/{}".format(channel_id)
+
+def find_hunt_for_hunt_id(table, hunt_id):
"""Given a hunt ID find the database item for that hunt
Returns None if hunt ID is not found, otherwise a
dictionary with all fields from the hunt's row in the table,
(channel_id, active, hunt_id, name, url, sheet_url, etc.).
"""
- response = turb.table.get_item(
+ response = table.get_item(
Key={
'hunt_id': hunt_id,
'SK': 'hunt-{}'.format(hunt_id)
@@ -38,10 +64,10 @@ def find_hunt_for_hunt_id(turb, hunt_id):
else:
return None
-def hunt_puzzles_for_hunt_id(turb, hunt_id):
+def hunt_puzzles_for_hunt_id(table, hunt_id):
"""Return all puzzles that belong to the given hunt_id"""
- response = turb.table.query(
+ response = table.query(
KeyConditionExpression=(
Key('hunt_id').eq(hunt_id) &
Key('SK').begins_with('puzzle-')
@@ -59,15 +85,17 @@ def link(lin, text):
#internal links, doesn't open new tab
return '{}'.format(lin, text)
-def hunt_info(turb, hunt):
+def hunt_info(table, hunt_id):
"""
Retrieves list of rounds, puzzles for the given hunt
"""
+
+ hunt = find_hunt_for_hunt_id(table, hunt_id)
+
name = hunt["name"]
- hunt_id = hunt["hunt_id"]
channel_id = hunt["channel_id"]
- puzzles = hunt_puzzles_for_hunt_id(turb, hunt_id)
+ puzzles = hunt_puzzles_for_hunt_id(table, hunt_id)
rounds = set()
for puzzle in puzzles:
@@ -78,7 +106,7 @@ def hunt_info(turb, hunt):
rounds = list(rounds)
rounds.sort()
- return puzzles, rounds
+ return hunt, puzzles, rounds
def round_stat(rnd, puzzles):
#Counts puzzles, solved, list of puzzles for a given round
@@ -110,15 +138,16 @@ def round_stat(rnd, puzzles):
-def overview(puzzles, rounds):
+def overview(hunt, puzzles, rounds):
#big board, main page. saves as index.html
start = ['\n',
'\n',
'\n',
' \n',
' \n',
+ ' \n',
'\n',
- ' \n',
+ ' \n',
' \n',
'\n',
' Hunt Overview\n',
- ' \n'
+ ' \n'
'\n',
- '