]> de.git.xonotic.org Git - xonotic/xonstat.git/blobdiff - xonstat/views/map.py
Return actual data in the /map/<map id> JSON views.
[xonotic/xonstat.git] / xonstat / views / map.py
index f1daf4aabe7f57c385ce1a0a1511fa9fe8e22773..75c3373359f95ce7ccb212f671cad7ed46b232c9 100644 (file)
@@ -5,6 +5,7 @@ from datetime import datetime, timedelta
 import sqlalchemy.sql.expression as expr
 import sqlalchemy.sql.functions as func
 from pyramid.httpexceptions import HTTPNotFound
+from sqlalchemy import func as fg
 from webhelpers.paginate import Page
 from xonstat.models import DBSession, Server, Map, Game, PlayerGameStat, Player, PlayerCaptime
 from xonstat.models.map import MapCapTime
@@ -15,6 +16,7 @@ log = logging.getLogger(__name__)
 
 # Defaults
 INDEX_COUNT = 20
+LEADERBOARD_LIFETIME = 30
 
 
 class MapIndex(object):
@@ -23,16 +25,21 @@ class MapIndex(object):
     def __init__(self, request):
         """Common parameter parsing."""
         self.request = request
-        self.page = request.params.get("page", 1)
+        self.last = request.params.get("last", None)
 
-        # all views share this data, so we'll precalculate
+        # all views share this data, so we'll pre-calculate
         self.maps = self.map_index()
 
     def map_index(self):
         """Returns the raw data shared by all renderers."""
         try:
-            map_q = DBSession.query(Map).order_by(Map.map_id.desc())
-            maps = Page(map_q, self.page, items_per_page=INDEX_COUNT, url=page_url)
+            map_q = DBSession.query(Map)
+
+            if self.last:
+                map_q = map_q.filter(Map.map_id < self.last)
+
+            map_q = map_q.order_by(Map.map_id.desc()).limit(INDEX_COUNT)
+            maps = map_q.all()
 
         except Exception as e:
             log.debug(e)
@@ -42,14 +49,254 @@ class MapIndex(object):
 
     def html(self):
         """For rendering this data using something HTML-based."""
+        # build the query string
+        query = {}
+        if len(self.maps) > 1:
+            query['last'] = self.maps[-1].map_id
+
         return {
             'maps': self.maps,
+            'query': query,
         }
 
     def json(self):
         """For rendering this data using JSON."""
         return {
             'maps': [m.to_dict() for m in self.maps],
+            'last': self.last,
+        }
+
+
+class MapInfoBase(object):
+    """Base class for all map-based views with a map_id parameter in them."""
+
+    def __init__(self, request, limit=None, last=None):
+        """Common parameter parsing."""
+        self.request = request
+        self.map_id = request.matchdict.get("id", None)
+
+        raw_lifetime = request.registry.settings.get('xonstat.leaderboard_lifetime',
+                                                     LEADERBOARD_LIFETIME)
+        self.lifetime = int(raw_lifetime)
+
+        self.limit = request.params.get("limit", limit)
+        self.last = request.params.get("last", last)
+        self.now = datetime.utcnow()
+
+
+class MapTopScorers(MapInfoBase):
+    """Returns the top scorers on a given map."""
+
+    def __init__(self, request, limit=INDEX_COUNT, last=None):
+        """Common parameter parsing."""
+        super(MapTopScorers, self).__init__(request, limit, last)
+        self.top_scorers = self.get_top_scorers()
+
+    def get_top_scorers(self):
+        """Top players by score. Shared by all renderers."""
+        cutoff = self.now - timedelta(days=self.lifetime)
+
+        try:
+            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.map_id == self.map_id)\
+                .filter(Player.player_id > 2)\
+                .filter(PlayerGameStat.create_dt > cutoff)\
+                .order_by(expr.desc(func.sum(PlayerGameStat.score)))\
+                .group_by(Player.nick)\
+                .group_by(Player.player_id)
+
+            if self.last:
+                top_scorers_q = top_scorers_q.offset(self.last)
+
+            if self.limit:
+                top_scorers_q = top_scorers_q.limit(self.limit)
+
+            top_scorers = top_scorers_q.all()
+
+            return top_scorers
+        except Exception as e:
+            log.debug(e)
+            raise HTTPNotFound
+
+    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]
+
+        # build the query string
+        query = {}
+        if len(top_scorers) > 1:
+            query['last'] = top_scorers[-1].rank
+
+        return {
+            "map_id": self.map_id,
+            "top_scorers": top_scorers,
+            "lifetime": self.lifetime,
+            "query": query,
+        }
+
+    def json(self):
+        """For rendering this data using JSON."""
+        top_scorers = [{
+            "rank": ts.rank,
+            "player_id": ts.player_id,
+            "nick": ts.nick,
+            "score": ts.total_score,
+        } for ts in self.top_scorers]
+
+        return {
+            "map_id": self.map_id,
+            "top_scorers": top_scorers,
+        }
+
+
+class MapTopPlayers(MapInfoBase):
+    """Returns the top players by time on a given map."""
+
+    def __init__(self, request, limit=INDEX_COUNT, last=None):
+        """Common parameter parsing."""
+        super(MapTopPlayers, self).__init__(request, limit, last)
+        self.top_players = self.get_top_players()
+
+    def get_top_players(self):
+        """Top players by score. Shared by all renderers."""
+        cutoff = self.now - timedelta(days=self.lifetime)
+
+        try:
+            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.map_id == self.map_id)\
+                .filter(Player.player_id > 2)\
+                .filter(PlayerGameStat.create_dt > cutoff)\
+                .order_by(expr.desc(func.sum(PlayerGameStat.alivetime)))\
+                .group_by(Player.nick)\
+                .group_by(Player.player_id)
+
+            if self.last:
+                top_players_q = top_players_q.offset(self.last)
+
+            if self.limit:
+                top_players_q = top_players_q.limit(self.limit)
+
+            top_players = top_players_q.all()
+
+            return top_players
+        except Exception as e:
+            log.debug(e)
+            raise HTTPNotFound
+
+    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]
+
+        # build the query string
+        query = {}
+        if len(top_players) > 1:
+            query['last'] = top_players[-1].rank
+
+        return {
+            "map_id": self.map_id,
+            "top_players": top_players,
+            "lifetime": self.lifetime,
+            "last": query.get("last", None),
+            "query": query,
+        }
+
+    def json(self):
+        """For rendering this data using JSON."""
+        top_players = [{
+            "rank": ts.rank,
+            "player_id": ts.player_id,
+            "nick": ts.nick,
+            "time": ts.alivetime.total_seconds(),
+        } for ts in self.top_players]
+
+        return {
+            "map_id": self.map_id,
+            "top_players": top_players,
+        }
+
+
+class MapTopServers(MapInfoBase):
+    """Returns the top servers by the number of times they've played a given map."""
+
+    def __init__(self, request, limit=INDEX_COUNT, last=None):
+        """Common parameter parsing."""
+        super(MapTopServers, self).__init__(request, limit, last)
+        self.top_servers = self.get_top_servers()
+
+    def get_top_servers(self):
+        """Top servers by the number of times they have played the map. Shared by all renderers."""
+        cutoff = self.now - timedelta(days=self.lifetime)
+
+        try:
+            top_servers_q = DBSession.query(
+                fg.row_number().over(order_by=expr.desc(func.count(Game.game_id))).label("rank"),
+                Server.server_id, Server.name, func.count(Game.game_id).label("games"))\
+                .filter(Game.server_id == Server.server_id)\
+                .filter(Game.map_id == self.map_id)\
+                .filter(Game.create_dt > cutoff)\
+                .order_by(expr.desc(func.count(Game.game_id)))\
+                .group_by(Server.name)\
+                .group_by(Server.server_id)
+
+            if self.last:
+                top_servers_q = top_servers_q.offset(self.last)
+
+            if self.limit:
+                top_servers_q = top_servers_q.limit(self.limit)
+
+            top_servers = top_servers_q.all()
+
+            return top_servers
+        except Exception as e:
+            log.debug(e)
+            raise HTTPNotFound
+
+    def html(self):
+        """Returns the HTML-ready representation."""
+        TopServer = namedtuple("TopServer", ["rank", "server_id", "server_name", "games"])
+
+        top_servers = [TopServer(ts.rank, ts.server_id, ts.name, ts.games)
+                       for ts in self.top_servers]
+
+        # build the query string
+        query = {}
+        if len(top_servers) > 1:
+            query['last'] = top_servers[-1].rank
+
+        return {
+            "map_id": self.map_id,
+            "top_servers": top_servers,
+            "lifetime": self.lifetime,
+            "last": query.get("last", None),
+            "query": query,
+        }
+
+    def json(self):
+        """For rendering this data using JSON."""
+        top_servers = [{
+            "rank": ts.rank,
+            "server_id": ts.server_id,
+            "server_name": ts.server_name,
+            "games": ts.games,
+        } for ts in self.top_servers]
+
+        return {
+            "map_id": self.map_id,
+            "top_servers": top_servers,
         }
 
 
@@ -89,8 +336,8 @@ def _map_info_data(request):
                 group_by(Player.nick).\
                 group_by(Player.player_id).all()[0:leaderboard_count]
 
-        top_scorers = [(player_id, html_colors(nick), score) \
-                for (player_id, nick, score) in top_scorers]
+        top_scorers = [(player_id, html_colors(nick), score, nick)
+                       for (player_id, nick, score) in top_scorers]
 
         # top players by playing time
         top_players = DBSession.query(Player.player_id, Player.nick,
@@ -105,8 +352,8 @@ def _map_info_data(request):
                 group_by(Player.nick).\
                 group_by(Player.player_id).all()[0:leaderboard_count]
 
-        top_players = [(player_id, html_colors(nick), score) \
-                for (player_id, nick, score) in top_players]
+        top_players = [(player_id, html_colors(nick), score, nick)
+                       for (player_id, nick, score) in top_players]
 
         # top servers using/playing this map
         top_servers = DBSession.query(Server.server_id, Server.name,
@@ -169,7 +416,45 @@ def map_info_json(request):
     """
     List the information stored about a given map. JSON.
     """
-    return [{'status':'not implemented'}]
+    data = _map_info_data(request)
+
+    # convert the top scorers to a dict
+    def top_scorers_dict(tp):
+        return {
+            "player_id": tp[0],
+            "nick": tp[3],
+            "score": tp[2],
+        }
+
+    top_scorers = [top_scorers_dict(ts) for ts in data["top_scorers"]]
+
+    # convert the top players to a dict
+    def top_players_dict(tp):
+        return {
+            "player_id": tp[0],
+            "nick": tp[3],
+            "alivetime": tp[2].total_seconds(),
+        }
+
+    top_players = [top_players_dict(tp) for tp in data["top_players"]]
+
+    def top_servers_dict(ts):
+        return {
+            "server_id": ts[0],
+            "server_name": ts[1],
+            "games": ts[2],
+        }
+
+    top_servers = [top_servers_dict(ts) for ts in data["top_servers"]]
+
+    return {
+        'map': data["gmap"].to_dict(),
+        'recent_games': [rg.to_dict() for rg in data["recent_games"]],
+        'top_scorers': top_scorers,
+        'top_players': top_players,
+        'top_servers':top_servers,
+        # 'captimes':captimes,
+    }
 
 
 def map_captimes_data(request):
@@ -193,7 +478,7 @@ def map_captimes_data(request):
                 order_by(expr.asc(PlayerCaptime.fastest_cap))
 
     except Exception as e:
-        raise httpexceptions.HTTPNotFound
+        raise HTTPNotFound
 
     map_captimes = Page(mct_q, current_page, items_per_page=20, url=page_url)