Merge branch 'master' into coop_support

Conflicts:
	test_replays/test_all.py

Author: StoicLoofah

.circleci/config.yml

@@ -0,0 +1,32 @@
+version: 2.0
+
+my-steps: &steps
+  - checkout
+  - run: sudo pip install -r requirements.txt
+  - run: sudo pip install flake8 pytest
+  - run: python --version ; pip --version ; pwd ; ls
+  # stop the build if there are Python syntax errors or undefined names
+  - run: flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+  # exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide
+  - run: flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+  #- run: pytest # test_s2gs test_replays
+  - run: python -m unittest discover test_s2gs
+  - run: python -m unittest discover test_replays
+
+jobs:
+  Python_2.7:
+    docker:
+      - image: circleci/python:2.7
+    steps: *steps
+
+  Python_3.6:
+    docker:
+      - image: circleci/python:3.6
+    steps: *steps
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - Python_2.7
+      - Python_3.6

CONTRIBUTING.md

@@ -14,7 +14,7 @@ If you can't share your code/replays publicly try to replicate with a smaller sc
 Patches
 =========
 
-Please submit patches by pull request where possible. Patches should add a test to confirm their fix and should not break previously working tests.
+Please submit patches by pull request where possible. Patches should add a test to confirm their fix and should not break previously working tests.   Circle CI automatically runs tests on each pull request so please check https://circleci.com/gh/ggtracker/sc2reader to see the results of those tests.
 
 If you are having trouble running/add/fixing tests for your patch let me know and I'll see if I can help.
 

circle.yml

@@ -1,2 +1,2 @@
-hacking
+mpyq
 Pillow

requirements.txt

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals, division
 
+from io import BytesIO
+
 try:
     from sets import Set
 except ImportError:
@@ -113,7 +115,7 @@ def __init__(self,replay):
         #Get map information
         replayMap = replay.map
         # extract image from replay package
-        mapsio = StringIO(replayMap.minimap)
+        mapsio = BytesIO(replayMap.minimap)
         im = PIL_open(mapsio)
         ##remove black box around minimap
 

sc2reader/engine/plugins/creeptracker.py

@@ -1877,6 +1877,49 @@ def trigger_ping_event(self, data):
             option=data.read_uint32() - 2147483648,
         )
 
+class GameEventsReader_64469(GameEventsReader_38996):
+
+    # this function is exactly the same as command_event() from GameEventsReader_38996
+    # with the only change being that flags now has 26 bits instead of 25.
+    def command_event(self, data):
+        return dict(
+            flags=data.read_bits(26),
+            ability=dict(
+                ability_link=data.read_uint16(),
+                ability_command_index=data.read_bits(5),
+                ability_command_data=data.read_uint8() if data.read_bool() else None,
+            ) if data.read_bool() else None,
+            data={  # Choice
+                0: lambda: ('None', None),
+                1: lambda: ('TargetPoint', dict(
+                    point=dict(
+                        x=data.read_bits(20),
+                        y=data.read_bits(20),
+                        z=data.read_uint32() - 2147483648,
+                    )
+                )),
+                2: lambda: ('TargetUnit', dict(
+                    flags=data.read_uint16(),
+                    timer=data.read_uint8(),
+                    unit_tag=data.read_uint32(),
+                    unit_link=data.read_uint16(),
+                    control_player_id=data.read_bits(4) if data.read_bool() else None,
+                    upkeep_player_id=data.read_bits(4) if data.read_bool() else None,
+                    point=dict(
+                        x=data.read_bits(20),
+                        y=data.read_bits(20),
+                        z=data.read_uint32() - 2147483648,
+                    ),
+                )),
+                3: lambda: ('Data', dict(
+                    data=data.read_uint32()
+                )),
+            }[data.read_bits(2)](),
+            sequence=data.read_uint32() + 1,
+            other_unit_tag=data.read_uint32() if data.read_bool() else None,
+            unit_group=data.read_uint32() if data.read_bool() else None,
+        )
+
 class TrackerEventsReader(object):
 
     def __init__(self):

sc2reader/readers.py

@@ -586,7 +586,8 @@ def register_default_readers(self):
         self.register_reader('replay.game.events', readers.GameEventsReader_36442(), lambda r: 36442 <= r.base_build < 38215)
         self.register_reader('replay.game.events', readers.GameEventsReader_38215(), lambda r: 38215 <= r.base_build < 38749)
         self.register_reader('replay.game.events', readers.GameEventsReader_38749(), lambda r: 38749 <= r.base_build < 38996)
-        self.register_reader('replay.game.events', readers.GameEventsReader_38996(), lambda r: 38996 <= r.base_build)
+        self.register_reader('replay.game.events', readers.GameEventsReader_38996(), lambda r: 38996 <= r.base_build < 64469)
+        self.register_reader('replay.game.events', readers.GameEventsReader_64469(), lambda r: 64469 <= r.base_build)
         self.register_reader('replay.game.events', readers.GameEventsReader_HotSBeta(), lambda r: r.versions[1] == 2 and r.build < 24247)
 
     def register_default_datapacks(self):

sc2reader/resources.py

@@ -45,12 +45,12 @@ def main():
                     if not args.one_each or replay.is_ladder:
                         replay = sc2reader.load_replay(path, debug=True)
 
-                        human.pids = set([human.pid for human in replay.humans])
+                        human_pids = set([human.pid for human in replay.humans])
                         event_pids = set([event.player.pid for event in replay.events if getattr(event, 'player', None)])
                         player_pids = set([player.pid for player in replay.players if player.is_human])
                         ability_pids = set([event.player.pid for event in replay.events if 'CommandEvent' in event.name])
-                        if human.pids != event_pids:
-                            print('Event Pid problem!  pids={pids} but event pids={event_pids}'.format(pids=human.pids, event_pids=event_pids))
+                        if human_pids != event_pids:
+                            print('Event Pid problem!  pids={pids} but event pids={event_pids}'.format(pids=human_pids, event_pids=event_pids))
                             print(' with {path}: {build} - {real_type} on {map_name} - Played {start_time}'.format(path=path, **replay.__dict__))
                         elif player_pids != ability_pids:
                             print('Ability Pid problem!  pids={pids} but event pids={event_pids}'.format(pids=player_pids, event_pids=ability_pids))

sc2reader/scripts/sc2parse.py

@@ -509,13 +509,13 @@ def test_33_shift_click_calldown_mule(self):
         replay = sc2reader.load_replay("test_replays/3.3.0/ggissue48.SC2Replay")
         def efilter(e):
             return hasattr(e, "ability") and e.ability_name == "CalldownMULE"
-        self.assertEqual(len(filter(efilter, replay.events)), 29)
+        self.assertEqual(len(list(filter(efilter, replay.events))), 29)
 
     def test_33_shift_click_spawn_larva(self):
         replay = sc2reader.load_replay("test_replays/3.3.0/ggissue49.SC2Replay")
         def efilter(e):
             return hasattr(e, "ability") and e.ability_name == "SpawnLarva"
-        self.assertEqual(len(filter(efilter, replay.events)), 23)
+        self.assertEqual(len(list(filter(efilter, replay.events))), 23)
 
     def test_34(self):
         replay = sc2reader.load_replay("test_replays/3.4.0/issueYY.SC2Replay")
@@ -561,6 +561,13 @@ def test_59587(self):
         factory = sc2reader.factories.SC2Factory()
         replay = factory.load_replay(replayfilename)
 
+    def test_64469(self):
+      for replayfilename in [
+              "test_replays/4.3.0.64469/1.SC2Replay",
+        ]:
+        factory = sc2reader.factories.SC2Factory()
+        replay = factory.load_replay(replayfilename)
+
     def test_coop(self):
       for replayfilename in [
               "test_replays/coop/CoA.SC2Replay",