Added UpdateLiveInventory config

configs/config.json.cluster.example

@@ -38,6 +38,15 @@
           "terminal_title": true
         }
       },
+      {
+        "type": "UpdateLiveInventory",
+        "config": {
+          "enabled": false,
+          "min_interval": 120,
+          "show_all_multiple_lines": false,
+          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+        }
+      },
       {
         "type": "TransferPokemon"
       },

configs/config.json.example

@@ -33,11 +33,20 @@
         "config": {
           "enabled": false,
           "min_interval": 10,
-          "stats": ["uptime", "stardust_earned", "xp_earned", "xp_per_hour", "stops_visited"],
+          "stats": ["username", "uptime", "stardust_earned", "xp_earned", "xp_per_hour", "stops_visited"],
           "terminal_log": true,
           "terminal_title": true
         }
       },
+      {
+        "type": "UpdateLiveInventory",
+        "config": {
+          "enabled": false,
+          "min_interval": 120,
+          "show_all_multiple_lines": false,
+          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+        }
+      },
       {
         "type": "TransferPokemon"
       },

configs/config.json.map.example

@@ -38,6 +38,15 @@
           "terminal_title": true
         }
       },
+      {
+        "type": "UpdateLiveInventory",
+        "config": {
+          "enabled": false,
+          "min_interval": 120,
+          "show_all_multiple_lines": false,
+          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+        }
+      },
       {
         "type": "TransferPokemon"
       },

configs/config.json.optimizer.example

@@ -18,6 +18,15 @@
                 "longer_eggs_first": true
             }
         },
+        {
+            "type": "UpdateLiveInventory",
+            "config": {
+                "enabled": false,
+                "min_interval": 120,
+                "show_all_multiple_lines": false,
+                "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+            }
+        },
         {
             "type": "PokemonOptimizer",
             "config": {

configs/config.json.path.example

@@ -38,6 +38,15 @@
           "terminal_title": true
         }
       },
+      {
+        "type": "UpdateLiveInventory",
+        "config": {
+          "enabled": false,
+          "min_interval": 120,
+          "show_all_multiple_lines": false,
+          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+        }
+      },
       {
         "type": "TransferPokemon"
       },

configs/config.json.pokemon.example

@@ -38,6 +38,15 @@
           "terminal_title": true
         }
       },
+      {
+        "type": "UpdateLiveInventory",
+        "config": {
+          "enabled": false,
+          "min_interval": 120,
+          "show_all_multiple_lines": false,
+          "items": ["space_info", "pokeballs", "greatballs", "ultraballs", "razzberries", "luckyegg"]
+        }
+      },
       {
         "type": "TransferPokemon"
       },

pokecli.py

@@ -65,11 +65,11 @@ class SIGINTRecieved(Exception): pass
 def main():
     bot = False
 
-    try:
-        def handle_sigint(*args):
-            raise SIGINTRecieved
-        signal.signal(signal.SIGINT, handle_sigint)
+    def handle_sigint(*args):
+        raise SIGINTRecieved
+    signal.signal(signal.SIGINT, handle_sigint)
 
+    try:
         logger.info('PokemonGO Bot v1.0')
         sys.stdout = codecs.getwriter('utf8')(sys.stdout)
         sys.stderr = codecs.getwriter('utf8')(sys.stderr)
@@ -103,7 +103,7 @@ def handle_sigint(*args):
                 while True:
                     bot.tick()
 
-            except (KeyboardInterrupt, SIGINTRecieved):
+            except KeyboardInterrupt:
                 bot.event_manager.emit(
                     'bot_exit',
                     sender=bot,
@@ -147,6 +147,15 @@ def handle_sigint(*args):
          )
     except GeocoderQuotaExceeded:
         raise Exception("Google Maps API key over requests limit.")
+    except SIGINTRecieved:
+        if bot:
+            bot.event_manager.emit(
+                'bot_interrupted',
+                sender=bot,
+                level='info',
+                formatted='Bot caught SIGINT. Shutting down.'
+            )
+            report_summary(bot)
     except Exception as e:
         # always report session summary and then raise exception
         if bot:

pokemongo_bot/__init__.py

@@ -150,6 +150,7 @@ def _register_events(self):
 
         self.event_manager.register_event('bot_start')
         self.event_manager.register_event('bot_exit')
+        self.event_manager.register_event('bot_interrupted')
 
         # sleep stuff
         self.event_manager.register_event(

pokemongo_bot/cell_workers/__init__.py

@@ -19,3 +19,4 @@
 from follow_cluster import FollowCluster
 from sleep_schedule import SleepSchedule
 from update_live_stats import UpdateLiveStats
+from update_live_inventory import UpdateLiveInventory

pokemongo_bot/cell_workers/nickname_pokemon.py

@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 import os
 import json
 from pokemongo_bot.base_task import BaseTask

pokemongo_bot/cell_workers/pokemon_catch_worker.py

@@ -217,6 +217,7 @@ def _use_berry(self, berry_id, berry_count, encounter_id, catch_rate_by_ball, cu
             # softban?
             else:
                 new_catch_rate_by_ball = catch_rate_by_ball
+                self.bot.softban = True
                 self.emit_event(
                     'softban',
                     level='warning',

pokemongo_bot/cell_workers/spin_fort.py

@@ -149,7 +149,7 @@ def work(self):
     def get_forts_in_range(self):
         forts = self.bot.get_forts(order_by_distance=True)
 
-        for fort in forts:
+        for fort in reversed(forts):
             if 'cooldown_complete_timestamp_ms' in fort:
                 self.bot.fort_timeouts[fort["id"]] = fort['cooldown_complete_timestamp_ms']
                 forts.remove(fort)