erki/ss13_se
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up measure_weekdays so it's understandable now.

Browse Source
This commit is contained in:
A. Svensson 2015-03-09 17:08:51 +01:00
parent 6a489bc4f7
commit 62c227ef1b
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gameservers/models.py
View File

@ -68,19 +68,16 @@ class Server(models.Model):
) )
def measure_weekdays(self, days=7): def measure_weekdays(self, days=7):
weekdays = []
history = self.get_stats_history(days=days) history = self.get_stats_history(days=days)
for i, day in enumerate(DAY_NAMES): weekdays = []
# HACK: Fuck django for defaulting the start of a week to sunday... # Why can't it be zero indexed like the rest of the fucking community...
# Oh, and it's not even zero indexed like the rest of the python for day in range(1, 8):
# community! So much fun with number juggling... tmp = history.filter(created__week_day=day)
i += 2
if i > 7: i = 1
# NOTE: using __week_day is dependant on pytz
tmp = history.filter(created__week_day=i)
avg = tmp.aggregate(models.Avg('players'))['players__avg'] or 0 avg = tmp.aggregate(models.Avg('players'))['players__avg'] or 0
weekdays.append((day, int(avg))) weekdays.append(int(avg))
# HACK: Since django's __week_day starts on a sunday (amurican suckers)
# we have to move sunday (at the start) to the end of the list
weekdays.insert(len(weekdays), weekdays.pop(0))
return weekdays return weekdays
def update_stats(self, player_count=0): def update_stats(self, player_count=0):
@ -90,7 +87,7 @@ class Server(models.Model):
self.players_avg, self.players_min, self.players_max = tmp self.players_avg, self.players_min, self.players_max = tmp
tmp = self.measure_weekdays() tmp = self.measure_weekdays()
self.averages_for_weekdays = ','.join([str(i) for day, i in tmp]) self.averages_for_weekdays = ','.join([str(i) for i in tmp])
def get_averages_for_weekdays(self): def get_averages_for_weekdays(self):
tmp = literal_eval(self.averages_for_weekdays) tmp = literal_eval(self.averages_for_weekdays)