Merge branch 'alexhanh'

Author: GraylinKim

profile.py

@@ -7,6 +7,7 @@
 from sc2reader import Replay
 
 def parse_replays():
+    # Run four times to dampen noise
     for run in range(1,4):
         file_list = []
         rootdir = "test_replays/build17811/"
@@ -20,45 +21,18 @@ def parse_replays():
             print file
             replay = Replay(file)
 
-# Problem with the profiler is that it adds conciderable amount of overhead
-# cProfile.run("parse_replays()","replay_profile")
-# stats = Stats("replay_profile")
-# stats.strip_dirs().sort_stats("time").print_stats(30)
+# Use the results of this function when comparing performance with other libraries.
+def benchmark_with_timetime():
+    start = time.time()
+    parse_replays()
+    diff = time.time() - start
+    print diff
 
-start = time.time()
-parse_replays()
-diff = time.time() - start
-print diff
+def profile():
+    cProfile.run("parse_replays()","replay_profile")
+    stats = Stats("replay_profile")
+    stats.strip_dirs().sort_stats("time").print_stats(30)  
 
-# ========================================
-# Results for March 1 2011
-# With cProfile
 
-# Tue Mar  1 06:25:22 2011    replay_profile
-# 
-#          20568477 function calls (20565106 primitive calls) in 37.650 seconds
-# 
-#    Ordered by: internal time
-#    List reduced from 184 to 15 due to restriction <15>
-# 
-#    ncalls  tottime  percall  cumtime  percall filename:lineno(function)
-#   3484431    7.903    0.000    8.559    0.000 utils.py:42(get_big)
-#   3057363    5.960    0.000   13.308    0.000 utils.py:89(get_big_int)
-#        33    4.828    0.146   35.395    1.073 parsers.py:225(load)
-#    472272    2.948    0.000    3.360    0.000 objects.py:98(__init__)
-#     42861    2.227    0.000    6.391    0.000 eventparsers.py:154(load)
-#    472272    2.222    0.000    3.223    0.000 parsers.py:254(get_parser)
-#    114174    1.225    0.000    4.265    0.000 eventparsers.py:50(load)
-#    294732    1.224    0.000    3.983    0.000 eventparsers.py:394(load)
-#    473916    1.060    0.000    3.568    0.000 utils.py:108(get_timestamp)
-#   1142493    0.926    0.000    0.926    0.000 utils.py:66(peek)
-#   3965823    0.745    0.000    0.745    0.000 {len}
-#      7095    0.705    0.000    0.705    0.000 {method 'upper' of 'str' objects}
-#    695461    0.644    0.000    0.644    0.000 {range}
-#         1    0.575    0.575   37.571   37.571 profile.py:9(parse_replays)
-#    566628    0.491    0.000    0.491    0.000 {method 'rjust' of 'str' objects}
-
-
-# With time.time()
-# 28.2304489613
-# ========================================
+benchmark_with_timetime()
+#profile()

sc2reader/objects.py

@@ -163,6 +163,7 @@ def __init__(self, pid, data, realm="us"):
         self.handicap = data[6]
         self.team = None # A number to be supplied later
         self.type = "" # Human or Computer
+        self.events = list()
 
     def __str__(self):
         return "Player %s - %s (%s)" % (self.pid, self.name, self.actual_race)

sc2reader/parsers.py

@@ -178,8 +178,16 @@ def load(self, replay, filecontents):
                     length += 128
 
                 text = bytes.get_string(length)
-                replay.messages.append(Message(time, replay.player[player_id], target, text))
-            
+                try:
+                    replay.messages.append(Message(time, replay.player[player_id], target, text))
+                except KeyError:
+                    # This was added because some replay sites added their own tampered
+                    # messages to replays with non-existent player_id.
+                    #
+                    # This will simply ignore and fail silently if such message is 
+                    # found.
+                    pass
+                
         recorders = [player for player in replay.players if player and player.recorder==True]
         if len(recorders) > 1:
             raise ValueError("There should be 1 and only 1 recorder; %s were found" % len(recorders))

test_replays/test_all.py

@@ -1,9 +1,9 @@
+# Encoding: UTF-8
+
 # Run tests with "py.test" in the project root dir
-#encoding:UTF-8
 import os, sys
 import pytest
 
-#sys.path.append(os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)),"../")))
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)),"../")))
 
 from sc2reader import Replay
@@ -119,6 +119,8 @@ def test_ffa():
     # Player 'Boom' won because the last building of the last player was destroyed,
     # but the winner cannot be parsed because "Player has left" event isn't generated.
     # Unknown result is the best we can do.
+    print replay.length
+    print replay.events[-2]
     assert replay.winner_known == False
 
 def test_unknown_winner():
@@ -145,7 +147,7 @@ def test_us_realm():
     assert replay.player['ShadesofGray'].url == "http://us.battle.net/sc2/en/profile/2358439/1/ShadesofGray/"
     assert replay.player['reddawn'].url == "http://us.battle.net/sc2/en/profile/2198663/1/reddawn/"
 
-# We can be really proud: phpsc2replay fails with the messages!
+# TODO: Current problem.. both players are set as the recording players
 def test_kr_realm_and_tampered_messages():
     replay = Replay("test_replays/build17811/11.SC2Replay")
     assert replay.player['명지대학교'].url == "http://kr.battle.net/sc2/en/profile/258945/1/명지대학교/"