Merge branch 'master' into develop

This commit is contained in:
Neale Pickett 2016-10-21 19:54:55 +00:00
commit 3065598dee
95 changed files with 18 additions and 26 deletions

View File

@ -25,6 +25,21 @@ Please check out [the overview](doc/overview.md)
for details. for details.
Getting Started Developing
-------------------------------
$ git clone $your_puzzles_repo puzzles
$ python3 tools/devel-server.py
Then point a web browser at http://localhost:8080/
and start hacking on things in your `puzzles` directory.
Running A Production Server
====================
XXX: Update this
How to set it up How to set it up
-------------------- --------------------

View File

@ -1,9 +0,0 @@
* Scoreboard refresh
Test:
* awarding points
* points already awarded
* bad team hash
* category doesn't exist
* puzzle doesn't exist

14
kothd
View File

@ -1,14 +0,0 @@
#! /bin/sh
cd ${1:-$(dirname $0)}
KOTH_BASE=$(pwd)
echo "Running koth instances in $KOTH_BASE"
while true; do
for i in $KOTH_BASE/*/assigned.txt; do
dir=${i%/*}
$dir/bin/once
done
sleep 5
done

View File

View File

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

View File

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

View File

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

View File

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB

View File

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 107 KiB

View File

Before

Width:  |  Height:  |  Size: 129 KiB

After

Width:  |  Height:  |  Size: 129 KiB

View File

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

View File

Before

Width:  |  Height:  |  Size: 144 B

After

Width:  |  Height:  |  Size: 144 B

View File

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 64 KiB

View File

Before

Width:  |  Height:  |  Size: 197 KiB

After

Width:  |  Height:  |  Size: 197 KiB

View File

Before

Width:  |  Height:  |  Size: 236 KiB

After

Width:  |  Height:  |  Size: 236 KiB

View File

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 52 KiB

View File

@ -4,9 +4,9 @@ import cgi
import glob import glob
import http.server import http.server
import mistune import mistune
import moth
import os import os
import pathlib import pathlib
import puzzles
import socketserver import socketserver
import sys import sys
import traceback import traceback
@ -27,7 +27,7 @@ def page(title, body):
<html> <html>
<head> <head>
<title>{}</title> <title>{}</title>
<link rel="stylesheet" href="/files/www/res/style.css"> <link rel="stylesheet" href="/files/src/www/res/style.css">
</head> </head>
<body> <body>
<div id="preview" class="terminal"> <div id="preview" class="terminal">
@ -112,7 +112,7 @@ you are a fool.
return return
fpath = os.path.join("puzzles", parts[2]) fpath = os.path.join("puzzles", parts[2])
cat = puzzles.Category(fpath, seed) cat = moth.Category(fpath, seed)
if len(parts) == 3: if len(parts) == 3:
# List all point values in a category # List all point values in a category
body.append("# Puzzles in category `{}`".format(parts[2])) body.append("# Puzzles in category `{}`".format(parts[2]))