EvilTrade: Busts now are in dict

  And we also record when that occured.
  Also added maint_busts() which checks each bust to see if it's older
than 7 days. (Currently that's hardcoded, later we can make it get the
rate and when the last clear of busts really was)

  Now on to find_nearest_evilpair()

galaxy.py

@@ -1,6 +1,7 @@
 import jsonlines
 import os
 import logging
+import pendulum
 
 # from twisted.python import log
 from pprint import pprint
@@ -33,15 +34,17 @@ class GameData(object):
         self.usergame = usergame
         self.warps = {}
         self.ports = {}
-        self.busts = []  # Added for evilTrade, just contains sector of port
+        self.busts = (
+            {}
+        )  # Added for evilTrade, just contains sector of port and datetime
         self.config = {}
         # 10 = 300 bytes
         self.warp_groups = 10
         # 3 = 560 bytes
         # 5 = 930 bytes
         self.port_groups = 3
-        # Not sure, it's going to be small I know that
-        self.bust_groups = 10
+        # Not sure, I don't think it will be big.
+        self.bust_groups = 5
 
     def storage_filename(self):
         """ return filename
@@ -58,7 +61,7 @@ class GameData(object):
         self.warps = {}
 
     def reset_busts(self):
-        self.busts = []
+        self.busts = {}
 
     def special_ports(self):
         """ Save the special class ports 0, 9 """
@@ -120,12 +123,13 @@ class GameData(object):
                 writer.write(p)
 
             # Added for evil
-            b = {"busts": []}
-            for bust in sorted(self.busts):
-                b["busts"].append(bust)
+            b = {"busts": {}}
+            for sector in sorted(self.busts.keys()):
+                bust = self.busts[sector]
+                b["busts"][sector] = bust
                 if len(b["busts"]) >= self.bust_groups:
                     writer.write(b)
-                    b = {"busts": []}
+                    b = {"busts": {}}
                     yield
             if len(b["busts"]) > 0:
                 writer.write(b)
@@ -185,12 +189,13 @@ class GameData(object):
                 writer.write(p)
 
             # Added for evil
-            b = {"busts": []}
-            for bust in sorted(self.busts):
-                b["busts"].append(bust)
+            b = {"busts": {}}
+            for sector in sorted(self.busts.keys()):
+                bust = self.busts[sector]
+                b["busts"][sector] = bust
                 if len(b["busts"]) >= self.bust_groups:
                     writer.write(b)
-                    b = {"busts": []}
+                    b = {"busts": {}}
             if len(b["busts"]) > 0:
                 writer.write(b)
 
@@ -210,7 +215,7 @@ class GameData(object):
         self.warps = {}
         self.ports = {}
         self.config = {}
-        self.busts = []
+        self.busts = {}
         if os.path.exists(filename):
             # Load it
             with jsonlines.open(filename) as reader:
@@ -227,8 +232,8 @@ class GameData(object):
                             self.ports[int(s)] = p
                         # self.ports.update(obj["port"])
                     if "busts" in obj:  # evil ports list
-                        for l in obj["busts"]:
-                            self.busts.append(l)
+                        for s, d in obj["busts"].items():
+                            self.busts[int(s)] = d
                     yield
         log.info(
             "Loaded {0} {1}/{2}/{3}/{4}".format(
@@ -250,7 +255,7 @@ class GameData(object):
         self.warps = {}
         self.ports = {}
         self.config = {}
-        self.busts = []
+        self.busts = {}
         if os.path.exists(filename):
             # Load it
             with jsonlines.open(filename) as reader:
@@ -267,8 +272,8 @@ class GameData(object):
                             self.ports[int(s)] = p
                         # self.ports.update(obj["port"])
                     if "busts" in obj:
-                        for l in obj["busts"]:
-                            self.busts.append(l)
+                        for s, d in obj["busts"].items():
+                            self.busts[int(s)] = d
         log.info(
             "Loaded {0} {1}/{2}/{3}/{4}".format(
                 filename,
@@ -328,10 +333,19 @@ class GameData(object):
         # Given sector we add it to busts (avoid using these ports)
         log.debug("Bust {0}".format(sect))
         if sect not in self.busts:
-            self.busts.append(sect)
-            log.debug("completed {0} : {1}".format(sect, self.busts))
+            self.busts[sect] = str(pendulum.now())
+            log.debug("Done {0} | {1}".format(sect, self.busts))
         else:
-            log.debug("{0} already found in bust list".format(sect))
+            log.debug("{0} already is in there".format(sect))
+
+    def maint_busts(self):
+        # Checks the current date to see if any busts need to be cleared
+        rightNow = pendulum.now()
+        for s, d in self.busts:
+            d = pendulum.parse(d)  # Convert string to DateTime obj
+            d = d.add(7)  # Add 7 days
+            if d == rightNow:  # Compare
+                del self.busts[s]
 
     def port_buying(self, sector: int, cargo: str):
         """ Given a sector, is this port buying this? 

proxy.py

@@ -255,8 +255,8 @@ class Game(protocol.Protocol):
             self.gamedata.set_port(self.current_sector, data)
             # log.debug("NOW: {0}".format(self.gamedata.ports[self.current_sector]))
 
-    def theifline(self, line: str):
-        self.log.debug("theifline({0}): {1}".format(self.current_sector, line))
+    def thiefline(self, line: str):
+        self.log.debug("thiefline({0}): {1}".format(self.current_sector, line))
         if "Suddenly you're Busted!" in line:
             # Lets add it into the bust list
             self.gamedata.set_bust(self.current_sector)
@@ -359,7 +359,7 @@ class Game(protocol.Protocol):
                     self.linestate = "warpcim"
                 self.cimline(line)
         elif self.linestate == "thievery":
-            self.theifline(line)
+            self.thiefline(line)
         # elif line.startswith(": "):
         elif line == ": ":
             self.linestate = "cim"