@@ -1,4 +1,5 @@

 from django.db import models

+from django.conf import settings

 class Game(models.Model):

     slug = models.SlugField(max_length=80, unique=True)

@@ -21,6 +22,10 @@ class Level(models.Model):

         return ('scorekeeper.views.level_detail', [str(self.slug)])

     def sorted_scores(self):

         return self.score_set.all().order_by('-score')

+    def cleanup(self):

+        if self.score_set.count() > settings.SCORESERVER_MAX_SCORE_TO_KEEP:

+            for scoreToDelete in self.score_set.all().order_by('-score')[settings.SCORESERVER_MAX_SCORE_TO_KEEP:]:

+                scoreToDelete.delete()

 class Player(models.Model):

     slug = models.SlugField(max_length=80, unique=True)

@@ -32,6 +37,10 @@ class Player(models.Model):

         return self.slug

     def sorted_scores(self):

         return self.score_set.all().order_by('-level__name', '-score')

+    @staticmethod

+    def cleanup():

+        for player in Player.objects.annotate(num_scores = models.Count('score')).filter(num_scores = 0):

+            player.delete()

 class Score(models.Model):

     player = models.ForeignKey(Player)

@@ -2,7 +2,6 @@ from django.http import HttpResponse

 from django.template import RequestContext, loader

 from django.views.generic import list_detail

 from scorekeeper.models import Game, Level, Player, Score

-from django.conf import settings

 def index(request):

     games = Game.objects.all().order_by('-name')

@@ -22,6 +21,7 @@ def player_detail(request, player_slug):

     return list_detail.object_detail( request, queryset= Player.objects.all(), slug=player_slug, slug_field='slug', template_name='scorekeeper/templates/player_detail.html'  )

 def score(request):

+    #create or update score

     level = Level.objects.get(slug=request.REQUEST['level'])

     player, isNewPlayer = Player.objects.get_or_create(slug=request.REQUEST['player'], defaults={'secret':request.REQUEST['secret']})

     if not isNewPlayer and player.secret != request.REQUEST['secret']:

@@ -30,7 +30,7 @@ def score(request):

     if not isNewScore:

         score.score = request.REQUEST['score']

         score.save()

-    if level.score_set.count() > settings.SCORESERVER_MAX_SCORE_TO_KEEP:

-        for scoreToDelete in level.score_set.all().order_by('-score')[settings.SCORESERVER_MAX_SCORE_TO_KEEP:]:

-            scoreToDelete.delete()

+    #cleanup

+    level.cleanup()

+    Player.cleanup()

     return HttpResponse("score saved")