import logging
import sqlalchemy.sql.functions as func
import sqlalchemy.sql.expression as expr
+from collections import namedtuple
from datetime import datetime, timedelta
from pyramid.httpexceptions import HTTPNotFound
+from sqlalchemy import func as fg
from webhelpers.paginate import Page
from xonstat.models import DBSession, Player, Server, Map, Game, PlayerGameStat
from xonstat.util import page_url, html_colors
servers = Page(server_q, self.page, items_per_page=25, url=page_url)
except:
- servers = None
+ raise HTTPNotFound
return servers
LEADERBOARD_LIFETIME)
self.lifetime = int(raw_lifetime)
- self.limit = request.matchdict.get("limit", limit)
- self.last = request.matchdict.get("last", last)
+ self.limit = request.params.get("limit", limit)
+ self.last = request.params.get("last", last)
self.now = datetime.utcnow()
class ServerTopMaps(ServerInfoBase):
"""Returns the top maps played on a given server."""
- def __init__(self, request, limit=None, last=None):
+ def __init__(self, request, limit=LEADERBOARD_COUNT, last=None):
"""Common parameter parsing."""
super(ServerTopMaps, self).__init__(request, limit, last)
def raw(self):
"""Returns the raw data shared by all renderers."""
try:
- top_maps_q = DBSession.query(Game.map_id, Map.name, func.count())\
+ top_maps_q = DBSession.query(
+ fg.row_number().over(order_by=expr.desc(func.count())).label("rank"),
+ Game.map_id, Map.name, func.count().label("times_played"))\
.filter(Map.map_id==Game.map_id)\
.filter(Game.server_id==self.server_id)\
.filter(Game.create_dt > (self.now - timedelta(days=self.lifetime)))\
top_maps_q = top_maps_q.limit(self.limit)
top_maps = top_maps_q.all()
- except:
- top_maps = None
+ except Exception as e:
+ log.debug(e)
+ raise HTTPNotFound
return top_maps
+ def html(self):
+ """Returns the HTML-ready representation."""
+ return self.top_maps
+
def json(self):
"""For rendering this data using JSON."""
top_maps = [{
+ "rank": tm.rank,
"map_id": tm.map_id,
"map_name": tm.name,
- "times_played": tm[2],
+ "times_played": tm.times_played,
} for tm in self.top_maps]
return top_maps
class ServerTopScorers(ServerInfoBase):
"""Returns the top scorers on a given server."""
- def __init__(self, request, limit=None, last=None):
+ def __init__(self, request, limit=LEADERBOARD_COUNT, last=None):
"""Common parameter parsing."""
super(ServerTopScorers, self).__init__(request, limit, last)
self.top_scorers = self.raw()
def raw(self):
"""Top scorers on this server by total score."""
try:
- top_scorers_q = DBSession.query(Player.player_id, Player.nick,
- func.sum(PlayerGameStat.score))\
+ top_scorers_q = DBSession.query(
+ fg.row_number().over(
+ order_by=expr.desc(func.sum(PlayerGameStat.score))).label("rank"),
+ Player.player_id, Player.nick,
+ func.sum(PlayerGameStat.score).label("total_score"))\
.filter(Player.player_id == PlayerGameStat.player_id)\
.filter(Game.game_id == PlayerGameStat.game_id)\
.filter(Game.server_id == self.server_id)\
top_scorers = top_scorers_q.all()
- except:
- top_scorers = None
+ except Exception as e:
+ log.debug(e)
+ raise HTTPNotFound
return top_scorers
+ def html(self):
+ """Returns an HTML-ready representation."""
+ TopScorer = namedtuple("TopScorer", ["rank", "player_id", "nick", "total_score"])
+
+ top_scorers = [TopScorer(ts.rank, ts.player_id, html_colors(ts.nick), ts.total_score)
+ for ts in self.top_scorers]
+ return top_scorers
+
def json(self):
"""For rendering this data using JSON."""
top_scorers = [{
+ "rank": ts.rank,
"player_id": ts.player_id,
"nick": ts.nick,
- "score": ts[2],
+ "score": ts.total_score,
} for ts in self.top_scorers]
return top_scorers
class ServerTopPlayers(ServerInfoBase):
"""Returns the top players by playing time on a given server."""
- def __init__(self, request, limit=None, last=None):
+ def __init__(self, request, limit=LEADERBOARD_COUNT, last=None):
"""Common parameter parsing."""
super(ServerTopPlayers, self).__init__(request, limit, last)
self.top_players = self.raw()
def raw(self):
"""Top players on this server by total playing time."""
try:
- top_players_q = DBSession.query(Player.player_id, Player.nick,
- func.sum(PlayerGameStat.alivetime))\
+ top_players_q = DBSession.query(
+ fg.row_number().over(
+ order_by=expr.desc(func.sum(PlayerGameStat.alivetime))).label("rank"),
+ Player.player_id, Player.nick,
+ func.sum(PlayerGameStat.alivetime).label("alivetime"))\
.filter(Player.player_id == PlayerGameStat.player_id)\
.filter(Game.game_id == PlayerGameStat.game_id)\
.filter(Game.server_id == self.server_id)\
top_players = top_players_q.all()
- except:
- top_players = None
+ except Exception as e:
+ log.debug(e)
+ raise HTTPNotFound
+
+ return top_players
+
+ def html(self):
+ """Returns the HTML-ready representation."""
+ TopPlayer = namedtuple("TopPlayer", ["rank", "player_id", "nick", "alivetime"])
+
+ top_players = [TopPlayer(tp.rank, tp.player_id, html_colors(tp.nick), tp.alivetime)
+ for tp in self.top_players]
return top_players
def json(self):
"""For rendering this data using JSON."""
top_players = [{
+ "rank": ts.rank,
"player_id": ts.player_id,
"nick": ts.nick,
- "time": ts[2].total_seconds(),
+ "time": ts.alivetime.total_seconds(),
} for ts in self.top_players]
return top_players
def html(self):
"""For rendering this data using something HTML-based."""
- server_info = self.raw()
-
- # convert the nick into HTML for both scorers and players
- server_info["top_scorers"] = [(player_id, html_colors(nick), score)
- for (player_id, nick, score) in server_info["top_scorers"]]
-
- server_info["top_players"] = [(player_id, html_colors(nick), score)
- for (player_id, nick, score) in server_info["top_players"]]
-
- return server_info
+ return {
+ 'server': self.server,
+ 'top_players': self.top_players_v.html(),
+ 'top_scorers': self.top_scorers_v.html(),
+ 'top_maps': self.top_maps_v.html(),
+ 'recent_games': self.recent_games,
+ 'lifetime': self.lifetime,
+ }
def json(self):
"""For rendering this data using JSON."""
-
return {
'server': self.server.to_dict(),
'top_players': self.top_players_v.json(),
projects / xonotic / xonstat.git / blobdiff