Merge branch 'master' into zykure/wip
authorJan Behrens <zykure@web.de>
Tue, 11 Mar 2014 13:21:10 +0000 (14:21 +0100)
committerJan Behrens <zykure@web.de>
Tue, 11 Mar 2014 13:21:10 +0000 (14:21 +0100)
xonstat/__init__.py
xonstat/models.py
xonstat/templates/map_captimes.mako
xonstat/templates/player_captimes.mako
xonstat/util.py
xonstat/views/map.py
xonstat/views/player.py

index c38d31c0790541339a0388162fc0c94f3ca50c76..3053367721d5cfad6ee5c1968b538ba271c36a85 100644 (file)
@@ -48,14 +48,14 @@ def main(global_config, **settings):
     config.add_route("player_info",      "/player/{id:\d+}")
     config.add_view(player_info,      route_name="player_info",      renderer="player_info.mako")
 
-    config.add_route("player_hashkey_info_json", "/player/me.json")
-    config.add_view(player_hashkey_info_json, route_name="player_hashkey_info_json", renderer="jsonp")
+    config.add_route("player_info_json", "/player/{id:\d+}.json")
+    config.add_view(player_info_json, route_name="player_info_json", renderer="jsonp")
 
     config.add_route("player_hashkey_info_text", "/player/me")
     config.add_view(player_hashkey_info_text, route_name="player_hashkey_info_text", renderer="player_hashkey_info_text.mako")
 
-    config.add_route("player_info_json", "/player/{id:\d+}.json")
-    config.add_view(player_info_json, route_name="player_info_json", renderer="jsonp")
+    config.add_route("player_hashkey_info_json", "/player/me.json")
+    config.add_view(player_hashkey_info_json, route_name="player_hashkey_info_json", renderer="jsonp")
 
     config.add_route("player_elo_info_text", "/player/{hashkey}/elo.txt")
     config.add_view(player_elo_info_text, route_name="player_elo_info_text", renderer="player_elo_info_text.mako")
@@ -73,10 +73,10 @@ def main(global_config, **settings):
     config.add_route("player_index_json", "/players.json")
     config.add_view(player_index_json, route_name="player_index_json", renderer="jsonp")
 
-    config.add_route("player_captimes",      "/player/{id:\d+}/captimes")
+    config.add_route("player_captimes",      "/player/{player_id:\d+}/captimes")
     config.add_view(player_captimes,      route_name="player_captimes",      renderer="player_captimes.mako")
 
-    config.add_route("player_captimes_json", "/player/{id:\d+}/captimes.json")
+    config.add_route("player_captimes_json", "/player/{player_id:\d+}/captimes.json")
     config.add_view(player_captimes_json, route_name="player_captimes_json", renderer="jsonp")
 
     config.add_route("player_weaponstats_data_json", "/player/{id:\d+}/weaponstats.json")
index 0d469e1191652e260a1d22ea8ca23f6597eaaa83..a8be3241fe11849b5851fb37f381466dc58f10b1 100644 (file)
@@ -267,6 +267,12 @@ class PlayerCaptime(object):
     def __repr__(self):
         return "<PlayerCaptime(pid=%s, map_id=%s)>" % (self.player_id, self.map_id)
 
+    def fuzzy_date(self):
+        return pretty_date(self.create_dt)
+
+    def epoch(self):
+        return timegm(self.create_dt.timetuple())
+
 
 class SummaryStat(object):
     def __repr__(self):
index 4fc0ec59a53558cf77a81e28bc43a8c5c17a445e..1373fc07514bc2e37fa78ad2ccd882445937e4cf 100644 (file)
@@ -1,16 +1,25 @@
 <%inherit file="base.mako"/>
 <%namespace name="nav" file="nav.mako" />
+<%namespace file="navlinks.mako" import="navlinks" />
+
+<%block name="navigation">
+${nav.nav('maps')}
+</%block>
 
 <%block name="title">
 Map captimes
 </%block>
 
+% if len(captimes) == 0:
+<h2>Sorry, no caps yet. Get playing!</h2>
+<p><a href="${map_url}">Back to map info page</a></p>
+% else:
 
 <div class="row">
   <div class="span12">
 
     <h2>${map.name}</h2>
-    <p><a href="${map_url}">Back to map info page</a></p>
+    <p><a href="${request.route_url('map_info', id=map.map_id)}">Back to map info page</a></p>
 
     <h3>Fastest Flag Captures:</h3>
 
@@ -25,7 +34,7 @@ Map captimes
         </tr>
       </thead>
       <tbody>
-      % for ct in captimes:
+      % for ct in captimes.items:
         <tr>
           <td class="tdcenter"><a class="btn btn-primary btn-small" href="${request.route_url('game_info', id=ct.game_id)}" title="View detailed information about this game">view</a></td>
           <td>${ct.fastest_cap.total_seconds()} seconds</td>
@@ -45,3 +54,6 @@ Map captimes
   </div>
 </div>
 
+<!-- navigation links -->
+${navlinks("map_captimes", captimes.page, captimes.last_page, id=map_id, search_query=request.GET)}
+% endif
index a9872e4a51873466f7b5fb47433c800d50b1bf37..2564160498311a75b913035bc4980f6a00cdaa7b 100644 (file)
@@ -1,5 +1,10 @@
 <%inherit file="base.mako"/>
 <%namespace name="nav" file="nav.mako" />
+<%namespace file="navlinks.mako" import="navlinks" />
+
+<%block name="navigation">
+${nav.nav('players')}
+</%block>
 
 <%block name="title">
 Player captimes
@@ -29,7 +34,7 @@ Player captimes
         </tr>
       </thead>
       <tbody>
-      % for ct in captimes:
+      % for ct in captimes.items:
         <tr>
           <td class="tdcenter"><a class="btn btn-primary btn-small" href="${request.route_url('game_info', id=ct.game_id)}" title="View detailed information about this game">view</a></td>
           <td>${ct.fastest_cap.total_seconds()} seconds</td>
@@ -43,4 +48,6 @@ Player captimes
   </div>
 </div>
 
+<!-- navigation links -->
+${navlinks("player_captimes", captimes.page, captimes.last_page, player_id=player_id, search_query=request.GET)}
 % endif
index d8599303c324f332cf3dbbbe38c568989834c002..0891765759356d3c1095985e64fe300a06d23fa0 100644 (file)
@@ -1,3 +1,4 @@
+import sys
 import logging
 import pyramid.httpexceptions
 import re
@@ -261,9 +262,8 @@ def verify_request(request):
                 sig=request.headers['X-D0-Blind-Id-Detached-Signature'],
                 querystring='',
                 postdata=request.body)
-
-        log.debug('\nidfp: {0}\nstatus: {1}'.format(idfp, status))
     except:
+        log.debug('ERROR: Could not verify request: {0}'.format(sys.exc_info()))
         idfp = None
         status = None
 
index 004f22a37f788078d3471d6bb00e9f4282d4516b..2d3957a7dd0a82ab6ba0e47dcfe3d4f9dd56737c 100644 (file)
@@ -166,59 +166,83 @@ def map_info_json(request):
 
 def map_captimes_data(request):
     map_id = int(request.matchdict['id'])
-        
-    MapCaptimes = namedtuple('PlayerCaptimes', ['fastest_cap', 'create_dt', 'create_dt_epoch', 'create_dt_fuzzy',
+
+    if request.params.has_key('page'):
+        current_page = request.params['page']
+    else:
+        current_page = 1
+
+    MapCaptimes = namedtuple('PlayerCaptimes', ['fastest_cap',
+        'create_dt', 'create_dt_epoch', 'create_dt_fuzzy',
         'player_id', 'player_nick', 'player_nick_stripped', 'player_nick_html',
         'game_id', 'server_id', 'server_name'])
 
-    dbquery = DBSession.query('fastest_cap', 'create_dt', 'player_id', 'game_id',
-                'server_id', 'server_name', 'player_nick').\
-            from_statement(
-                "SELECT ct.fastest_cap, "
-                       "ct.create_dt, "
-                       "ct.player_id, "
-                       "ct.game_id, "
-                       "g.server_id, "
-                       "s.name server_name, "
-                       "pgs.nick player_nick "
-                "FROM   player_map_captimes ct, "
-                       "games g, "
-                       "maps m, "
-                       "servers s, "
-                       "player_game_stats pgs "
-                "WHERE  ct.map_id = :map_id "
-                  "AND  g.game_id = ct.game_id "
-                  "AND  g.server_id = s.server_id "
-                  "AND  m.map_id = ct.map_id "
-                  "AND  pgs.player_id = ct.player_id "
-                  "AND  pgs.game_id = ct.game_id "
-                "ORDER  BY ct.fastest_cap "
-                "LIMIT  25"
-            ).params(map_id=map_id).all()
-
     mmap = DBSession.query(Map).filter_by(map_id=map_id).one()
 
-    map_captimes = []
-    for row in dbquery:
-        map_captimes.append(MapCaptimes(
-                fastest_cap=row.fastest_cap,
-                create_dt=row.create_dt,
-                create_dt_epoch=timegm(row.create_dt.timetuple()),
-                create_dt_fuzzy=pretty_date(row.create_dt),
-                player_id=row.player_id,
-                player_nick=row.player_nick,
-                player_nick_stripped=strip_colors(row.player_nick),
-                player_nick_html=html_colors(row.player_nick),
-                game_id=row.game_id,
-                server_id=row.server_id,
-                server_name=row.server_name,
-            ))
+    #mct_q = DBSession.query('fastest_cap', 'create_dt', 'player_id', 'game_id',
+    #            'server_id', 'server_name', 'player_nick').\
+    #        from_statement(
+    #            "SELECT ct.fastest_cap, "
+    #                   "ct.create_dt, "
+    #                   "ct.player_id, "
+    #                   "ct.game_id, "
+    #                   "g.server_id, "
+    #                   "s.name server_name, "
+    #                   "pgs.nick player_nick "
+    #            "FROM   player_map_captimes ct, "
+    #                   "games g, "
+    #                   "maps m, "
+    #                   "servers s, "
+    #                   "player_game_stats pgs "
+    #            "WHERE  ct.map_id = :map_id "
+    #              "AND  g.game_id = ct.game_id "
+    #              "AND  g.server_id = s.server_id "
+    #              "AND  m.map_id = ct.map_id "
+    #              "AND  pgs.player_id = ct.player_id "
+    #              "AND  pgs.game_id = ct.game_id "
+    #            "ORDER  BY ct.fastest_cap "
+    #            "LIMIT  25"
+    #        ).params(map_id=map_id)
+
+    #try:
+    if True:
+        mct_q = DBSession.query(PlayerCaptime.fastest_cap, PlayerCaptime.create_dt,
+                PlayerCaptime.player_id, PlayerCaptime.game_id,
+                Game.server_id, Server.name.label('server_name'),
+                PlayerGameStat.nick.label('player_nick')).\
+                filter(PlayerCaptime.map_id==map_id).\
+                filter(PlayerCaptime.game_id==Game.game_id).\
+                filter(PlayerCaptime.map_id==Map.map_id).\
+                filter(Game.server_id==Server.server_id).\
+                filter(PlayerCaptime.player_id==PlayerGameStat.player_id).\
+                filter(PlayerCaptime.game_id==PlayerGameStat.game_id).\
+                order_by(expr.asc(PlayerCaptime.fastest_cap))
+
+        map_captimes = Page(mct_q, current_page, items_per_page=20, url=page_url)
+
+        map_captimes.items = [MapCaptimes(
+                        fastest_cap=row.fastest_cap,
+                        create_dt=row.create_dt,
+                        create_dt_epoch=timegm(row.create_dt.timetuple()),
+                        create_dt_fuzzy=pretty_date(row.create_dt),
+                        player_id=row.player_id,
+                        player_nick=row.player_nick,
+                        player_nick_stripped=strip_colors(row.player_nick),
+                        player_nick_html=html_colors(row.player_nick),
+                        game_id=row.game_id,
+                        server_id=row.server_id,
+                        server_name=row.server_name,
+                ) for row in map_captimes.items]
+
+    #except Exception as e:
+    else:
+        map = None
+        map_captimes = None
 
     return {
-            'captimes':map_captimes,
             'map_id':map_id,
-            'map_url':request.route_url('map_info', id=map_id),
             'map':mmap,
+            'captimes':map_captimes,
         }
 
 def map_captimes(request):
index 5e56b08dafd6baca972d978914a2310fe38699d5..6b0b9459f8abe760bdf0f3e211b6fee0e26c3bdb 100644 (file)
@@ -3,6 +3,7 @@ import logging
 import pyramid.httpexceptions
 import sqlalchemy as sa
 import sqlalchemy.sql.functions as func
+import sqlalchemy.sql.expression as expr
 from calendar import timegm
 from collections import namedtuple
 from webhelpers.paginate import Page
@@ -788,7 +789,11 @@ def player_hashkey_info_data(request):
     # hashkey = unquote(hashkey)
 
     # if using request verification to obtain the hashkey
-    (hashkey, status) = verify_request(request)
+    (idfp, status) = verify_request(request)
+    log.debug("d0_blind_id verification: idfp={0} status={1}\n".format(idfp, status))
+
+    log.debug("\n----- BEGIN REQUEST BODY -----\n" + request.body +
+            "----- END REQUEST BODY -----\n\n")
 
     # if config is to *not* verify requests and we get nothing back, this
     # query will return nothing and we'll 404.
@@ -796,7 +801,7 @@ def player_hashkey_info_data(request):
         player = DBSession.query(Player).\
                 filter(Player.player_id == Hashkey.player_id).\
                 filter(Player.active_ind == True).\
-                filter(Hashkey.hashkey == hashkey).one()
+                filter(Hashkey.hashkey == idfp).one()
 
         games_played      = get_games_played(player.player_id)
         overall_stats     = get_overall_stats(player.player_id)
@@ -809,7 +814,7 @@ def player_hashkey_info_data(request):
         raise pyramid.httpexceptions.HTTPNotFound
 
     return {'player':player,
-            'hashkey':hashkey,
+            'hashkey':idfp,
             'games_played':games_played,
             'overall_stats':overall_stats,
             'fav_maps':fav_maps,
@@ -912,6 +917,12 @@ def player_elo_info_data(request):
     """
     Provides elo information on a specific player. Raw data is returned.
     """
+    (idfp, status) = verify_request(request)
+    log.debug("d0_blind_id verification: idfp={0} status={1}\n".format(idfp, status))
+
+    log.debug("\n----- BEGIN REQUEST BODY -----\n" + request.body +
+            "----- END REQUEST BODY -----\n\n")
+
     hashkey = request.matchdict['hashkey']
 
     # the incoming hashkey is double quoted, and WSGI unquotes once...
@@ -979,41 +990,58 @@ def player_elo_info_text(request):
 
 
 def player_captimes_data(request):
-    player_id = int(request.matchdict['id'])
+    player_id = int(request.matchdict['player_id'])
     if player_id <= 2:
         player_id = -1;
 
-    PlayerCaptimes = namedtuple('PlayerCaptimes', ['fastest_cap', 'create_dt', 'create_dt_epoch', 'create_dt_fuzzy',
-        'player_id', 'game_id', 'map_id', 'map_name', 'server_id', 'server_name'])
+    if request.params.has_key('page'):
+        current_page = request.params['page']
+    else:
+        current_page = 1
 
-    dbquery = DBSession.query('fastest_cap', 'create_dt', 'player_id', 'game_id', 'map_id',
-                'map_name', 'server_id', 'server_name').\
-            from_statement(
-                "SELECT ct.fastest_cap, "
-                       "ct.create_dt, "
-                       "ct.player_id, "
-                       "ct.game_id, "
-                       "ct.map_id, "
-                       "m.name map_name, "
-                       "g.server_id, "
-                       "s.name server_name "
-                "FROM   player_map_captimes ct, "
-                       "games g, "
-                       "maps m, "
-                       "servers s "
-                "WHERE  ct.player_id = :player_id "
-                  "AND  g.game_id = ct.game_id "
-                  "AND  g.server_id = s.server_id "
-                  "AND  m.map_id = ct.map_id "
-                #"ORDER  BY ct.fastest_cap "
-                "ORDER  BY ct.create_dt desc"
-            ).params(player_id=player_id).all()
+    PlayerCaptimes = namedtuple('PlayerCaptimes', ['fastest_cap',
+            'create_dt', 'create_dt_epoch', 'create_dt_fuzzy',
+            'player_id', 'game_id', 'map_id', 'map_name', 'server_id', 'server_name'])
 
     player = DBSession.query(Player).filter_by(player_id=player_id).one()
 
-    player_captimes = []
-    for row in dbquery:
-        player_captimes.append(PlayerCaptimes(
+    #pct_q = DBSession.query('fastest_cap', 'create_dt', 'player_id', 'game_id', 'map_id',
+    #            'map_name', 'server_id', 'server_name').\
+    #        from_statement(
+    #            "SELECT ct.fastest_cap, "
+    #                   "ct.create_dt, "
+    #                   "ct.player_id, "
+    #                   "ct.game_id, "
+    #                   "ct.map_id, "
+    #                   "m.name map_name, "
+    #                   "g.server_id, "
+    #                   "s.name server_name "
+    #            "FROM   player_map_captimes ct, "
+    #                   "games g, "
+    #                   "maps m, "
+    #                   "servers s "
+    #            "WHERE  ct.player_id = :player_id "
+    #              "AND  g.game_id = ct.game_id "
+    #              "AND  g.server_id = s.server_id "
+    #              "AND  m.map_id = ct.map_id "
+    #            #"ORDER  BY ct.fastest_cap "
+    #            "ORDER  BY ct.create_dt desc"
+    #        ).params(player_id=player_id)
+
+    try:
+        pct_q = DBSession.query(PlayerCaptime.fastest_cap, PlayerCaptime.create_dt,
+                PlayerCaptime.player_id, PlayerCaptime.game_id, PlayerCaptime.map_id,
+                Map.name.label('map_name'), Game.server_id, Server.name.label('server_name')).\
+                filter(PlayerCaptime.player_id==player_id).\
+                filter(PlayerCaptime.game_id==Game.game_id).\
+                filter(PlayerCaptime.map_id==Map.map_id).\
+                filter(Game.server_id==Server.server_id).\
+                order_by(expr.asc(PlayerCaptime.fastest_cap))  # or PlayerCaptime.create_dt
+
+        player_captimes = Page(pct_q, current_page, items_per_page=20, url=page_url)
+
+        # replace the items in the canned pagination class with more rich ones
+        player_captimes.items = [PlayerCaptimes(
                 fastest_cap=row.fastest_cap,
                 create_dt=row.create_dt,
                 create_dt_epoch=timegm(row.create_dt.timetuple()),
@@ -1023,14 +1051,18 @@ def player_captimes_data(request):
                 map_id=row.map_id,
                 map_name=row.map_name,
                 server_id=row.server_id,
-                server_name=row.server_name,
-            ))
+                server_name=row.server_name
+                ) for row in player_captimes.items]
+
+    except Exception as e:
+        player = None
+        player_captimes = None
 
     return {
-            'captimes':player_captimes,
             'player_id':player_id,
-            'player_url':request.route_url('player_info', id=player_id),
             'player':player,
+            'captimes':player_captimes,
+            #'player_url':request.route_url('player_info', id=player_id),
         }