Use the new data structures in the submission handler.

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

diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py
index bd688b9167219df24589448ce67db7a61f7e9e56..b527167c4adc25ad95bb841e566dd837efdb6cc5 100644 (file)
--- a/xonstat/views/submission.py
+++ b/xonstat/views/submission.py
@@ -338,7 +338,7 @@ def has_minimum_real_players(settings, submission):
     except:
         minimum_required_players = 2
 
-    return len(submission.human_players) >= minimum_required_players
+    return len(submission.humans) >= minimum_required_players
 
 
 def do_precondition_checks(settings, submission):
@@ -753,11 +753,6 @@ def create_game_stat(session, game, gmap, player, events):
     pgstat.rank          = int(events.get('rank', None))
     pgstat.scoreboardpos = int(events.get('scoreboardpos', pgstat.rank))
 
-    if pgstat.nick != player.nick \
-            and player.player_id > 2 \
-            and pgstat.nick != 'Anonymous Player':
-        register_new_nick(session, player, pgstat.nick)
-
     wins = False
 
     # gametype-specific stuff is handled here. if passed to us, we store it
@@ -967,14 +962,46 @@ def get_ranks(session, player_ids, game_type_cd):
 
 
 def update_player(session, player, events):
-    pass
+    """
+    Updates a player record using the latest information.
+    :param session: SQLAlchemy session
+    :param player: Player model representing what is in the database right now (before updates)
+    :param events: Dict of player events from the submission
+    :return: player
+    """
+    nick = events.get('n', 'Anonymous Player')[:128]
+    if nick != player.nick and not nick.startswith("Anonymous Player"):
+        register_new_nick(session, player, nick)
+
+    return player
 
 
 def create_player(session, events):
-    pass
+    """
+    Creates a new player from the list of events.
+    :param session: SQLAlchemy session
+    :param events: Dict of player events from the submission
+    :return: Player
+    """
+    player = Player()
+    session.add(player)
+    session.flush()
+
+    nick = events.get('n', None)
+    if nick:
+        player.nick = nick[:128]
+        player.stripped_nick = strip_colors(qfont_decode(player.nick))
+    else:
+        player.nick = "Anonymous Player #{0}".format(player.player_id)
+        player.stripped_nick = player.nick
 
+    hk = Hashkey(player_id=player.player_id, hashkey=events.get('P', None))
+    session.add(hk)
 
-def get_or_create_players(session, game, gmap, events_by_hashkey):
+    return player
+
+
+def get_or_create_players(session, events_by_hashkey):
     hashkeys = set(events_by_hashkey.keys())
     players_by_hashkey = {}
 
@@ -996,6 +1023,9 @@ def get_or_create_players(session, game, gmap, events_by_hashkey):
             .filter(Player.player_id == Hashkey.player_id)\
             .filter(Hashkey.hashkey.in_(hashkeys))\
             .all():
+                log.debug("Found existing player {} with hashkey {}"
+                          .format(p.player_id, hk.hashkey))
+
                 player = update_player(session, p, events_by_hashkey[hk.hashkey])
                 players_by_hashkey[hk.hashkey] = player
                 hashkeys.remove(hk.hashkey)
@@ -1003,6 +1033,10 @@ def get_or_create_players(session, game, gmap, events_by_hashkey):
     # The remainder are the players we haven't seen before, so we need to create them.
     for hashkey in hashkeys:
         player = create_player(session, events_by_hashkey[hashkey])
+
+        log.debug("Created player {0} ({2}) with hashkey {1}"
+                  .format(player.player_id, hashkey, player.nick.encode('utf-8')))
+
         players_by_hashkey[hashkey] = player
 
     return players_by_hashkey
@@ -1055,13 +1089,13 @@ def submit_stats(request):
         )
 
         events_by_hashkey = {elem["P"]: elem for elem in submission.humans + submission.bots}
-        get_or_create_players(session, game, gmap, events_by_hashkey)
-        # keep track of the players we've seen
-        player_ids = []
+        players_by_hashkey = get_or_create_players(session, events_by_hashkey)
+
         pgstats = []
-        hashkeys = {}
-        for events in submission.humans + submission.bots:
-            player = get_or_create_player(session, events['P'], events.get('n', None))
+        player_ids = []
+        hashkeys_by_player_id = {}
+        for hashkey, player in players_by_hashkey.items():
+            events = events_by_hashkey[hashkey]
             pgstat = create_game_stat(session, game, gmap, player, events)
             pgstats.append(pgstat)
 
@@ -1070,12 +1104,12 @@ def submit_stats(request):
 
             if player.player_id > 2:
                 player_ids.append(player.player_id)
-                hashkeys[player.player_id] = events['P']
+                hashkeys_by_player_id[player.player_id] = hashkey
 
             if should_do_weapon_stats(submission.game_type_cd) and player.player_id > 1:
                 create_weapon_stats(session, submission.version, game, player, pgstat, events)
 
-        # store them on games for easy access
+        # player_ids for human players get stored directly on games for fast indexing
         game.players = player_ids
 
         for events in submission.teams:
@@ -1100,7 +1134,7 @@ def submit_stats(request):
                 "game": game,
                 "gmap": gmap,
                 "player_ids": player_ids,
-                "hashkeys": hashkeys,
+                "hashkeys": hashkeys_by_player_id,
                 "elos": ep.wip,
                 "ranks": ranks,
         }