tradedangerous 10.15.2__py3-none-any.whl → 10.16.1__py3-none-any.whl

tradedangerous/plugins/spansh_plug.py

@@ -14,12 +14,21 @@ from .. import plugins, cache, fs, transfers, csvexport
 SOURCE_URL = 'https://downloads.spansh.co.uk/galaxy_stations.json'
 
 STATION_TYPE_MAP = {
-    'Drake-Class Carrier': 24,  # fleet carriers
-    'Settlement': 25,           # odyssey settlements
+    'None' : [0, False],
+    'Outpost' : [1, False],
+    'Coriolis Starport' : [2, False],
+    'Ocellus Starport' : [3, False],
+    'Orbis Starport' : [4, False],
+    'Planetary Outpost' : [11, True],
+    'Planetary Port' : [12, True],
+    'Mega ship' : [13, False],
+    'Asteroid base' : [14, False],
+    'Drake-Class Carrier': [24, False],  # fleet carriers
+    'Settlement': [25, True],           # odyssey settlements
 }
 
-System = namedtuple('System', 'name,pos_x,pos_y,pos_z,modified')
-Station = namedtuple('Station', 'name,distance,max_pad_size,market,black_market,shipyard,outfitting,rearm,refuel,repair,planetary,type,modified')
+System = namedtuple('System', 'id,name,pos_x,pos_y,pos_z,modified')
+Station = namedtuple('Station', 'id,name,distance,max_pad_size,market,black_market,shipyard,outfitting,rearm,refuel,repair,planetary,type,modified')
 Commodity = namedtuple('Commodity', 'id,name,category,demand,supply,sell,buy,modified')
 
 
@@ -68,40 +77,56 @@ class ImportPlugin(plugins.ImportPluginBase):
         assert not (self.url and self.file), 'Provide either url or file, not both'
         if self.file and (self.file != '-'):
             self.file = (Path(self.tdenv.cwDir) / self.file).resolve()
-        self.known_space = self.load_known_space()
+        if not self.tdb.dbPath.exists():
+            ri_path = self.tdb.dataPath / Path("RareItem.csv")
+            rib_path = ri_path.with_suffix(".tmp")
+            if ri_path.exists():
+                if rib_path.exists():
+                    rib_path.unlink()
+                ri_path.rename(rib_path)
+            cache.buildCache(self.tdb, self.tdenv)
+            if ri_path.exists():
+                ri_path.unlink()
+            if rib_path.exists():
+                rib_path.rename(ri_path)
+        
+        # self.known_space = self.load_known_space()
+        self.known_systems = self.load_known_systems()
+        self.known_stations = self.load_known_stations()
         self.known_commodities = self.load_known_commodities()
 
     def print(self, *args, **kwargs):
         return self.tdenv.uprint(*args, **kwargs)
 
     def run(self):
-        fs.ensurefolder(self.tdenv.tmpDir)
-        filePath = self.tdenv.tmpDir / Path("spansh.prices")
-        if self.tdenv.detail < 1:
+        # fs.ensurefolder(self.tdenv.tmpDir)
+        # filePath = self.tdenv.tmpDir / Path("spansh.prices")
+        if not self.tdenv.detail:
             self.print('This will take at least several minutes...')
             self.print('You can increase verbosity (-v) to get a sense of progress')
-        with open(filePath, 'w') as f, Timing() as timing:
-            self.print(f'Writing prices to {filePath}')
-            f.write('# Generated from spansh galaxy data\n')
-            f.write(f'# Source: {self.file or self.url}\n')
-            f.write('#\n')
-            f.write((
-                '#     {name:50s}  {sell:>7s}  {buy:>7s}  '
-                '{demand:>11s}  {supply:>11s}  {ts}\n'
-            ).format(
-                name='Item Name',
-                sell='SellCr',
-                buy='BuyCr',
-                demand='Demand',
-                supply='Supply',
-                ts='Timestamp',
-            ))
+        with Timing() as timing:
+        # with open(filePath, 'w') as f, Timing() as timing:
+        #     self.print(f'Writing prices to {filePath}')
+        #     f.write('# Generated from spansh galaxy data\n')
+        #     f.write(f'# Source: {self.file or self.url}\n')
+        #     f.write('#\n')
+        #     f.write((
+        #         '#     {name:50s}  {sell:>7s}  {buy:>7s}  '
+        #         '{demand:>11s}  {supply:>11s}  {ts}\n'
+        #     ).format(
+        #         name='Item Name',
+        #         sell='SellCr',
+        #         buy='BuyCr',
+        #         demand='Demand',
+        #         supply='Supply',
+        #         ts='Timestamp',
+        #     ))
             system_count = 0
             total_station_count = 0
             total_commodity_count = 0
-            self.need_commit = False
-            self.update_cache = False
-            seen_stations = set()
+            # self.need_commit = False
+            # self.update_cache = False
+            # seen_stations = set()
             for system, stations in self.data_stream():
                 self.ensure_system(system)
                 station_count = 0
@@ -109,64 +134,104 @@ class ImportPlugin(plugins.ImportPluginBase):
                 for station, commodities in stations:
                     fq_station_name = f'@{system.name.upper()}/{station.name}'
                     if self.maxage and (datetime.now() - station.modified) > timedelta(days=self.maxage):
-                        if self.tdenv.detail >= 1:
+                        if self.tdenv.detail:
                             self.print(f'        |  {fq_station_name:50s}  |  Skipping station due to age: {datetime.now() - station.modified}, ts: {station.modified}')
                         continue
-                    if (system.name.upper(), station.name.upper()) in seen_stations:
-                        if self.tdenv.detail >= 1:
-                            self.print(f'        |  {fq_station_name:50s}  |  Skipping duplicate station record')
-                        continue
-                    seen_stations.add((system.name.upper(), station.name.upper()))
+                    # if (system.name.upper(), station.name.upper()) in seen_stations:
+                    #     if self.tdenv.detail:
+                    #         self.print(f'        |  {fq_station_name:50s}  |  Skipping duplicate station record')
+                    #     continue
+                    # seen_stations.add((system.name.upper(), station.name.upper()))
                     self.ensure_station(system, station)
-                    f.write('\n')
-                    f.write(f'@ {system.name.upper()}/{station.name}\n')
-                    categories = self.categorise_commodities(commodities)
-                    for category_name, category_commodities in categories.items():
-                        f.write(f'   + {category_name}\n')
-                        for commodity in category_commodities:
-                            commodity = self.ensure_commodity(station, commodity)
-                            f.write((
-                                '      {name:50s}  {sell:7d}  {buy:7d}  '
-                                '{demand:10d}?  {supply:10d}?  {modified}\n'
-                            ).format(
-                                name=commodity.name,
-                                sell=commodity.sell,
-                                buy=commodity.buy,
-                                demand=commodity.demand,
-                                supply=commodity.supply,
-                                modified=commodity.modified,
-                            ))
-                            commodity_count += 1
+                    # f.write('\n')
+                    # f.write(f'@ {system.name.upper()}/{station.name}\n')
+                    
+                    items = []
+                    for commodity in commodities:
+                        commodity = self.ensure_commodity(commodity)
+                        result = self.execute("""SELECT modified FROM StationItem
+                                        WHERE station_id = ? AND item_id = ?""",
+                                        station.id, commodity.id, ).fetchone()
+                        modified = parse_ts(result[0]) if result else None
+                        if modified and commodity.modified <= modified:
+                            if self.tdenv.detail > 2:
+                                self.print(f'        |  {commodity.name:50s}  |  Skipping older commodity data')
+                            continue
+                        items.append((station.id, commodity.id, commodity.modified,
+                            commodity.sell, commodity.demand, -1,
+                            commodity.buy, commodity.supply, -1, 0))
+                    if items:
+                        for item in items:
+                            self.execute("""INSERT OR REPLACE INTO StationItem (
+                                station_id, item_id, modified,
+                                demand_price, demand_units, demand_level,
+                                supply_price, supply_units, supply_level, from_live
+                            ) VALUES (
+                                ?, ?, IFNULL(?, CURRENT_TIMESTAMP),
+                                ?, ?, ?,
+                                ?, ?, ?, ?
+                            )""", *item )
+                        self.execute('COMMIT')
+                        commodity_count += 1
+                    
+                    # categories = self.categorise_commodities(commodities)
+                    # for category_name, category_commodities in categories.items():
+                    #     f.write(f'   + {category_name}\n')
+                    #     for commodity in category_commodities:
+                    #         commodity = self.ensure_commodity(commodity)
+                    #         f.write((
+                    #             '      {name:50s}  {sell:7d}  {buy:7d}  '
+                    #             '{demand:10d}?  {supply:10d}?  {modified}\n'
+                    #         ).format(
+                    #             name=commodity.name,
+                    #             sell=commodity.sell,
+                    #             buy=commodity.buy,
+                    #             demand=commodity.demand,
+                    #             supply=commodity.supply,
+                    #             modified=commodity.modified,
+                    #         ))
+                    #         commodity_count += 1
                     station_count += 1
                 system_count += 1
                 total_station_count += station_count
                 total_commodity_count += commodity_count
-                if self.tdenv.detail >= 1:
+                if self.tdenv.detail:
                     self.print(
                         f'{system_count:6d}  |  {system.name.upper():50s}  |  '
                         f'{station_count:3d} st  {commodity_count:6d} co'
                     )
-                if self.need_commit:
-                    self.execute('COMMIT')
-                    self.need_commit = False
-                    self.update_cache = True
+                # self.execute('COMMIT')
+                # if self.need_commit:
+                #     self.execute('COMMIT')
+                #     self.need_commit = False
+                #     self.update_cache = True
                     
             # Need to make sure cached tables are updated, if changes were made
-            if self.update_cache:
-                for table in [ "Item", "Station", "System" ]:
-                    _, path = csvexport.exportTableToFile( self.tdb, self.tdenv, table )
+            # if self.update_cache:
+            #     for table in [ "Item", "Station", "System" ]:
+            #         _, path = csvexport.exportTableToFile( self.tdb, self.tdenv, table )
             
+            self.execute('COMMIT')
+            # Need to make sure cached tables are updated
+            for table in [ "Item", "Station", "System", "StationItem" ]:
+                _, path = csvexport.exportTableToFile( self.tdb, self.tdenv, table )
+                        
             self.print(
                 f'{timedelta(seconds=int(timing.elapsed))!s}  Done  '
                 f'{total_station_count} st  {total_commodity_count} co'
             )
             
-        if not self.listener:
-            with Timing() as timing:
-                self.print('Importing to cache...')
-                self.tdenv.mergeImport = True
-                cache.importDataFromFile(self.tdb, self.tdenv, filePath)
-                self.print(f'Cache import completed in {timedelta(seconds=int(timing.elapsed))!s}')
+        with Timing() as timing:
+            self.print('Exporting to cache...')
+            cache.regeneratePricesFile(self.tdb, self.tdenv)
+            self.print(f'Cache export completed in {timedelta(seconds=int(timing.elapsed))!s}')
+
+        # if not self.listener:
+        #     with Timing() as timing:
+        #         self.print('Importing to database...')
+        #         self.tdenv.mergeImport = True
+        #         cache.importDataFromFile(self.tdb, self.tdenv, filePath)
+        #         self.print(f'Database import completed in {timedelta(seconds=int(timing.elapsed))!s}')
         return False
 
     def data_stream(self):
@@ -197,56 +262,77 @@ class ImportPlugin(plugins.ImportPluginBase):
         return categories
 
     def execute(self, query, *params, **kwparams):
-        # attempts = 5
+        attempts = 5
         cursor = self.tdb.getDB().cursor()
         while True:
             try:
                 return cursor.execute(query, params or kwparams)
             except sqlite3.OperationalError as ex:
-                # if not attempts:
-                #     raise
-                # attempts -= 1
+                if not attempts:
+                    raise
+                attempts -= 1
                 self.print(f'Retrying query \'{query}\': {ex!s}')
                 time.sleep(1)
 
-    def load_known_space(self):
-        cache = {}
-        result = self.execute(
-            '''
-            SELECT System.name, Station.name FROM System
-            LEFT JOIN Station USING (system_id)
-            '''
-        ).fetchall()
-        for system, station in result:
-            cache.setdefault(system.upper(), set())
-            if station is not None:
-                cache[system.upper()].add(station.upper())
-        return cache
-
+    # def load_known_space(self):
+    #     cache = {}
+    #     result = self.execute(
+    #         '''
+    #         SELECT System.name, Station.name FROM System
+    #         LEFT JOIN Station USING (system_id)
+    #         '''
+    #     ).fetchall()
+    #     for system, station in result:
+    #         cache.setdefault(system.upper(), set())
+    #         if station is not None:
+    #             cache[system.upper()].add(station.upper())
+    #     return cache
+    
+    def load_known_systems(self):
+        try:
+            return dict(self.execute('SELECT system_id, name FROM System').fetchall())
+        except:
+            return dict()
+    
+    def load_known_stations(self):
+        try:
+            return dict(self.execute('SELECT station_id, name FROM Station').fetchall())
+        except:
+            return dict()
+    
     def load_known_commodities(self):
-        return dict(self.execute('SELECT fdev_id, name FROM Item').fetchall())
+        try:
+            return dict(self.execute('SELECT fdev_id, name FROM Item').fetchall())
+        except:
+            return dict()
 
     def ensure_system(self, system):
-        if system.name.upper() in self.known_space:
+        if system.id in self.known_systems:
             return
         self.execute(
             '''
-            INSERT INTO System (name, pos_x, pos_y, pos_z, modified) VALUES (?, ?, ?, ?, ?)
+            INSERT INTO System (system_id, name, pos_x, pos_y, pos_z, modified) VALUES (?, ?, ?, ?, ?, ?)
             ''',
-            system.name, system.pos_x, system.pos_y, system.pos_z, system.modified,
+            system.id, system.name, system.pos_x, system.pos_y, system.pos_z, system.modified,
         )
-        self.need_commit = True
-        if self.tdenv.detail >= 2:
+        self.execute('COMMIT')
+        if self.tdenv.detail > 1:
             self.print(f'        |  {system.name.upper():50s}  |  Added missing system')
-        self.known_space[system.name.upper()] = set()
+        self.known_systems[system.id] = system.name
 
     def ensure_station(self, system, station):
-        if station.name.upper() in self.known_space.get(system.name.upper(), set()):
+        if station.id in self.known_stations:
+            system_id = self.execute('SELECT system_id FROM Station WHERE station_id = ?', station.id, ).fetchone()[0]
+            if system_id != system.id:
+                self.print(f'        |  {station.name:50s}  |  Megaship station moved, updating system')
+                self.execute("UPDATE Station SET system_id = ? WHERE station_id = ?", system.id, station.id, )
+                self.execute('COMMIT')
             return
         self.execute(
             '''
             INSERT INTO Station (
                 system_id,
+                station_id,
                 name,
                 ls_from_star,
                 max_pad_size,
@@ -263,10 +349,11 @@ class ImportPlugin(plugins.ImportPluginBase):
             )
             VALUES (
                 (SELECT system_id FROM System WHERE upper(name) = ?),
-                ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
+                ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
             )
             ''',
             system.name.upper(),
+            station.id,
             station.name,
             station.distance,
             station.max_pad_size,
@@ -281,26 +368,26 @@ class ImportPlugin(plugins.ImportPluginBase):
             station.modified,
             station.type,
         )
-        self.need_commit = True
-        if self.tdenv.detail >= 2:
+        self.execute('COMMIT')
+        if self.tdenv.detail > 1:
             self.print(f'        |  {station.name:50s}  |  Added missing station')
-        self.known_space[system.name.upper()].add(station.name.upper())
+        self.known_stations[station.id]= station.name
 
-    def ensure_commodity(self, station, commodity):
+    def ensure_commodity(self, commodity):
         if commodity.id in self.known_commodities:
-            if self.known_commodities[commodity.id] != commodity.name:
-                if self.tdenv.detail >= 3:
-                    self.print(f'        |    -  {station.name:45s}  |  Replace "{commodity.name}" with pre-existing "{self.known_commodities[commodity.id]}"')
-                return Commodity(
-                    id=commodity.id,
-                    name=self.known_commodities[commodity.id],
-                    category=commodity.category,
-                    demand=commodity.demand,
-                    supply=commodity.supply,
-                    sell=commodity.sell,
-                    buy=commodity.buy,
-                    modified=commodity.modified,
-                )
+            # if self.known_commodities[commodity.id] != commodity.name:
+            #     if self.tdenv.detail >= 3:
+            #         self.print(f'        |    -  {commodity.name:45s}  |  Replace with pre-existing "{self.known_commodities[commodity.id]}"')
+            #     return Commodity(
+            #         id=commodity.id,
+            #         name=self.known_commodities[commodity.id],
+            #         category=commodity.category,
+            #         demand=commodity.demand,
+            #         supply=commodity.supply,
+            #         sell=commodity.sell,
+            #         buy=commodity.buy,
+            #         modified=commodity.modified,
+            #     )
             return commodity
         self.execute(
             '''
@@ -333,8 +420,8 @@ class ImportPlugin(plugins.ImportPluginBase):
                         WHERE fdev_id = ?""",
                         ui_order, line[2],)                    
         
-        self.need_commit = True
-        if self.tdenv.detail >= 2:
+        self.execute('COMMIT')
+        if self.tdenv.detail > 1:
             self.print(f'        |  {commodity.name:50s}  |  Added missing commodity')
         self.known_commodities[commodity.id] = commodity.name
         return commodity
@@ -355,7 +442,8 @@ def ingest_stream(stream):
         coords = system_data.get('coords', {})
         yield (
             System(
-                name=system_data.get('name', 'Unnamed'),
+                id = system_data.get('id64'),
+                name=system_data.get('name', 'Unnamed').strip(),
                 pos_x=coords.get('x', 999999),
                 pos_y=coords.get('y', 999999),
                 pos_z=coords.get('z', 999999),
@@ -368,7 +456,6 @@ def ingest_stream(stream):
 def ingest_stations(system_data):
     """Ingest system-level data, yielding station-level data."""
     targets = [system_data, *system_data.get('bodies', ())]
-    is_planetary = False
     for target in targets:
         for station_data in target.get('stations', ()):
             services = set(station_data.get('services', ()))
@@ -387,7 +474,8 @@ def ingest_stations(system_data):
                 max_pad_size = 'S'
             yield (
                 Station(
-                    name=station_data.get('name', 'Unnamed'),
+                    id = station_data.get('id'),
+                    name=station_data.get('name', 'Unnamed').strip(),
                     distance=station_data.get('distanceToArrival', 999999),
                     max_pad_size=max_pad_size,
                     market=True,
@@ -397,14 +485,12 @@ def ingest_stations(system_data):
                     rearm='Restock' in services,
                     refuel='Refuel' in services,
                     repair='Repair' in services,
-                    planetary=is_planetary,
-                    type=STATION_TYPE_MAP.get(station_data.get('type'), 0),
+                    planetary=STATION_TYPE_MAP.get(station_data.get('type'))[1] or False,
+                    type=STATION_TYPE_MAP.get(station_data.get('type'))[0] or 0,
                     modified=parse_ts(station_data.get('updateTime')),
                 ),
                 ingest_market(market),
             )
-        # first target is system stations, everything else is planetary
-        is_planetary = True
 
 
 def ingest_market(market):

tradedangerous/templates/Category.csv

@@ -0,0 +1,17 @@
+unq:category_id,name
+1,'Chemicals'
+2,'Consumer Items'
+3,'Legal Drugs'
+4,'Foods'
+5,'Industrial Materials'
+6,'Machinery'
+7,'Medicines'
+8,'Metals'
+9,'Minerals'
+10,'Slavery'
+11,'Technology'
+12,'Textiles'
+13,'Waste'
+14,'Weapons'
+15,'Unknown'
+16,'Salvage'

tradedangerous/tradedb.py

@@ -648,6 +648,7 @@ class TradeDB(object):
         
         fs.copy_if_newer((self.templatePath / Path("Added.csv")), (self.csvPath / Path("Added.csv")))
         fs.copy_if_newer((self.templatePath / Path("RareItem.csv")), (self.csvPath / Path("RareItem.csv")))
+        fs.copy_if_newer((self.templatePath / Path("Category.csv")), (self.csvPath / Path("Category.csv")))
         fs.copy_if_newer((self.templatePath / Path("TradeDangerous.sql")), (self.dataPath / Path("TradeDangerous.sql")))
         
         self.dbPath = Path(tdenv.dbFilename or dataPath / TradeDB.defaultDB)

tradedangerous/version.py

@@ -12,5 +12,5 @@
 """just keeper of current version"""
 
 # TODO: remember to update tests when version changes
-__version__ = '10.15.2'
+__version__ = '10.16.1'
 

{tradedangerous-10.15.2.dist-info → tradedangerous-10.16.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 10.15.2
+Version: 10.16.1
 Summary: Trade-Dangerous is a set of powerful trading tools for Elite Dangerous, organized around one of the most powerful trade run optimizers available.
 Home-page: https://github.com/eyeonus/Trade-Dangerous
 Author: eyeonus

{tradedangerous-10.15.2.dist-info → tradedangerous-10.16.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 tradedangerous/__init__.py,sha256=5ZeypoZaM8hlh6c-yTkD8x5hZYP8q3Q8a3bVeicHr90,1122
-tradedangerous/cache.py,sha256=Zt1Mkf5h4tSFdxUV8mpe5v-LTOHLuSlVwuL4aq06fXQ,33721
+tradedangerous/cache.py,sha256=MIoNCWE3AJohhx0r4m5xgf4C_4YkynWgfJyUokhuG98,33859
 tradedangerous/cli.py,sha256=ycGkzMszwpP9OrngFIyhQbYoZ2wzRhJMTDCW1YhLrNI,4727
 tradedangerous/corrections.py,sha256=QMs-7MKLw2imFgIHthnwcpqWT1yJTb3CrABJw9LaKLA,1441
 tradedangerous/csvexport.py,sha256=OcOKe_VIgafw6rCvG3k5tM11KwwoYXMNY5DSSfCC0mU,8705
@@ -15,13 +15,13 @@ tradedangerous/submit-distances.py,sha256=lEHtCLUzR2QNRrgPD-PkDIzHYYHOODZVTRxDsA
 tradedangerous/tools.py,sha256=pp-4WtA12SVaaQHFJFOMTF7EDFRCU2mQeOhC4xoXmEk,1331
 tradedangerous/trade.py,sha256=vBEJZR3Bybesw9FMelcHOTRA7KqKeH-4_wqbJ4VMB_E,1779
 tradedangerous/tradecalc.py,sha256=GyuYZNuyfn0y0eoPbxDEI7dxTJtHmRXAKFMpiR0Z1iU,42004
-tradedangerous/tradedb.py,sha256=5APAM7anzl4CM-bgV1TWLNi1_lkgZ-smVAtvU0M1MtM,73351
+tradedangerous/tradedb.py,sha256=VZHv_U1_EXRFUQbB5nS6YFlFKTO2zbrw37q4YWB2Jjc,73459
 tradedangerous/tradeenv.py,sha256=FeeSvDI4Zpi5hJk2UAwrR_0Y7Y_gtYH0ofPEHKHLEBY,4412
 tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk,368
 tradedangerous/tradegui.py,sha256=JbGFnsWupgesk6hrcUgKSdD9NNDyo0U9gh6m3DccAwU,782
 tradedangerous/transfers.py,sha256=NmXXk2aF88YkAvYqc9Syt_aO6d2jJjC-OxoRFoOyQH4,9923
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=8Ar6G_NOScaKIeRlxzF9L9L6TzUEwTmHyrzuUBkS3mU,647
+tradedangerous/version.py,sha256=RqmS4iVwJ9QzcB35EvHKE2AZG7oAO5y7RdQfn6ZvRGo,647
 tradedangerous/commands/TEMPLATE.py,sha256=7oXL124aqxGHwnb0h9yRylUiwc6M5QrRrGVrubwI1gg,2124
 tradedangerous/commands/__init__.py,sha256=6B0WuqkFBOll5Hj67yKDAnhmyr5ZAnHc6nzUNEUh384,9640
 tradedangerous/commands/buildcache_cmd.py,sha256=oJvP06fA8svnHrfrpWkHKR16cba8GIhHdMOyZqds18Y,2332
@@ -62,18 +62,18 @@ tradedangerous/misc/progress.py,sha256=-_V7E51sIYUtSxeeA1cphBEW4A_OBuH1guEDxUjik
 tradedangerous/plugins/__init__.py,sha256=zCEVbTem1CAM1cOV9r96H3ikjqza3dd-XoaubE5_xkc,7868
 tradedangerous/plugins/edapi_plug.py,sha256=IQxfDGM9IqwuJbDZRL8RFIyGMWzd0YmeJVWUVPDA3Ik,42275
 tradedangerous/plugins/edcd_plug.py,sha256=ZPtRzLhcQZEiwEo3AoPyk3Uy4UmRLM6gv2Qi1s7K_Vs,14469
-tradedangerous/plugins/eddblink_plug.py,sha256=n8AzLh2pJdHdar1SnqSSjCwWPl4f-OKQ8SnmDGXaLFU,54231
+tradedangerous/plugins/eddblink_plug.py,sha256=Ne_5ltiWC1M3MOxS6XaY0DyESJL3XaGI9f-uLf67YiQ,21681
 tradedangerous/plugins/edmc_batch_plug.py,sha256=3Ptr-SZqaZFR8ViIIrp9Ak7rvfU3zl11AZYBhIceN7s,4224
 tradedangerous/plugins/journal_plug.py,sha256=K1oIeI7E3mb04fvYLXyoAh7fOTyM9NBelibTI88MIDQ,23696
 tradedangerous/plugins/netlog_plug.py,sha256=Gw_HSZWpN17D--OIYEM3Vo8y9SvDOv9UwAUfY24kz28,13460
-tradedangerous/plugins/spansh_plug.py,sha256=6gTCln2vKnU2AIF5FsuAP0-ZP2a2tFMJnYkR_FElAVQ,17095
+tradedangerous/plugins/spansh_plug.py,sha256=dDX34KEt_jSjwyP45utQTUgB-oew__F1sYcPb209bC8,21334
 tradedangerous/templates/Added.csv,sha256=8o54civQCcS9y7_DBo0GX196XWRbbREQqKDYTKibsgQ,649
-tradedangerous/templates/DefaultShipIndex.json,sha256=m5cI3vkKiqRk1VKO1Z_8LZrG9nczV0PUMDfBSt4-1RM,94739
+tradedangerous/templates/Category.csv,sha256=8xwUDcBZE25T6x6dZGlRUMTCqeDLt3a9LXU5h6hRHV8,250
 tradedangerous/templates/RareItem.csv,sha256=F1RhRnTD82PiwrVUO-ai2ErGH2PTqNnQaDw5mcgljXs,10483
 tradedangerous/templates/TradeDangerous.sql,sha256=6sjEogGHy-9zYpjPo0Y2a5tElowmHFyJNwrimOUBfHk,8079
-tradedangerous-10.15.2.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-10.15.2.dist-info/METADATA,sha256=u2wFl6SsgCIi4JpYjoAbw-yNgEUNP77UgKCanjyck9E,4421
-tradedangerous-10.15.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-10.15.2.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
-tradedangerous-10.15.2.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
-tradedangerous-10.15.2.dist-info/RECORD,,
+tradedangerous-10.16.1.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-10.16.1.dist-info/METADATA,sha256=b-_m5kXwu5FeCdMaBZDH7p0YQyCjeyxn-42y1VkmTTk,4421
+tradedangerous-10.16.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-10.16.1.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
+tradedangerous-10.16.1.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
+tradedangerous-10.16.1.dist-info/RECORD,,