hjp
/
picture-tournament
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: hjp:b7373d2b9829a9ab707ce0ca7f4dad976a92b366
Branches Tags
hjp:master
..
compare: hjp:c194b9220e56d99d6fcd0da1c8802c170856ee56
Branches Tags
hjp:master

No commits in common. "b7373d2b9829a9ab707ce0ca7f4dad976a92b366" and "c194b9220e56d99d6fcd0da1c8802c170856ee56" have entirely different histories.
b7373d2b98 ... c194b9220e

1 changed files with 2 additions and 12 deletions
Show Stats Expand all files Collapse all files

14
pt/views.py
View File

@ -1,7 +1,7 @@
import logging import logging
import random import random
from django.urls import reverse from django.core.urlresolvers import reverse
from django.db.models import Max from django.db.models import Max
from django.http import HttpResponse, HttpResponseRedirect from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import render from django.shortcuts import render
@ -15,15 +15,11 @@ def compare(request):
if "left" not in request.session: if "left" not in request.session:
left_pic = random_pic() left_pic = random_pic()
request.session["left"] = left_pic.id request.session["left"] = left_pic.id
request.session["left_count"] = 0
if "right" not in request.session: if "right" not in request.session:
right_pic = random_pic() right_pic = random_pic()
request.session["right"] = right_pic.id request.session["right"] = right_pic.id
request.session["right_count"] = 0
left_pic = models.Picture.objects.get(id=request.session["left"]) left_pic = models.Picture.objects.get(id=request.session["left"])
right_pic = models.Picture.objects.get(id=request.session["right"]) right_pic = models.Picture.objects.get(id=request.session["right"])
request.session["left_count"] += 1
request.session["right_count"] += 1
context = { context = {
"left": left_pic, "left": left_pic,
"right": right_pic, "right": right_pic,
@ -52,9 +48,6 @@ def left_wins(request):
right.elo -= adjust right.elo -= adjust
right.save() right.save()
log.info("after: left=%f, right=%f", left.elo, right.elo) log.info("after: left=%f, right=%f", left.elo, right.elo)
log.info("counts: left=%d, right=%d", request.session["left_count"], request.session["right_count"])
if request.session["left_count"] >= 5:
del request.session["left"]
del request.session["right"] del request.session["right"]
return HttpResponseRedirect(reverse('compare')) return HttpResponseRedirect(reverse('compare'))
@ -72,9 +65,6 @@ def right_wins(request):
right.elo += adjust right.elo += adjust
right.save() right.save()
log.info("after: left=%f, right=%f", left.elo, right.elo) log.info("after: left=%f, right=%f", left.elo, right.elo)
log.info("counts: left=%d, right=%d", request.session["left_count"], request.session["right_count"])
if request.session["right_count"] >= 5:
del request.session["right"]
del request.session["left"] del request.session["left"]
return HttpResponseRedirect(reverse('compare')) return HttpResponseRedirect(reverse('compare'))
@ -88,6 +78,6 @@ def refresh(request):
def top(request): def top(request):
top = models.Picture.objects.all().order_by("-elo")[0:10] top = models.Picture.objects.all().order_by("-elo")[0:9]
context = { "top": top } context = { "top": top }
return HttpResponse(render(request, 'pt/top.html', context)) return HttpResponse(render(request, 'pt/top.html', context))