neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add answer checking to dev server

This commit is contained in:
Neale Pickett 2019-02-23 12:04:42 -07:00
parent 5d1886b9e6
commit c726847cb9
3 changed files with 46 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
devel/devel-server.py
View File

@ -29,15 +29,37 @@ def get_seed(request):
return int(seedstr)
def get_puzzle(request):
def get_puzzle(request, data=None):
seed = get_seed(request)
category = request.match_info.get("category")
points = int(request.match_info.get("points"))
filename = request.match_info.get("filename")
if not data:
data = request.match_info
category = data.get("cat")
points = int(data.get("points"))
filename = data.get("filename")
cat = moth.Category(request.app["puzzles_dir"].joinpath(category), seed)
puzzle = cat.puzzle(points)
return puzzle
# OMG what is this I hate Python now
@asyncio.coroutine
async def handle_answer(request):
data = await request.post()
puzzle = get_puzzle(request, data)
ret = {
"status": "success",
"data": {
"short": "",
"description": "Provided answer was not in list of answers"
},
}
if data.get("answer") in puzzle.answers:
ret["data"]["description"] = "Answer is correct"
return web.Response(
content_type="application/json",
body=json.dumps(ret),
)
async def handle_puzzlelist(request):
seed = get_seed(request)
@ -61,7 +83,7 @@ async def handle_puzzlelist(request):
async def handle_puzzle(request):
seed = get_seed(request)
category = request.match_info.get("category")
category = request.match_info.get("cat")
points = int(request.match_info.get("points"))
cat = moth.Category(request.app["puzzles_dir"].joinpath(category), seed)
puzzle = cat.puzzle(points)
@ -80,7 +102,7 @@ async def handle_puzzle(request):
async def handle_puzzlefile(request):
seed = get_seed(request)
category = request.match_info.get("category")
category = request.match_info.get("cat")
points = int(request.match_info.get("points"))
filename = request.match_info.get("filename")
cat = moth.Category(request.app["puzzles_dir"].joinpath(category), seed)
@ -97,20 +119,9 @@ async def handle_puzzlefile(request):
content_type=content_type,
)
async def handle_answer(request):
seed = get_seed(request)
category = request.match_info.get("category")
points = int(request.match_info.get("points"))
filename = request.match_info.get("filename")
cat = moth.Category(request.app["puzzles_dir"].joinpath(category), seed)
puzzle = cat.puzzle(points)
async def handle_mothballer(request):
seed = get_seed(request)
category = request.match_info.get("category")
category = request.match_info.get("cat")
try:
catdir = request.app["puzzles_dir"].joinpath(category)
@ -137,7 +148,7 @@ async def handle_index(request):
<title>Dev Server</title>
<script>
// Skip trying to log in
sessionStorage.setItem("id", "Hello from the development server")
sessionStorage.setItem("id", "devel-server")
</script>
</head>
<body>
@ -216,9 +227,10 @@ if __name__ == '__main__':
app["puzzles_dir"] = pathlib.Path(args.puzzles)
app["theme_dir"] = pathlib.Path(args.theme)
app.router.add_route("GET", "/", handle_index)
app.router.add_route("*", "/{seed}/answer", handle_answer)
app.router.add_route("*", "/{seed}/puzzles.json", handle_puzzlelist)
app.router.add_route("GET", "/{seed}/content/{category}/{points}/puzzle.json", handle_puzzle)
app.router.add_route("GET", "/{seed}/content/{category}/{points}/{filename}", handle_puzzlefile)
app.router.add_route("GET", "/{seed}/mothballer/{category}", handle_mothballer)
app.router.add_route("GET", "/{seed}/content/{cat}/{points}/puzzle.json", handle_puzzle)
app.router.add_route("GET", "/{seed}/content/{cat}/{points}/{filename}", handle_puzzlefile)
app.router.add_route("GET", "/{seed}/mothballer/{cat}", handle_mothballer)
app.router.add_route("GET", "/{seed}/{filename:.*}", handle_static)
web.run_app(app, host=addr, port=port)

26
theme/moth.js
View File

@ -14,19 +14,7 @@ function toast(message, timeout=5000) {
)
}
function rpc(url, params={}) {
let formData = new FormData()
for (let k in params) {
formData.append(k, params[k])
}
return fetch(url, {
method: "POST",
body: formData,
})
}
function renderPuzzles(obj) {
console.log(obj)
let puzzlesElement = document.createElement('div')
// Create a sorted list of category names
@ -75,7 +63,6 @@ function renderPuzzles(obj) {
i.appendChild(a)
a.textContent = points
a.href = "puzzle.html?cat=" + cat + "&points=" + points + "&pid=" + id
a.target = "_blank"
}
}
@ -91,7 +78,12 @@ function renderPuzzles(obj) {
}
function heartbeat(teamId) {
rpc("puzzles.json", {id: teamId})
let fd = new FormData()
fd.append("id", teamId)
fetch("puzzles.json", {
method: "POST",
body: fd,
})
.then(resp => {
if (resp.ok) {
resp.json()
@ -125,9 +117,9 @@ function login(e) {
let name = document.querySelector("[name=name]").value
let id = document.querySelector("[name=id]").value
rpc("register", {
name: name,
id: id,
fetch("register", {
method: "POST",
body: new FormData(e.target),
})
.then(resp => {
if (resp.ok) {

25
theme/puzzle.js
View File

@ -45,18 +45,6 @@ function devel_addin(obj, e) {
}
function rpc(url, params={}) {
let formData = new FormData()
for (let k in params) {
formData.append(k, params[k])
}
return fetch(url, {
method: "POST",
body: formData,
})
}
function toast(message, timeout=5000) {
let p = document.createElement("p")
@ -71,16 +59,9 @@ function toast(message, timeout=5000) {
function submit(e) {
e.preventDefault()
let cat = document.querySelector("input[name=cat]").value
let points = document.querySelector("input[name=points]").value
let id = document.querySelector("input[name=id]").value
let answer = document.querySelector("input[name=answer]").value
rpc("answer", {
cat: cat,
points: points,
id: id,
answer: answer,
fetch("answer", {
method: "POST",
body: new FormData(e.target),
})
.then(resp => {
if (resp.ok) {