From 6676182b302dd23e6002c110f06d64a17bea2688 Mon Sep 17 00:00:00 2001 From: Simba Zhang Date: Wed, 31 Aug 2016 14:44:19 -0700 Subject: [PATCH 1/2] Added debug event 'forts_found' --- pokemongo_bot/__init__.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pokemongo_bot/__init__.py b/pokemongo_bot/__init__.py index b53aee3c76..accbd13d04 100644 --- a/pokemongo_bot/__init__.py +++ b/pokemongo_bot/__init__.py @@ -633,6 +633,10 @@ def _register_events(self): 'player_data', parameters=('player_data', ) ) + self.event_manager.register_event( + 'forts_found', + parameters=('json') + ) def tick(self): self.health_record.heartbeat() @@ -737,6 +741,26 @@ def update_web_location(self, cells=[], lat=None, lng=None, alt=None): json.dump({'lat': lat, 'lng': lng, 'alt': alt, 'start_position': self.start_position}, outfile) except IOError as e: self.logger.info('[x] Error while opening location file: %s' % e) + def emit_forts_event(self,response_dict): + map_objects = response_dict.get( + 'responses', {} + ).get('GET_MAP_OBJECTS', {}) + status = map_objects.get('status', None) + + map_cells = [] + if status and status == 1: + map_cells = map_objects['map_cells'] + + if map_cells and len(map_cells): + for cell in map_cells: + if "forts" in cell and len(cell["forts"]): + self.event_manager.emit( + 'forts_found', + sender=self, + level='info', + formatted='Found forts {json}', + data={'json': json.dumps(cell["forts"])} + ) def find_close_cells(self, lat, lng): cellid = get_cell_ids(lat, lng) @@ -1308,6 +1332,9 @@ def get_map_objects(self, lat, lng, timestamp, cellid): since_timestamp_ms=timestamp, cell_id=cellid ) + self.emit_forts_event(self.last_map_object) + #if self.last_map_object: + # print self.last_map_object self.last_time_map_object = time.time() return self.last_map_object From 2e6bddc23d60e00de8aeb27e099c746fc42ad10a Mon Sep 17 00:00:00 2001 From: Simba Zhang Date: Thu, 1 Sep 2016 00:23:13 -0700 Subject: [PATCH 2/2] Changed level of log to debug. --- pokemongo_bot/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pokemongo_bot/__init__.py b/pokemongo_bot/__init__.py index accbd13d04..e40a0e5718 100644 --- a/pokemongo_bot/__init__.py +++ b/pokemongo_bot/__init__.py @@ -757,7 +757,7 @@ def emit_forts_event(self,response_dict): self.event_manager.emit( 'forts_found', sender=self, - level='info', + level='debug', formatted='Found forts {json}', data={'json': json.dumps(cell["forts"])} )