Diverse Code Cleanups

*Code wurde PEP-8 gerecht formatiert
* Kleine Fehler die der PyCharm Inspector beanstandet wurden korrigiert
This commit is contained in:
Christian Berg
2014-11-26 16:04:52 +01:00
committed by Christian Berg
parent f34281089d
commit 86a0db050d
76 changed files with 619 additions and 528 deletions

View File

@@ -4,9 +4,8 @@
Generate Randum Mahjong Hanchans to the the Raning System
"""
from django.contrib.auth.models import User
from django.contrib import auth
from django.core.management.base import BaseCommand
from django.utils.translation import ugettext_lazy as _
from events.models import Event
from mahjong_ranking import models
import random
@@ -14,16 +13,16 @@ from datetime import timedelta
class Command(BaseCommand):
help = "Deletes all expired user registrations from the database"
def add_players(self, hanchan):
user_list = set()
while len(user_list) < 4:
random_user = random.choice(self.user_list)
user_list.add(random_user)
player_list = list()
ostwind_list = list()
for user in user_list:
for user in user_list:
player_list.append(models.Player(user=user, hanchan=hanchan, score=25000))
for player in player_list:
player.save()
@@ -36,7 +35,7 @@ class Command(BaseCommand):
score = random.randrange(1300, 8000, 100)
loser = player_list[random.randrange(0,4,1)]
winner = player_list[random.randrange(0,4,1)]
winner.score += score
winner.score += score
print 'Ostwind: %s, Gewinner: %s, Verlierer: %s, %d Punkte' % (
ostwind.user,
@@ -53,12 +52,12 @@ class Command(BaseCommand):
player.score -= score / 3
else:
loser.score -= score
for player in player_list:
if player.score <= 0:
player.score = 0
end_of_game = True
if winner == ostwind:
print "Wind bleibt"
else:
@@ -81,14 +80,14 @@ class Command(BaseCommand):
hanchan.save()
self.add_players(hanchan)
hanchan.save()
def handle(self, *args, **options):
num_hanchans = int(options.get('hanchans', 4))
self.user_list = list(User.objects.all())
self.user_list = list(auth.get_user_model().objects.all())
for event in Event.objects.all():
for i in range(random.randrange(2,8)):
self.create_hanchan(event)