From: Ant Zucaro Date: Sat, 28 Jan 2017 14:54:59 +0000 (-0500) Subject: Remove the need for peeking, improving performance. X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d9921a3870ddb67c8ec20b0347b4f561d91aa983;p=xonotic%2Fxonstat.git Remove the need for peeking, improving performance. --- diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py index 950b28c..52d6091 100644 --- a/xonstat/views/submission.py +++ b/xonstat/views/submission.py @@ -38,12 +38,9 @@ class Submission(object): # distinct weapons that we have seen fired self.weapons = set() - # the parsing deque + # the parsing deque (we use this to allow peeking) self.q = collections.deque(self.body.split("\n")) - # all of the keys related to player records - self.player_keys = ['i', 'n', 't', 'e'] - def next_item(self): """Returns the next key:value pair off the queue.""" try: @@ -52,23 +49,19 @@ class Submission(object): return None, None else: return items - except Exception as e: - print(e) + except: return None, None - @staticmethod - def starts_with(s, letters): - for letter in letters: - if s.startswith(letter): - return True + def parse_player(self, key, pid): + """Construct a player events listing from the submission.""" - return False + # all of the keys related to player records + player_keys = ['i', 'n', 't', 'e'] - def parse_player(self, key, pid): player = {key: pid} # Consume all following 'i' 'n' 't' 'e' records - while len(self.q) > 0 and self.starts_with(self.q[0], self.player_keys): + while len(self.q) > 0: (key, value) = self.next_item() if key is None and value is None: continue @@ -77,17 +70,22 @@ class Submission(object): player[sub_key] = sub_value elif key == 'n': player[key] = unicode(value, 'utf-8') - elif key in self.player_keys: + elif key in player_keys: player[key] = value + else: + # something we didn't expect - put it back on the deque + self.q.appendleft("{} {}".format(key, value)) + break self.players.append(player) def parse_team(self, key, tid): + """Construct a team events listing from the submission.""" team = {key: tid} # Consume all following 'e' records while len(self.q) > 0 and self.q[0].startswith('e'): - (key, value) = self.next_item() + (_, value) = self.next_item() (sub_key, sub_value) = value.split(' ', 1) team[sub_key] = sub_value @@ -108,6 +106,8 @@ class Submission(object): else: self.meta[key] = value + return self + def parse_stats_submission(body): """