]> de.git.xonotic.org Git - xonotic/xonstat.git/blobdiff - xonstat/views/player.py
Implemented some (preliminary) JSON API to retrieve player data
[xonotic/xonstat.git] / xonstat / views / player.py
old mode 100755 (executable)
new mode 100644 (file)
index 7fcfd62..a783785
-import datetime\r
-import logging\r
-import re\r
-import sqlalchemy as sa\r
-import time\r
-from pyramid.response import Response\r
-from pyramid.url import current_route_url\r
-from sqlalchemy import desc\r
-from webhelpers.paginate import Page, PageURL\r
-from xonstat.models import *\r
-from xonstat.util import page_url\r
-\r
-log = logging.getLogger(__name__)\r
-\r
-\r
-def player_index(request):\r
-    """\r
-    Provides a list of all the current players. \r
-    """\r
-    if 'page' in request.matchdict:\r
-        current_page = int(request.matchdict['page'])\r
-    else:\r
-        current_page = 1\r
-\r
-    try:\r
-        player_q = DBSession.query(Player).\\r
-                filter(Player.player_id > 2).\\r
-                filter(Player.active_ind == True).\\r
-                filter(sa.not_(Player.nick.like('Anonymous Player%'))).\\r
-                order_by(Player.player_id.desc())\r
-\r
-        players = Page(player_q, current_page, items_per_page=10, url=page_url)\r
-\r
-        last_linked_page = current_page + 4\r
-        if last_linked_page > players.last_page:\r
-            last_linked_page = players.last_page\r
-\r
-        pages_to_link = range(current_page+1, last_linked_page+1)\r
-\r
-    except Exception as e:\r
-        players = None\r
-        raise e\r
-\r
-    return {'players':players,\r
-            'pages_to_link':pages_to_link,\r
-            }\r
-\r
-\r
-def player_info(request):\r
-    """\r
-    Provides detailed information on a specific player\r
-    """\r
-    player_id = int(request.matchdict['id'])\r
-    if player_id <= 2:\r
-        player_id = -1;\r
-\r
-    try:\r
-        player = DBSession.query(Player).filter_by(player_id=player_id).\\r
-                filter(Player.active_ind == True).one()\r
-\r
-        elos = DBSession.query(PlayerElo).filter_by(player_id=player_id).\\r
-                filter(PlayerElo.game_type_cd.in_(['ctf','duel','dm'])).\\r
-                order_by(PlayerElo.elo.desc()).all()\r
-\r
-        elos_display = []\r
-        for elo in elos:\r
-            if elo.games > 32:\r
-                str = "{0} ({1})"\r
-            else:\r
-                str = "{0}* ({1})"\r
-\r
-            elos_display.append(str.format(round(elo.elo, 3),\r
-                elo.game_type_cd))\r
-\r
-        weapon_stats = DBSession.query("descr", "weapon_cd", "actual_total", \r
-                "max_total", "hit_total", "fired_total", "frags_total").\\r
-                from_statement(\r
-                    "select cw.descr, cw.weapon_cd, sum(actual) actual_total, "\r
-                    "sum(max) max_total, sum(hit) hit_total, "\r
-                    "sum(fired) fired_total, sum(frags) frags_total "\r
-                    "from player_weapon_stats ws, cd_weapon cw "\r
-                    "where ws.weapon_cd = cw.weapon_cd "\r
-                    "and player_id = :player_id "\r
-                    "group by descr, cw.weapon_cd "\r
-                    "order by descr"\r
-                ).params(player_id=player_id).all()\r
-\r
-        recent_games = DBSession.query(PlayerGameStat, Game, Server, Map).\\r
-                filter(PlayerGameStat.player_id == player_id).\\r
-                filter(PlayerGameStat.game_id == Game.game_id).\\r
-                filter(Game.server_id == Server.server_id).\\r
-                filter(Game.map_id == Map.map_id).\\r
-                order_by(Game.game_id.desc())[0:10]\r
-\r
-        game_stats = {}\r
-        (game_stats['avg_rank'], game_stats['total_kills'], \r
-                game_stats['total_deaths'], game_stats['total_suicides'], \r
-                game_stats['total_score'], game_stats['total_time'], \r
-                game_stats['total_held'], game_stats['total_captures'], \r
-                game_stats['total_pickups'],game_stats['total_drops'], \r
-                game_stats['total_returns'], game_stats['total_collects'], \r
-                game_stats['total_destroys'], game_stats['total_dhk'], \r
-                game_stats['total_pushes'], game_stats['total_pushed'], \r
-                game_stats['total_carrier_frags'], \r
-                game_stats['total_alivetime'],\r
-                game_stats['total_games_played']) = DBSession.\\r
-                        query("avg_rank", "total_kills", "total_deaths", \r
-                "total_suicides", "total_score", "total_time", "total_held",\r
-                "total_captures", "total_pickups", "total_drops", \r
-                "total_returns", "total_collects", "total_destroys", \r
-                "total_dhk", "total_pushes", "total_pushed", \r
-                "total_carrier_frags", "total_alivetime", \r
-                "total_games_played").\\r
-                from_statement(\r
-                    "select round(avg(rank)) avg_rank, sum(kills) total_kills, "\r
-                    "sum(deaths) total_deaths, sum(suicides) total_suicides, "\r
-                    "sum(score) total_score, sum(time) total_time, "\r
-                    "sum(held) total_held, sum(captures) total_captures, "\r
-                    "sum(pickups) total_pickups, sum(drops) total_drops, "\r
-                    "sum(returns) total_returns, sum(collects) total_collects, "\r
-                    "sum(destroys) total_destroys, sum(destroys_holding_key) total_dhk, "\r
-                    "sum(pushes) total_pushes, sum(pushed) total_pushed, "\r
-                    "sum(carrier_frags) total_carrier_frags, "\r
-                    "sum(alivetime) total_alivetime, count(*) total_games_played "\r
-                    "from player_game_stats "\r
-                    "where player_id=:player_id"\r
-                ).params(player_id=player_id).one()\r
-\r
-        for (key,value) in game_stats.items():\r
-            if value == None:\r
-                game_stats[key] = '-'\r
-\r
-    except Exception as e:\r
-        player = None\r
-        elos_display = None\r
-        weapon_stats = None\r
-        game_stats = None\r
-        recent_games = None\r
-\r
-    return {'player':player, \r
-            'elos_display':elos_display,\r
-            'recent_games':recent_games,\r
-            'weapon_stats':weapon_stats,\r
-            'game_stats':game_stats}\r
-\r
-\r
-def player_game_index(request):\r
-    """\r
-    Provides an index of the games in which a particular\r
-    player was involved. This is ordered by game_id, with\r
-    the most recent game_ids first. Paginated.\r
-    """\r
-    player_id = request.matchdict['player_id']\r
-\r
-    if 'page' in request.matchdict:\r
-        current_page = request.matchdict['page']\r
-    else:\r
-        current_page = 1\r
-\r
-    try:\r
-        games_q = DBSession.query(Game, Server, Map).\\r
-            filter(PlayerGameStat.game_id == Game.game_id).\\r
-            filter(PlayerGameStat.player_id == player_id).\\r
-            filter(Game.server_id == Server.server_id).\\r
-            filter(Game.map_id == Map.map_id).\\r
-            order_by(Game.game_id.desc())\r
-\r
-        games = Page(games_q, current_page, url=page_url)\r
-\r
-        pgstats = {}\r
-        for (game, server, map) in games:\r
-            pgstats[game.game_id] = DBSession.query(PlayerGameStat).\\r
-                    filter(PlayerGameStat.game_id == game.game_id).\\r
-                    order_by(PlayerGameStat.rank).\\r
-                    order_by(PlayerGameStat.score).all()\r
-\r
-    except Exception as e:\r
-        player = None\r
-        games = None\r
-\r
-    return {'player_id':player_id,\r
-            'games':games,\r
-            'pgstats':pgstats}\r
+import datetime
+import json
+import logging
+import re
+import sqlalchemy as sa
+import sqlalchemy.sql.functions as func
+import time
+from pyramid.response import Response
+from pyramid.url import current_route_url
+from sqlalchemy import desc, distinct
+from webhelpers.paginate import Page, PageURL
+from xonstat.models import *
+from xonstat.util import page_url, datetime_seconds
+
+log = logging.getLogger(__name__)
+
+
+def player_index_data(request):
+    if request.params.has_key('page'):
+        current_page = request.params['page']
+    else:
+        current_page = 1
+
+    try:
+        player_q = DBSession.query(Player).\
+                filter(Player.player_id > 2).\
+                filter(Player.active_ind == True).\
+                filter(sa.not_(Player.nick.like('Anonymous Player%'))).\
+                order_by(Player.player_id.desc())
+
+        players = Page(player_q, current_page, items_per_page=10, url=page_url)
+
+    except Exception as e:
+        players = None
+        raise e
+
+    return {'players':players
+           }
+
+
+def player_index(request):
+    """
+    Provides a list of all the current players.
+    """
+    return player_index_data(request)
+
+
+def player_index_json(request):
+    """
+    Provides a list of all the current players. JSON.
+    """
+    return [{'status':'not implemented'}]
+
+
+def _get_games_played(player_id):
+    """
+    DEPRECATED: Now included in _get_total_stats()
+    
+    Provides a breakdown by gametype of the games played by player_id.
+
+    Returns a tuple containing (total_games, games_breakdown), where
+    total_games is the absolute number of games played by player_id
+    and games_breakdown is an array containing (game_type_cd, # games)
+    """
+    games_played = DBSession.query(Game.game_type_cd, func.count()).\
+            filter(Game.game_id == PlayerGameStat.game_id).\
+            filter(PlayerGameStat.player_id == player_id).\
+            group_by(Game.game_type_cd).\
+            order_by(func.count().desc()).all()
+
+    total = 0
+    for (game_type_cd, games) in games_played:
+        total += games
+
+    return (total, games_played)
+
+
+def _get_total_stats(player_id):
+    """
+    Provides aggregated stats by player_id.
+
+    Returns a dict with the keys 'kills', 'deaths', 'alivetime'.
+
+    games = how many games a player has played
+    games_breakdown = how many games of given type a player has played (dictionary)
+    games_alivetime = how many time a player has spent in a give game type (dictionary)
+    kills = how many kills a player has over all games
+    deaths = how many deaths a player has over all games
+    suicides = how many suicides a player has over all games
+    alivetime = how long a player has played over all games
+    alivetime_week = how long a player has played over all games in the last week
+    alivetime_month = how long a player has played over all games in the last month
+    wins = how many games a player has won
+
+    If any of the above are None, they are set to 0.
+    """
+    # 7 and 30 day windows
+    one_week_ago  = datetime.datetime.utcnow() - datetime.timedelta(days=7)
+    one_month_ago = datetime.datetime.utcnow() - datetime.timedelta(days=30)
+
+    total_stats = {}
+
+    games_played = DBSession.query(
+            Game.game_type_cd, func.count(), func.sum(PlayerGameStat.alivetime)).\
+            filter(Game.game_id == PlayerGameStat.game_id).\
+            filter(PlayerGameStat.player_id == player_id).\
+            group_by(Game.game_type_cd).\
+            order_by(func.count().desc()).\
+            all()
+
+    total_stats['games'] = 0
+    total_stats['games_breakdown'] = {}  # this is a dictionary inside a dictionary .. dictception?
+    total_stats['games_alivetime'] = {}
+    for (game_type_cd, games, alivetime) in games_played:
+        total_stats['games'] += games
+        total_stats['games_breakdown'][game_type_cd] = games
+        total_stats['games_alivetime'][game_type_cd] = alivetime
+
+     # more fields can be added here, e.g. 'collects' for kh games
+    (total_stats['kills'], total_stats['deaths'], total_stats['suicides'],
+     total_stats['alivetime'],) = DBSession.query(
+            func.sum(PlayerGameStat.kills),
+            func.sum(PlayerGameStat.deaths),
+            func.sum(PlayerGameStat.suicides),
+            func.sum(PlayerGameStat.alivetime)).\
+            filter(PlayerGameStat.player_id == player_id).\
+            one()
+
+    (total_stats['alivetime_week'],) = DBSession.query(
+            func.sum(PlayerGameStat.alivetime)).\
+            filter(PlayerGameStat.player_id == player_id).\
+            filter(PlayerGameStat.create_dt > one_week_ago).\
+            one()
+
+    (total_stats['alivetime_month'],) = DBSession.query(
+            func.sum(PlayerGameStat.alivetime)).\
+            filter(PlayerGameStat.player_id == player_id).\
+            filter(PlayerGameStat.create_dt > one_month_ago).\
+            one()
+
+    (total_stats['wins'],) = DBSession.\
+            query("total_wins").\
+            from_statement(
+                "select count(*) total_wins "
+                "from games g, player_game_stats pgs "
+                "where g.game_id = pgs.game_id "
+                "and player_id=:player_id "
+                "and (g.winner = pgs.team or pgs.rank = 1)"
+            ).params(player_id=player_id).one()
+
+#    (total_stats['wins'],) = DBSession.query(
+#            func.count("*")).\
+#            filter(Game.game_id == PlayerGameStat.game_id).\
+#            filter(PlayerGameStat.player_id == player_id).\
+#            filter(Game.winner == PlayerGameStat.team or PlayerGameStat.rank == 1).\
+#            one()
+
+    (total_stats['duel_wins'],) = DBSession.query(
+            func.count("*")).\
+            filter(Game.game_id == PlayerGameStat.game_id).\
+            filter(Game.game_type_cd == "duel").\
+            filter(PlayerGameStat.player_id == player_id).\
+            filter(PlayerGameStat.rank == 1).\
+            one()
+
+    (total_stats['duel_kills'], total_stats['duel_deaths'], total_stats['duel_suicides'],) = DBSession.query(
+            func.sum(PlayerGameStat.kills),
+            func.sum(PlayerGameStat.deaths),
+            func.sum(PlayerGameStat.suicides)).\
+            filter(Game.game_id == PlayerGameStat.game_id).\
+            filter(Game.game_type_cd == "duel").\
+            filter(PlayerGameStat.player_id == player_id).\
+            one()
+
+    (total_stats['dm_wins'],) = DBSession.query(
+            func.count("*")).\
+            filter(Game.game_id == PlayerGameStat.game_id).\
+            filter(Game.game_type_cd == "dm").\
+            filter(PlayerGameStat.player_id == player_id).\
+            filter(PlayerGameStat.rank == 1).\
+            one()
+
+    (total_stats['dm_kills'], total_stats['dm_deaths'], total_stats['dm_suicides'],) = DBSession.query(
+            func.sum(PlayerGameStat.kills),
+            func.sum(PlayerGameStat.deaths),
+            func.sum(PlayerGameStat.suicides)).\
+            filter(Game.game_id == PlayerGameStat.game_id).\
+            filter(Game.game_type_cd == "dm").\
+            filter(PlayerGameStat.player_id == player_id).\
+            one()
+
+    (total_stats['tdm_kills'], total_stats['tdm_deaths'], total_stats['tdm_suicides'],) = DBSession.query(
+            func.sum(PlayerGameStat.kills),
+            func.sum(PlayerGameStat.deaths),
+            func.sum(PlayerGameStat.suicides)).\
+            filter(Game.game_id == PlayerGameStat.game_id).\
+            filter(Game.game_type_cd == "tdm").\
+            filter(PlayerGameStat.player_id == player_id).\
+            one()
+
+    (total_stats['tdm_wins'],) = DBSession.query(
+            func.count("*")).\
+            filter(Game.game_id == PlayerGameStat.game_id).\
+            filter(Game.game_type_cd == "tdm").\
+            filter(PlayerGameStat.player_id == player_id).\
+            filter(PlayerGameStat.rank == 1).\
+            one()
+
+    (total_stats['ctf_wins'],) = DBSession.query(
+            func.count("*")).\
+            filter(Game.game_id == PlayerGameStat.game_id).\
+            filter(Game.game_type_cd == "ctf").\
+            filter(PlayerGameStat.player_id == player_id).\
+            filter(PlayerGameStat.rank == 1).\
+            one()
+
+    (total_stats['ctf_caps'], total_stats['ctf_pickups'], total_stats['ctf_drops'],
+     total_stats['ctf_returns'], total_stats['ctf_fckills'],) = DBSession.query(
+            func.sum(PlayerGameStat.captures),
+            func.sum(PlayerGameStat.pickups),
+            func.sum(PlayerGameStat.drops),
+            func.sum(PlayerGameStat.returns),
+            func.sum(PlayerGameStat.carrier_frags)).\
+            filter(Game.game_id == PlayerGameStat.game_id).\
+            filter(Game.game_type_cd == "ctf").\
+            filter(PlayerGameStat.player_id == player_id).\
+            one()
+
+    for (key,value) in total_stats.items():
+        if value == None:
+            total_stats[key] = 0
+
+    return total_stats
+
+
+def _get_fav_map(player_id):
+    """
+    Get the player's favorite map. The favorite map is defined
+    as the map that he or she has played the most in the past 
+    90 days.
+
+    Returns a dictionary with keys for the map's name and id.
+    """
+    # 90 day window
+    back_then = datetime.datetime.utcnow() - datetime.timedelta(days=90)
+
+    raw_fav_map = DBSession.query(Map.name, Map.map_id).\
+            filter(Game.game_id == PlayerGameStat.game_id).\
+            filter(Game.map_id == Map.map_id).\
+            filter(PlayerGameStat.player_id == player_id).\
+            filter(PlayerGameStat.create_dt > back_then).\
+            group_by(Map.name, Map.map_id).\
+            order_by(func.count().desc()).\
+            limit(5).all()
+
+    fav_map = []
+    for map_e in raw_fav_map:
+        entry = {}
+        entry['name'] = map_e[0]
+        entry['id']   = map_e[1]
+        fav_map.append(entry)
+
+    return fav_map
+
+
+def _get_fav_weapon(player_id):
+    """
+    Get the player's favorite weapon. The favorite weapon is defined
+    as the weapon that he or she has employed the most in the past 
+    90 days.
+
+    Returns a sequence of dictionaries with keys for the weapon's name and id.
+    The sequence holds the most-used weapons in decreasing order.
+    """
+    # 90 day window
+    back_then = datetime.datetime.utcnow() - datetime.timedelta(days=90)
+
+    raw_fav_weapon = DBSession.query(Weapon.descr, Weapon.weapon_cd).\
+            filter(Game.game_id == PlayerWeaponStat.game_id).\
+            filter(PlayerWeaponStat.player_id == player_id).\
+            filter(PlayerWeaponStat.weapon_cd == Weapon.weapon_cd).\
+            filter(PlayerWeaponStat.create_dt > back_then).\
+            group_by(Weapon.descr, Weapon.weapon_cd).\
+            order_by(func.count().desc()).\
+            limit(5).all()
+
+    fav_weapon = []
+    for wpn_e in raw_fav_weapon:
+        entry = {}
+        entry['name'] = wpn_e[0]
+        entry['id']   = wpn_e[1]
+        fav_weapon.append(entry)
+
+    return fav_weapon
+
+
+def _get_fav_server(player_id):
+    """
+    Get the player's favorite server. The favorite server is defined
+    as the server that he or she has played on the most in the past 
+    90 days.
+
+    Returns a sequence of dictionaries with keys for the server's name and id.
+    The sequence holds the most-used servers in decreasing order.
+    """
+    # 90 day window
+    back_then = datetime.datetime.utcnow() - datetime.timedelta(days=90)
+
+    raw_fav_server = DBSession.query(Server.name, Server.server_id).\
+            filter(Game.game_id == PlayerGameStat.game_id).\
+            filter(Game.server_id == Server.server_id).\
+            filter(PlayerGameStat.player_id == player_id).\
+            filter(PlayerGameStat.create_dt > back_then).\
+            group_by(Server.name, Server.server_id).\
+            order_by(func.count().desc()).\
+            limit(5).all()
+
+    fav_server = []
+    for srv_e in raw_fav_server:
+        entry = {}
+        entry['name'] = srv_e[0]
+        entry['id']   = srv_e[1]
+        fav_server.append(entry)
+
+    return fav_server
+
+
+def _get_rank(player_id):
+    """
+    Get the player's rank as well as the total number of ranks.
+    """
+    rank = DBSession.query("game_type_cd", "rank", "max_rank").\
+            from_statement(
+                "select pr.game_type_cd, pr.rank, overall.max_rank "
+                "from player_ranks pr,  "
+                   "(select game_type_cd, max(rank) max_rank "
+                    "from player_ranks  "
+                    "group by game_type_cd) overall "
+                "where pr.game_type_cd = overall.game_type_cd  "
+                "and player_id = :player_id "
+                "order by rank").\
+            params(player_id=player_id).all()
+
+    return rank;
+
+
+def get_accuracy_stats(player_id, weapon_cd, games):
+    """
+    Provides accuracy for weapon_cd by player_id for the past N games.
+    """
+    # Reaching back 90 days should give us an accurate enough average
+    # We then multiply this out for the number of data points (games) to
+    # create parameters for a flot graph
+    try:
+        raw_avg = DBSession.query(func.sum(PlayerWeaponStat.hit),
+                func.sum(PlayerWeaponStat.fired)).\
+                filter(PlayerWeaponStat.player_id == player_id).\
+                filter(PlayerWeaponStat.weapon_cd == weapon_cd).\
+                one()
+
+        avg = round(float(raw_avg[0])/raw_avg[1]*100, 2)
+
+        # Determine the raw accuracy (hit, fired) numbers for $games games
+        # This is then enumerated to create parameters for a flot graph
+        raw_accs = DBSession.query(PlayerWeaponStat.game_id, 
+            PlayerWeaponStat.hit, PlayerWeaponStat.fired).\
+                filter(PlayerWeaponStat.player_id == player_id).\
+                filter(PlayerWeaponStat.weapon_cd == weapon_cd).\
+                order_by(PlayerWeaponStat.game_id.desc()).\
+                limit(games).\
+                all()
+
+        # they come out in opposite order, so flip them in the right direction
+        raw_accs.reverse()
+
+        accs = []
+        for i in range(len(raw_accs)):
+            accs.append((raw_accs[i][0], round(float(raw_accs[i][1])/raw_accs[i][2]*100, 2)))
+    except:
+        accs = []
+        avg = 0.0
+
+    return (avg, accs)
+
+
+def get_damage_stats(player_id, weapon_cd, games):
+    """
+    Provides damage info for weapon_cd by player_id for the past N games.
+    """
+    try:
+        raw_avg = DBSession.query(func.sum(PlayerWeaponStat.actual),
+                func.sum(PlayerWeaponStat.hit)).\
+                filter(PlayerWeaponStat.player_id == player_id).\
+                filter(PlayerWeaponStat.weapon_cd == weapon_cd).\
+                one()
+
+        avg = round(float(raw_avg[0])/raw_avg[1], 2)
+
+        # Determine the damage efficiency (hit, fired) numbers for $games games
+        # This is then enumerated to create parameters for a flot graph
+        raw_dmgs = DBSession.query(PlayerWeaponStat.game_id, 
+            PlayerWeaponStat.actual, PlayerWeaponStat.hit).\
+                filter(PlayerWeaponStat.player_id == player_id).\
+                filter(PlayerWeaponStat.weapon_cd == weapon_cd).\
+                order_by(PlayerWeaponStat.game_id.desc()).\
+                limit(games).\
+                all()
+
+        # they come out in opposite order, so flip them in the right direction
+        raw_dmgs.reverse()
+
+        dmgs = []
+        for i in range(len(raw_dmgs)):
+            # try to derive, unless we've hit nothing then set to 0!
+            try:
+                dmg = round(float(raw_dmgs[i][1])/raw_dmgs[i][2], 2)
+            except:
+                dmg = 0.0
+
+            dmgs.append((raw_dmgs[i][0], dmg))
+    except Exception as e:
+        dmgs = []
+        avg = 0.0
+
+    return (avg, dmgs)
+
+
+def player_info_data(request):
+    player_id = int(request.matchdict['id'])
+    if player_id <= 2:
+        player_id = -1;
+
+    try:
+        player = DBSession.query(Player).filter_by(player_id=player_id).\
+                filter(Player.active_ind == True).one()
+
+        # games played, alivetime, wins, kills, deaths
+        total_stats = _get_total_stats(player.player_id)
+
+        # games breakdown - N games played (X ctf, Y dm) etc
+        # DEPRECATED: included in total_stats, see above
+        # (total_games, games_breakdown) = _get_games_played(player.player_id)
+
+        # favorite map from the past 90 days
+        try:
+            fav_map = _get_fav_map(player.player_id)
+        except:
+            fav_map = None
+
+        # favorite weapon from the past 90 days
+        try:
+            fav_weapon = _get_fav_weapon(player.player_id)
+        except:
+            fav_weapon = None
+
+        # favorite server from the past 90 days
+        try:
+            fav_server = _get_fav_server(player.player_id)
+        except:
+            fav_server = None
+
+        # friendly display of elo information and preliminary status
+        elos = DBSession.query(PlayerElo).filter_by(player_id=player_id).\
+                filter(PlayerElo.game_type_cd.in_(['ctf','duel','dm'])).\
+                order_by(PlayerElo.elo.desc()).all()
+
+        elos_display = []
+        elos_dict    = {}
+        for elo in elos:
+            if elo.games > 32:
+                str = "{0} ({1})"
+            else:
+                str = "{0}* ({1})"
+
+            elos_display.append(str.format(round(elo.elo, 3),
+                elo.game_type_cd))
+            elos_dict[elo.game_type_cd] = round(elo.elo, 3)
+        elos_display = ', '.join(elos_display)
+
+        # get current rank information
+        ranks = _get_rank(player_id)
+        
+        ranks_display = []
+        ranks_dict    = {}
+        for gtc,rank,max_rank in ranks:
+            ranks_display.append("{1} of {2} ({0})".format(gtc, rank, max_rank))
+            ranks_dict[gtc] = (rank, max_rank)
+        ranks_display = ', '.join(ranks_display)
+
+
+        # which weapons have been used in the past 90 days
+        # and also, used in 5 games or more?
+        back_then = datetime.datetime.utcnow() - datetime.timedelta(days=90)
+        recent_weapons = []
+        for weapon in DBSession.query(PlayerWeaponStat.weapon_cd, func.count()).\
+                filter(PlayerWeaponStat.player_id == player_id).\
+                filter(PlayerWeaponStat.create_dt > back_then).\
+                group_by(PlayerWeaponStat.weapon_cd).\
+                having(func.count() > 4).\
+                all():
+                    recent_weapons.append(weapon[0])
+
+        # recent games table, all data
+        recent_games = DBSession.query(PlayerGameStat, Game, Server, Map).\
+                filter(PlayerGameStat.player_id == player_id).\
+                filter(PlayerGameStat.game_id == Game.game_id).\
+                filter(Game.server_id == Server.server_id).\
+                filter(Game.map_id == Map.map_id).\
+                order_by(Game.game_id.desc())[0:10]
+
+    except Exception as e:
+        player = None
+        elos = None
+        elos_display = None
+        total_stats = None
+        recent_games = None
+        # DEPRECATED: included in total_stats, see above
+        #total_games = None
+        #games_breakdown = None
+        recent_weapons = []
+        fav_map = None
+        fav_weapon = None
+        fav_server = None
+        ranks = None
+        ranks_display = None;
+
+    return {'player':player,
+            'elos':elos_dict,
+            'elos_display':elos_display,
+            'recent_games':recent_games,
+            'total_stats':total_stats,
+            # DEPRECATED: included in total_stats, see above
+            #'total_games':total_games,
+            #'games_breakdown':games_breakdown,
+            'recent_weapons':recent_weapons,
+            'fav_map':fav_map,
+            'fav_weapon':fav_weapon,
+            'fav_server':fav_server,
+            'ranks':ranks_dict,
+            'ranks_display':ranks_display,
+            }
+
+
+def player_info(request):
+    """
+    Provides detailed information on a specific player
+    """
+    return player_info_data(request)
+
+
+def player_info_json(request):
+    """
+    Provides detailed information on a specific player. JSON.
+    """
+    player_info = player_info_data(request)
+    json_result = {
+        'player': {
+            'id':               player_info['player'].player_id,
+            'nick':             player_info['player'].nick.encode('utf-8'),
+            'stripped_nick':    player_info['player'].nick_strip_colors(),
+            'joined':           player_info['player'].create_dt.isoformat(),
+            },
+        'elos':         player_info['elos'],
+        'ranks':        player_info['ranks'],
+        'total_stats':  {
+                'games':            player_info['total_stats']['games'],
+                'games_breakdown':  player_info['total_stats']['games_breakdown'],
+                'alivetime':        datetime_seconds(player_info['total_stats']['alivetime']),
+                'kills':            player_info['total_stats']['kills'],
+                'deaths':           player_info['total_stats']['deaths'],
+                'suicides':         player_info['total_stats']['suicides'],
+                'wins':             player_info['total_stats']['wins'],
+                # FIXME - current "wins" query is flawed!
+                #'losses':           player_info['total_stats']['loses'],
+            },
+        'recent_games': [
+                {
+                    'game_id':      game.game_id,
+                    'game_type':    game.game_type_cd,
+                    'server':       server.name,
+                    'map':          map.name,
+                    'team':         gamestat.team,
+                    'rank':         gamestat.rank,
+                    'win':          ((gamestat.team != None and gamestat.team == game.winner)
+                                        or (gamestat.team == None and gamestat.rank == 1)),
+                    'time':         game.create_dt.isoformat(),
+                }
+                for (gamestat, game, server, map) in player_info['recent_games'][:5]
+            ],
+        }
+    print json_result
+    return json_result
+
+
+def player_game_index_data(request):
+    player_id = request.matchdict['player_id']
+
+    if request.params.has_key('page'):
+        current_page = request.params['page']
+    else:
+        current_page = 1
+
+    try:
+        games_q = DBSession.query(Game, Server, Map).\
+            filter(PlayerGameStat.game_id == Game.game_id).\
+            filter(PlayerGameStat.player_id == player_id).\
+            filter(Game.server_id == Server.server_id).\
+            filter(Game.map_id == Map.map_id).\
+            order_by(Game.game_id.desc())
+
+        games = Page(games_q, current_page, items_per_page=10, url=page_url)
+
+        pgstats = {}
+        for (game, server, map) in games:
+            pgstats[game.game_id] = DBSession.query(PlayerGameStat).\
+                    filter(PlayerGameStat.game_id == game.game_id).\
+                    order_by(PlayerGameStat.rank).\
+                    order_by(PlayerGameStat.score).all()
+
+    except Exception as e:
+        player = None
+        games = None
+
+    return {'player_id':player_id,
+            'games':games,
+            'pgstats':pgstats}
+
+
+def player_game_index(request):
+    """
+    Provides an index of the games in which a particular
+    player was involved. This is ordered by game_id, with
+    the most recent game_ids first. Paginated.
+    """
+    return player_game_index_data(request)
+
+
+def player_game_index_json(request):
+    """
+    Provides an index of the games in which a particular
+    player was involved. This is ordered by game_id, with
+    the most recent game_ids first. Paginated. JSON.
+    """
+    return [{'status':'not implemented'}]
+
+
+def player_accuracy_data(request):
+    player_id = request.matchdict['id']
+    allowed_weapons = ['nex', 'rifle', 'shotgun', 'uzi', 'minstanex']
+    weapon_cd = 'nex'
+    games = 20
+
+    if request.params.has_key('weapon'):
+        if request.params['weapon'] in allowed_weapons:
+            weapon_cd = request.params['weapon']
+
+    if request.params.has_key('games'):
+        try:
+            games = request.params['games']
+
+            if games < 0:
+                games = 20
+            if games > 50:
+                games = 50
+        except:
+            games = 20
+
+    (avg, accs) = get_accuracy_stats(player_id, weapon_cd, games)
+
+    # if we don't have enough data for the given weapon
+    if len(accs) < games:
+        games = len(accs)
+
+    return {
+            'player_id':player_id, 
+            'player_url':request.route_url('player_info', id=player_id), 
+            'weapon':weapon_cd, 
+            'games':games, 
+            'avg':avg, 
+            'accs':accs
+            }
+
+
+def player_accuracy(request):
+    """
+    Provides the accuracy for the given weapon. (JSON only)
+    """
+    return player_accuracy_data(request)
+
+
+def player_accuracy_json(request):
+    """
+    Provides a JSON response representing the accuracy for the given weapon.
+
+    Parameters:
+       weapon = which weapon to display accuracy for. Valid values are 'nex',
+                'shotgun', 'uzi', and 'minstanex'.
+       games = over how many games to display accuracy. Can be up to 50.
+    """
+    return player_accuracy_data(request)
+
+
+def player_damage_data(request):
+    player_id = request.matchdict['id']
+    allowed_weapons = ['grenadelauncher', 'electro', 'crylink', 'hagar',
+            'rocketlauncher', 'laser']
+    weapon_cd = 'rocketlauncher'
+    games = 20
+
+    if request.params.has_key('weapon'):
+        if request.params['weapon'] in allowed_weapons:
+            weapon_cd = request.params['weapon']
+
+    if request.params.has_key('games'):
+        try:
+            games = request.params['games']
+
+            if games < 0:
+                games = 20
+            if games > 50:
+                games = 50
+        except:
+            games = 20
+
+    (avg, dmgs) = get_damage_stats(player_id, weapon_cd, games)
+
+    # if we don't have enough data for the given weapon
+    if len(dmgs) < games:
+        games = len(dmgs)
+
+    return {
+            'player_id':player_id, 
+            'player_url':request.route_url('player_info', id=player_id), 
+            'weapon':weapon_cd, 
+            'games':games, 
+            'avg':avg, 
+            'dmgs':dmgs
+            }
+
+
+def player_damage_json(request):
+    """
+    Provides a JSON response representing the damage for the given weapon.
+
+    Parameters:
+       weapon = which weapon to display damage for. Valid values are
+         'grenadelauncher', 'electro', 'crylink', 'hagar', 'rocketlauncher',
+         'laser'.
+       games = over how many games to display damage. Can be up to 50.
+    """
+    return player_damage_data(request)