Use UTC now() instead of regular now(). We are global, baby!

[xonotic/xonstat.git] / xonstat / views / main.py

diff --git a/xonstat/views/main.py b/xonstat/views/main.py
index 205c8686e7db439c588ec445821a4c14334760b8..22b12918eeeae7df0baa3fbc31978eb54e779a14 100755 (executable)
--- a/xonstat/views/main.py
+++ b/xonstat/views/main.py
@@ -2,7 +2,6 @@ import logging
 import sqlalchemy.sql.functions as func
 import sqlalchemy.sql.expression as expr
 from datetime import datetime, timedelta
-from pyramid.config import get_current_registry
 from pyramid.response import Response
 from xonstat.models import *
 from xonstat.util import *
@@ -10,24 +9,23 @@ from xonstat.util import *
 log = logging.getLogger(__name__)
 
 def main_index(request):
-    settings = get_current_registry().settings
     try: 
         leaderboard_lifetime = int(
-                settings['xonstat.leaderboard_lifetime'])
+                request.registry.settings['xonstat.leaderboard_lifetime'])
     except:
         leaderboard_lifetime = 30
 
     leaderboard_count = 10
-    recent_games_count = 32
+    recent_games_count = 20
 
-    # top players by score
+    # top players by playing time
     top_players = DBSession.query(Player.player_id, Player.nick, 
-            func.sum(PlayerGameStat.score)).\
+            func.sum(PlayerGameStat.alivetime)).\
             filter(Player.player_id == PlayerGameStat.player_id).\
             filter(Player.player_id > 2).\
             filter(PlayerGameStat.create_dt > 
-                    (datetime.now() - timedelta(days=leaderboard_lifetime))).\
-            order_by(expr.desc(func.sum(PlayerGameStat.score))).\
+                    (datetime.utcnow() - timedelta(days=leaderboard_lifetime))).\
+            order_by(expr.desc(func.sum(PlayerGameStat.alivetime))).\
             group_by(Player.nick).\
             group_by(Player.player_id).all()[0:10]
 
@@ -42,7 +40,7 @@ def main_index(request):
             func.count()).\
             filter(Game.server_id==Server.server_id).\
             filter(Game.create_dt > 
-                (datetime.now() - timedelta(days=leaderboard_lifetime))).\
+                (datetime.utcnow() - timedelta(days=leaderboard_lifetime))).\
             order_by(expr.desc(func.count(Game.game_id))).\
             group_by(Server.server_id).\
             group_by(Server.name).all()[0:10]
@@ -55,7 +53,7 @@ def main_index(request):
             func.count()).\
             filter(Map.map_id==Game.map_id).\
             filter(Game.create_dt > 
-                (datetime.now() - timedelta(days=leaderboard_lifetime))).\
+                (datetime.utcnow() - timedelta(days=leaderboard_lifetime))).\
             order_by(expr.desc(func.count())).\
             group_by(Game.map_id).\
             group_by(Map.name).all()[0:10]
@@ -63,13 +61,16 @@ def main_index(request):
     for i in range(leaderboard_count-len(top_maps)):
         top_maps.append(('-', '-', '-'))
 
-    recent_games = DBSession.query(Game, Server, Map).\
+    # recent games played in descending order
+    recent_games = DBSession.query(Game, Server, Map, PlayerGameStat).\
             filter(Game.server_id==Server.server_id).\
             filter(Game.map_id==Map.map_id).\
+            filter(PlayerGameStat.game_id==Game.game_id).\
+            filter(PlayerGameStat.rank==1).\
             order_by(expr.desc(Game.start_dt)).all()[0:recent_games_count]
 
     for i in range(recent_games_count-len(recent_games)):
-        recent_games.append(('-', '-', '-'))
+        recent_games.append(('-', '-', '-', '-'))
 
     return {'top_players':top_players,
             'top_servers':top_servers,