trade routes instead of resources

nullptr/models/marketplace.py

@@ -100,7 +100,7 @@ class Marketplace(Base):
         r += 'X: ' + ', '.join(self.exchange) + '\n'
       
       r += '\n'
-      for p in self.prices.values():
-        t = self.rtype(p['symbol'])
-        r += f'{t} {p["symbol"]:25s} {p["sell"]:5d} {p["buy"]:5d}\n'
+      for res, p in self.prices.items():
+        t = self.rtype(res)
+        r += f'{t} {res:25s} {p.sell:5d} {p.buy:5d}\n'
     return r

nullptr/models/ship.py

@@ -99,6 +99,8 @@ class Ship(Base):
     
   def deliverable_cargo(self, contract):
     result = []
+    if contract is None: 
+      return result
     for d in contract.deliveries:
       if self.get_cargo(d['trade_symbol']) > 0:
         result.append(d['trade_symbol'])
@@ -126,6 +128,8 @@ class Ship(Base):
     mstatus = self.mission_status
     if mstatus == 'error': 
       mstatus = mstatus.upper()
+    if mstatus is None:
+      mstatus = 'none'
     status = self.status.lower()
     if status.startswith('in_'):
       status = status[3:]