Add newlines to separate scopes

Newlines between scope changes help you to not get lost when reading
source

collate.py

@@ -17,8 +17,8 @@ import outfitting
 # keep a summary of commodities found using in-game names
 # Assumes that the commodity data has already been 'fixed up'
 def addcommodities(data):
-
+    if not data['lastStarport'].get('commodities'):
-    if not data['lastStarport'].get('commodities'): return
+        return
 
     commodityfile = 'commodity.csv'
     commodities = {}
@@ -29,6 +29,7 @@ def addcommodities(data):
             reader = csv.DictReader(csvfile)
             for row in reader:
                 commodities[int(row['id'])] = row	# index by int for easier lookup and sorting
+
     size_pre = len(commodities)
 
     for commodity in data['lastStarport'].get('commodities'):
@@ -39,22 +40,26 @@ def addcommodities(data):
             'category' : companion.category_map.get(commodity['categoryname']) or commodity['categoryname'],
             'name'     : commodity.get('locName') or 'Limpets',
         }
+
         old = commodities.get(key)
+
         if old and companion.category_map.get(commodity['categoryname'], True):
             if new['symbol'] != old['symbol'] or new['name'] != old['name']:
                 raise AssertionError('%s: "%s"!="%s"' % (key, new, old))
+
         commodities[key] = new
 
     if len(commodities) > size_pre:
-
         if isfile(commodityfile):
             if isfile(commodityfile+'.bak'):
                 os.unlink(commodityfile+'.bak')
+
             os.rename(commodityfile, commodityfile+'.bak')
 
         with open(commodityfile, 'w') as csvfile:
             writer = csv.DictWriter(csvfile, ['id', 'symbol', 'category', 'name'])
             writer.writeheader()
+
             for key in sorted(commodities):
                 writer.writerow(commodities[key])
 
@@ -62,7 +67,6 @@ def addcommodities(data):
 
 # keep a summary of modules found
 def addmodules(data):
-
     if not data['lastStarport'].get('modules'): return
 
     outfile = 'outfitting.csv'
@@ -75,17 +79,21 @@ def addmodules(data):
             reader = csv.DictReader(csvfile, restval='')
             for row in reader:
                 modules[int(row['id'])] = row	# index by int for easier lookup and sorting
+
     size_pre = len(modules)
 
     for key,module in data['lastStarport'].get('modules').items():
         # sanity check
         if int(key) != module.get('id'): raise AssertionError('id: %s!=%s' % (key, module['id']))
+
         try:
             new = outfitting.lookup(module, companion.ship_map, True)
+
         except:
             print('%d, %s:' % (module['id'], module['name']))
             print_exc(0)
             new = None
+
         if new:
             old = modules.get(int(key))
             if old:
@@ -93,20 +101,23 @@ def addmodules(data):
                 for thing in fields:
                     if not old.get(thing) and new.get(thing):
                         size_pre -= 1
+
                     elif str(new.get(thing,'')) != old.get(thing):
                         raise AssertionError('%s: %s "%s"!="%s"' % (key, thing, new.get(thing), old.get(thing)))
+
             modules[int(key)] = new
 
     if len(modules) > size_pre:
-
         if isfile(outfile):
             if isfile(outfile+'.bak'):
                 os.unlink(outfile+'.bak')
+
             os.rename(outfile, outfile+'.bak')
 
         with open(outfile, 'w') as csvfile:
             writer = csv.DictWriter(csvfile, fields, extrasaction='ignore')
             writer.writeheader()
+
             for key in sorted(modules):
                 writer.writerow(modules[key])
 
@@ -114,7 +125,6 @@ def addmodules(data):
 
 # keep a summary of ships found
 def addships(data):
-
     if not data['lastStarport'].get('ships'): return
 
     shipfile = 'shipyard.csv'
@@ -127,6 +137,7 @@ def addships(data):
             reader = csv.DictReader(csvfile, restval='')
             for row in reader:
                 ships[int(row['id'])] = row	# index by int for easier lookup and sorting
+
     size_pre = len(ships)
 
     for ship in list((data['lastStarport']['ships'].get('shipyard_list') or {}).values()) + data['lastStarport']['ships'].get('unavailable_list'):
@@ -141,8 +152,10 @@ def addships(data):
                     if not old.get(thing) and new.get(thing):
                         ships[int(key)] = new
                         size_pre -= 1
+
                     elif str(new.get(thing,'')) != old.get(thing):
                         raise AssertionError('%s: %s "%s"!="%s"' % (key, thing, new.get(thing), old.get(thing)))
+
             ships[int(key)] = new
 
     if len(ships) > size_pre:
@@ -150,11 +163,13 @@ def addships(data):
         if isfile(shipfile):
             if isfile(shipfile+'.bak'):
                 os.unlink(shipfile+'.bak')
+
             os.rename(shipfile, shipfile+'.bak')
 
         with open(shipfile, 'w') as csvfile:
             writer = csv.DictWriter(csvfile, ['id', 'symbol', 'name'])
             writer.writeheader()
+
             for key in sorted(ships):
                 writer.writerow(ships[key])
 
@@ -173,18 +188,25 @@ if __name__ == "__main__":
                 data = json.load(h)
                 if not data['commander'].get('docked'):
                     print('Not docked!')
+
                 elif not data.get('lastStarport'):
                     print('No starport!')
+
                 else:
                     if data['lastStarport'].get('commodities'):
                         addcommodities(data)
+
                     else:
                         print('No market')
+
                     if data['lastStarport'].get('modules'):
                         addmodules(data)
+
                     else:
                         print('No outfitting')
+
                     if data['lastStarport'].get('ships'):
                         addships(data)
+
                     else:
                         print('No shipyard')