tradedangerous 11.4.0__py3-none-any.whl → 11.5.0__py3-none-any.whl

tradedangerous/cache.py

@@ -1005,7 +1005,7 @@ def buildCache(tdb, tdenv):
                         importName
                     )
         prog.increment(1)
-
+        
         with prog.sub_task(description="Save DB"):
             tempDB.commit()
     

tradedangerous/commands/buy_cmd.py

@@ -9,7 +9,7 @@ from .parsing import (
     NoPlanetSwitch, OdysseyArgument, PadSizeArgument, ParseArgument, PlanetaryArgument,
 )
 
-
+# TODO: Add UPGRADE_MODE
 ITEM_MODE = "Item"
 SHIP_MODE = "Ship"
 

tradedangerous/commands/commandenv.py

@@ -70,6 +70,13 @@ class CommandEnv(TradeEnv):
             the properties we have are valid.
         """
         self.tdb = tdb
+        db_change = pathlib.Path(self.tdb.templatePath, 'database_changes.json')
+        if pathlib.Path.exists(db_change):
+            import ijson
+            with open(db_change) as file:
+                for change in ijson.items(file, 'item'):
+                    self.tdb.getDB().execute(change)
+            db_change.unlink()
         
         self.checkMFD()
         self.checkFromToNear()

tradedangerous/commands/exceptions.py

@@ -7,7 +7,7 @@ from ..tradeexcept import TradeException
 class UsageError(TradeException):
     def __init__(self, title, usage):
         self.title, self.usage = title, usage
-
+    
     def __str__(self):
         return self.title + "\n\n" + self.usage
 
@@ -20,7 +20,7 @@ class CommandLineError(TradeException):
     """
     def __init__(self, errorStr, usage=None):
         self.errorStr, self.usage = errorStr, usage
- 
+    
     def __str__(self):
         if self.usage:
             return "ERROR: {}\n\n{}".format(self.errorStr, self.usage)
@@ -36,7 +36,7 @@ class NoDataError(TradeException):
     """
     def __init__(self, errorStr):
         self.errorStr = errorStr
-
+    
     def __str__(self):
         return f"""Error: {self.errorStr}
 Possible causes:

tradedangerous/commands/parsing.py

@@ -28,7 +28,7 @@ class CreditParser(int):
     'k' for thousands, 'm' for millions and 'b' for billions.
     """
     suffixes = {'k': 10**3, 'm': 10**6, 'b': 10**9}
-
+    
     def __new__(cls, val, **kwargs):
         if isinstance(val, str):
             if val[-1] in CreditParser.suffixes:

tradedangerous/commands/shipvendor_cmd.py

@@ -208,7 +208,7 @@ def run(results, cmdenv, tdb):
     for ship in ships.values():
         if action(tdb, cmdenv, station, ship):
             dataToExport = True
-
+    
     cmdenv.DEBUG0("dataToExport = {}", dataToExport)
     
     maybeExportToCSV(tdb, cmdenv)

tradedangerous/fs.py

@@ -35,7 +35,7 @@ def copy_if_newer(src, dst):
     dstPath = pathify(dst)
     if dstPath.exists() and dstPath.stat().st_mtime >= srcPath.stat().st_mtime:
         return srcPath
-
+    
     shcopy(str(srcPath), str(dstPath))
     return dstPath
 
@@ -105,29 +105,29 @@ def file_line_count(from_file: PathLike, buf_size: int = 128 * 1024, *, missing_
     """ counts the number of newline characters in a given file. """
     if not isinstance(from_file, Path):
         from_file = Path(from_file)
-
+    
     if missing_ok and not from_file.exists():
         return 0
-
+    
     # Pre-allocate a buffer so that we aren't putting pressure on the garbage collector.
     buf = bytearray(buf_size)
-
+    
     # Capture it's counting method, so we don't have to keep looking that up on
     # large files.
     counter = buf.count
-
+    
     total = 0
     with from_file.open("rb") as fh:
         # Capture the 'readinto' method to avoid lookups.
         reader = fh.readinto
-
+        
         # read into the buffer and capture the number of bytes fetched,
         # which will be 'size' until the last read from the file.
         read = reader(buf)
         while read == buf_size:  # nominal case for large files
             total += counter(b'\n')
             read = reader(buf)
-
+        
         # when 0 <= read < buf_size we're on the last page of the
         # file, so we need to take a slice of the buffer, which creates
         # a new object, thus we also have to lookup count. it's trivial

tradedangerous/jsonprices.py

@@ -118,7 +118,7 @@ def load_prices_json(
             blackMarket = '?'
     except KeyError:
         blackMarket = '?'
-
+    
     try:
         maxPadSize = stnData['mps'].upper()
         if maxPadSize not in ['S', 'M', 'L']:

tradedangerous/misc/progress.py

@@ -73,10 +73,10 @@ class Progress:
         self.show = bool(show)
         if not show:
             return
-
+        
         if style is None:
             style = DefaultBar
-
+        
         self.max_value = 0 if max_value is None else max(max_value, start)
         self.value = start
         self.prefix = prefix or ""
@@ -90,23 +90,23 @@ class Progress:
             # Hide it once it's finished, update it for us, 4x a second
             transient=True, auto_refresh=True, refresh_per_second=5
         )
-
+        
         # Now we add an actual task to track progress on.
         self.task = self.progress.add_task("Working...", total=max_value, start=True)
         if self.value:
             self.progress.update(self.task, advance=self.value)
-
+        
         # And show the task tracker.
         self.progress.start()
-
+    
     def __enter__(self):
         """ Context manager.
-        
+            
             Example use:
-
+                
                 import time
                 import tradedangerous.progress
-
+                
                 # Progress(max_value=100, width=32, style=progress.CountingBar)
                 with progress.Progress(100, 32, style=progress.CountingBar) as prog:
                     for i in range(100):
@@ -114,10 +114,10 @@ class Progress:
                         time.sleep(3)
         """
         return self
-
+    
     def __exit__(self, *args, **kwargs):
         self.clear()
-
+    
     def increment(self, value: Optional[float] = None, description: Optional[str] = None, *, progress: Optional[float] = None) -> None:
         """
         Increase the progress of the bar by a given amount.
@@ -139,30 +139,30 @@ class Progress:
         elif value:
             self.value += value              # Update our internal count
             bump = True
-
+        
         if self.value >= self.max_value:  # Did we go past the end? Increase the end.
             self.max_value += value * 2
             self.progress.update(self.task, description=self.prefix, total=self.max_value)
             bump = True
-
+        
         if bump and self.max_value > 0:
             self.progress.update(self.task, description=self.prefix, completed=self.value)
-
+    
     def clear(self) -> None:
         """ Remove the current progress bar, if any. """
         # These two shouldn't happen separately, but incase someone tinkers, test each
         # separately and shut them down.
         if not self.show:
             return
-
+        
         if self.task:
             self.progress.remove_task(self.task)
             self.task = None
-
+        
         if self.progress:
             self.progress.stop()
             self.progress = None
-            
+    
     @contextmanager
     def sub_task(self, description: str, max_value: Optional[int] = None, width: int = 25):
         if not self.show:
@@ -173,7 +173,7 @@ class Progress:
             yield task
         finally:
             self.progress.remove_task(task)
-
+    
     def update_task(self, task: TaskID, advance: Union[float, int], description: Optional[str] = None):
         if self.show:
             self.progress.update(task, advance=advance, description=description)

tradedangerous/plugins/eddblink_plug.py

@@ -45,7 +45,7 @@ def _count_listing_entries(tdenv: TradeEnv, listings: Path) -> int:
         else:
             tdenv.DEBUG0("Listings file is empty, nothing to do.")
         return 0
-
+    
     return count + 1  # kfsone: Doesn't the header already make this + 1?
 
 
@@ -94,7 +94,7 @@ class ImportPlugin(plugins.ImportPluginBase):
     def __init__(self, tdb, tdenv):
         super().__init__(tdb, tdenv)
         
-        self.dataPath = Path(os.environ.get('TD_EDDB')) if os.environ.get('TD_EDDB') else self.tdb.dataPath / Path("eddb")
+        self.dataPath = os.environ.get('TD_EDDB') or self.tdenv.tmpDir
         self.categoriesPath = Path("Category.csv")
         self.commoditiesPath = Path("Item.csv")
         self.rareItemPath = Path("RareItem.csv")
@@ -166,13 +166,13 @@ class ImportPlugin(plugins.ImportPluginBase):
         """
         db = self.tdb.getDB()
         self.tdenv.NOTE("Purging Systems with no stations: Start time = {}", self.now())
-
+        
         db.execute("""
             DELETE FROM System
              WHERE NOT EXISTS(SELECT 1 FROM Station WHERE Station.system_id = System.system_id)
         """)
         db.commit()
-
+        
         self.tdenv.NOTE("Finished purging Systems. End time = {}", self.now())
     
     def importListings(self, listings_file):
@@ -188,9 +188,9 @@ class ImportPlugin(plugins.ImportPluginBase):
         if not total:
             self.tdenv.NOTE("No listings")
             return
-
+        
         self.tdenv.NOTE("Processing market data from {}: Start time = {}. Live = {}", listings_file, self.now(), from_live)
-
+        
         db = self.tdb.getDB()
         stmt_unliven_station = """UPDATE StationItem SET from_live = 0 WHERE station_id = ?"""
         stmt_flush_station   = """DELETE from StationItem WHERE station_id = ?"""
@@ -253,7 +253,7 @@ class ImportPlugin(plugins.ImportPluginBase):
                             transaction_items += 1
                             skip_station = True
                             continue
-
+                        
                         # Unless the import file data is newer, nothing else needs to be done for this station,
                         # so the rest of the listings for this station can be skipped.
                         if listing_time <= last_modified:
@@ -276,7 +276,7 @@ class ImportPlugin(plugins.ImportPluginBase):
                 # listings.csv includes rare items, which we are ignoring.
                 if item_id not in item_lookup:
                     continue
-
+                
                 demand_price = int(listing['sell_price'])
                 demand_units = int(listing['demand'])
                 demand_level = int(listing.get('demand_bracket') or '-1')
@@ -292,16 +292,16 @@ class ImportPlugin(plugins.ImportPluginBase):
                         supply_price, supply_units, supply_level,
                 ))
                 transaction_items += 1
-
+        
         # These will take a little while, which has four steps, so we'll make it a counter.
         with pbar.Progress(1, 40, prefix="Saving"):
             # Do a final commit to be sure
             cursor.execute("COMMIT")
-
+        
         if self.getOption("optimize"):
             with pbar.Progress(1, 40, prefix="Optimizing"):
                 db.execute("VACUUM")
-
+        
         self.tdb.close()
         
         self.tdenv.NOTE("Finished processing market data. End time = {}", self.now())
@@ -370,9 +370,9 @@ class ImportPlugin(plugins.ImportPluginBase):
                 if rib_path.exists():
                     rib_path.unlink()
                 ri_path.rename(rib_path)
-
+            
             self.tdb.close()
-
+            
             self.tdb.reloadCache()
             self.tdb.close()
             
@@ -432,7 +432,7 @@ class ImportPlugin(plugins.ImportPluginBase):
             if self.downloadFile(self.upgradesPath) or self.getOption("force"):
                 transfers.download(self.tdenv, self.urlOutfitting, self.FDevOutfittingPath)
                 buildCache = True
-
+        
         if self.getOption("ship"):
             if self.downloadFile(self.shipPath) or self.getOption("force"):
                 transfers.download(self.tdenv, self.urlShipyard, self.FDevShipyardPath)
@@ -468,7 +468,7 @@ class ImportPlugin(plugins.ImportPluginBase):
             self.tdb.close()
             self.tdb.reloadCache()
             self.tdb.close()
-
+        
         if self.getOption("purge"):
             self.purgeSystems()
             self.tdb.close()
@@ -478,7 +478,7 @@ class ImportPlugin(plugins.ImportPluginBase):
                 self.importListings(self.listingsPath)
             if self.downloadFile(self.liveListingsPath) or self.getOption("force"):
                 self.importListings(self.liveListingsPath)
-
+        
         if self.getOption("listings"):
             self.tdenv.NOTE("Regenerating .prices file.")
             cache.regeneratePricesFile(self.tdb, self.tdenv)

tradedangerous/plugins/spansh_plug.py

@@ -39,10 +39,9 @@ STATION_TYPE_MAP = {
     'Mega ship': [13, False],
     'Asteroid base': [14, False],
     'Drake-Class Carrier': [24, False],  # fleet carriers
-    'Settlement': [25, True],           # odyssey settlements
+    'Settlement': [25, True],            # odyssey settlements
 }
 
-
 if dataclass:
     # Dataclass with slots is considerably cheaper and faster than namedtuple
     # but is only reliably introduced in 3.10+
@@ -72,8 +71,22 @@ if dataclass:
         planetary:      str     # should be Optional[bool]
         type:           int     # station type
         modified:       float
-
-
+    
+    @dataclass(slots=True)
+    class Ship:
+        id:             int
+        name:           str
+        modified:       float
+    
+    @dataclass(slots=True)
+    class Module:
+        id:             int
+        name:           str
+        cls:            int
+        rating:         str
+        ship:           str
+        modified:       float
+    
     @dataclass(slots=True)
     class Commodity:
         id:             int
@@ -90,6 +103,8 @@ else:
     Station = namedtuple('Station',
                          'id,system_id,name,distance,max_pad_size,'
                          'market,black_market,shipyard,outfitting,rearm,refuel,repair,planetary,type,modified')
+    Ship = namedtuple('Ship', 'id,name,modified')
+    Module = namedtuple('Module', 'id,name,cls,rating,ship,modified')
     Commodity = namedtuple('Commodity', 'id,name,category,demand,supply,sell,buy,modified')
 
 
@@ -110,7 +125,7 @@ class Timing:
     
     @property
     def elapsed(self) -> Optional[float]:
-        """ If the timing has finish, calculates the elapsed time. """
+        """ If the timing has finished, calculates the elapsed time. """
         if self.start_ts is None:
             return None
         return (self.end_ts or time.perf_counter()) - self.start_ts
@@ -175,7 +190,7 @@ class Progresser:
             self.progress.update(task, advance=advance, description=description)
 
 
-def get_timings(started: float, system_count: int, total_station_count: int, *, min_count: int = 100) -> str:
+def get_timings(started: float, system_count: int, total_station_count: int, *, min_count: int = 100) -> tuple[float, str]:
     """ describes how long it is taking to process each system and station """
     elapsed = time.time() - started
     timings = "sys="
@@ -198,7 +213,7 @@ class ImportPlugin(plugins.ImportPluginBase):
     """
     
     pluginOptions = {
-        'url':  f'URL to download galaxy data from (defaults to {SOURCE_URL})',
+        'url': f'URL to download galaxy data from (defaults to {SOURCE_URL})',
         'file': 'Local filename to import galaxy data from; use "-" to load from stdin',
         'maxage': 'Skip all entries older than specified age in days, ex.: maxage=1.5',
     }
@@ -231,6 +246,8 @@ class ImportPlugin(plugins.ImportPluginBase):
         
         self.known_systems = self.load_known_systems()
         self.known_stations = self.load_known_stations()
+        self.known_ships = self.load_known_ships()
+        self.known_modules = self.load_known_modules()
         self.known_commodities = self.load_known_commodities()
     
     def print(self, *args, **kwargs) -> None:
@@ -253,14 +270,15 @@ class ImportPlugin(plugins.ImportPluginBase):
         self.commit_limit = self.commit_rate
         self.need_commit = False
     
-    def run(self) -> bool:
+    def run(self):
         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')
         
         theme = self.tdenv.theme
         BOLD, CLOSE, DIM, ITALIC = theme.bold, theme.CLOSE, theme.dim, theme.italic  # pylint: disable=invalid-name
-
+        # TODO: don't download file if local copy is not older
+        # see eddblink_plug.download_file()
         if not self.file:
             url = self.url or SOURCE_URL
             self.print(f'Downloading prices from remote URL: {url}')
@@ -268,11 +286,28 @@ class ImportPlugin(plugins.ImportPluginBase):
             transfers.download(self.tdenv, url, self.file)
             self.print(f'Download complete, saved to local file: "{self.file}"')
         
-        
         sys_desc = f"Importing {ITALIC}spansh{CLOSE} data"
-        with Timing() as timing, Progresser(self.tdenv, sys_desc, total=len(self.known_systems)) as progress:
+        
+        # TODO: find a better way to get the total number of systems
+        # A bad way to do it:
+        total_systems = 0
+        if self.tdenv.detail:
+            print('Counting total number of systems...')
+        with open(self.file, 'r', encoding='utf8') as stream:
+            for system_data in ijson.items(stream, 'item', use_float=True):
+                total_systems += 1
+                if (not total_systems % 250) and self.tdenv.detail:
+                    print(f'Total systems: {total_systems}', end='\r')
+        
+        if self.tdenv.detail:
+            print(f'Total systems: {total_systems}')
+        
+        with Timing() as timing, Progresser(self.tdenv, sys_desc, total=total_systems) as progress:
+        # with Timing() as timing, Progresser(self.tdenv, sys_desc, total=len(self.known_stations)) as progress:
             system_count = 0
             total_station_count = 0
+            total_ship_count = 0
+            total_module_count = 0
             total_commodity_count = 0
             
             age_cutoff = timedelta(days=self.maxage) if self.maxage else None
@@ -285,14 +320,16 @@ class ImportPlugin(plugins.ImportPluginBase):
                 elapsed, averages = get_timings(started, system_count, total_station_count)
                 label = f"{ITALIC}#{system_count:<5d}{CLOSE} {BOLD}{upper_sys:30s}{CLOSE} {DIM}({elapsed:.2f}s, avgs: {averages}){CLOSE}"
                 stations = list(station_iter)
-                with progress.task(label, total=len(stations)) as sys_task:
+                with progress.task(label, total=len(stations)) as sta_task:
                     if system.id not in self.known_systems:
                         self.ensure_system(system, upper_sys)
                     
                     station_count = 0
+                    ship_count = 0
+                    module_count = 0
                     commodity_count = 0
                     
-                    for station, commodities in stations:
+                    for station, ships, modules, commodities in stations:
                         fq_station_name = f'@{upper_sys}/{station.name}'
                         
                         station_info = self.known_stations.get(station.id)
@@ -303,8 +340,73 @@ class ImportPlugin(plugins.ImportPluginBase):
                             self.execute("UPDATE Station SET system_id = ? WHERE station_id = ?", station.system_id, station.id, commitable=True)
                             self.known_stations[station.id] = (station.name, station.system_id, station.modified)
                         
-                        items = []
-                        db_times = dict(self.execute("SELECT item_id, modified FROM StationItem WHERE station_id = ?", station.id))
+                        # Ships
+                        ship_entries = []
+                        db_ship_times = dict(self.execute("SELECT ship_id, modified FROM ShipVendor WHERE station_id = ?", station.id))
+                        
+                        for ship in ships:
+                            if ship.id not in self.known_ships:
+                                ship = self.ensure_ship(ship)
+                            
+                            # We're concerned with the ship age, not the station age,
+                            # as they each have their own 'modified' times.
+                            if age_cutoff and (now - ship.modified) > age_cutoff:
+                                if self.tdenv.detail:
+                                    self.print(f'        |  {fq_station_name:50s}  |  Skipping shipyard due to age: {now - ship.modified}, ts: {ship.modified}')
+                                break
+                            db_modified = db_ship_times.get(ship.id)
+                            modified = parse_ts(db_modified) if db_modified else None
+                            if modified and ship.modified <= modified:
+                                # All ships in a station will have the same modified time,
+                                # so no need to check the rest if the first is older.
+                                if self.tdenv.detail > 2:
+                                    self.print(f'        |  {fq_station_name:50s}  |  Skipping older shipyard data')
+                                break
+                            
+                            ship_entries.append((ship.id, station.id, ship.modified))
+                        if ship_entries:
+                            self.executemany("""INSERT OR REPLACE INTO ShipVendor (
+                                ship_id, station_id, modified
+                            ) VALUES (
+                                ?, ?, IFNULL(?, CURRENT_TIMESTAMP)
+                            )""", ship_entries, commitable=True)
+                            ship_count += len(ship_entries)
+                        
+                        # Upgrades
+                        module_entries = []
+                        db_module_times = dict(self.execute("SELECT upgrade_id, modified FROM UpgradeVendor WHERE station_id = ?", station.id))
+                        
+                        for module in modules:
+                            if module.id not in self.known_modules:
+                                module = self.ensure_module(module)
+                            
+                            # We're concerned with the outfitting age, not the station age,
+                            # as they each have their own 'modified' times.
+                            if age_cutoff and (now - module.modified) > age_cutoff:
+                                if self.tdenv.detail:
+                                    self.print(f'        |  {fq_station_name:50s}  |  Skipping outfitting due to age: {now - station.modified}, ts: {station.modified}')
+                                break
+                            db_modified = db_module_times.get(module.id)
+                            modified = parse_ts(db_modified) if db_modified else None
+                            if modified and module.modified <= modified:
+                                # All modules in a station will have the same modified time,
+                                # so no need to check the rest if the fist is older.
+                                if self.tdenv.detail > 2:
+                                    self.print(f'        |  {fq_station_name:50s}  |  Skipping older outfitting data')
+                                break
+                            
+                            module_entries.append((module.id, station.id, module.modified))
+                        if module_entries:
+                            self.executemany("""INSERT OR REPLACE INTO UpgradeVendor (
+                                upgrade_id, station_id, modified
+                            ) VALUES (
+                                ?, ?, IFNULL(?, CURRENT_TIMESTAMP)
+                            )""", module_entries, commitable=True)
+                            module_count += len(module_entries)
+                        
+                        # Items
+                        commodity_entries = []
+                        db_commodity_times = dict(self.execute("SELECT item_id, modified FROM StationItem WHERE station_id = ?", station.id))
                         
                         for commodity in commodities:
                             if commodity.id not in self.known_commodities:
@@ -314,21 +416,21 @@ class ImportPlugin(plugins.ImportPluginBase):
                             # as they each have their own 'modified' times.
                             if age_cutoff and (now - commodity.modified) > age_cutoff:
                                 if self.tdenv.detail:
-                                    self.print(f'        |  {fq_station_name:50s}  |  Skipping station due to age: {now - station.modified}, ts: {station.modified}')
+                                    self.print(f'        |  {fq_station_name:50s}  |  Skipping market due to age: {now - station.modified}, ts: {station.modified}')
                                 break
                             
-                            db_modified = db_times.get(commodity.id)
+                            db_modified = db_commodity_times.get(commodity.id)
                             modified = parse_ts(db_modified) if db_modified else None
                             if modified and commodity.modified <= modified:
                                 # All commodities in a station will have the same modified time,
                                 # so no need to check the rest if the fist is older.
                                 if self.tdenv.detail > 2:
-                                    self.print(f'        |  {fq_station_name:50s}  |  Skipping older commodity data')
+                                    self.print(f'        |  {fq_station_name:50s}  |  Skipping older market data')
                                 break
-                            items.append((station.id, commodity.id, commodity.modified,
-                                commodity.sell, commodity.demand, -1,
-                                commodity.buy, commodity.supply, -1, 0))
-                        if items:
+                            commodity_entries.append((station.id, commodity.id, commodity.modified,
+                                                      commodity.sell, commodity.demand, -1,
+                                                      commodity.buy, commodity.supply, -1, 0))
+                        if commodity_entries:
                             self.executemany("""INSERT OR REPLACE INTO StationItem (
                                 station_id, item_id, modified,
                                 demand_price, demand_units, demand_level,
@@ -337,68 +439,66 @@ class ImportPlugin(plugins.ImportPluginBase):
                                 ?, ?, IFNULL(?, CURRENT_TIMESTAMP),
                                 ?, ?, ?,
                                 ?, ?, ?, ?
-                            )""", items, commitable=True)
-                            commodity_count += len(items)
+                            )""", commodity_entries, commitable=True)
+                            commodity_count += len(commodity_entries)
                         # Good time to save data and try to keep the transaction small
                         self.commit()
                         
-                        if commodity_count:
+                        if commodity_count or ship_count or module_count:
                             station_count += 1
-                        progress.bump(sys_task)
-                    
-                    if station_count:
-                        system_count += 1
-                        total_station_count += station_count
-                        total_commodity_count += commodity_count
-                        if self.tdenv.detail:
-                            self.print(
-                                f'{system_count:6d}  |  {upper_sys:50s}  |  '
-                                f'{station_count:3d} st  {commodity_count:6d} co'
-                            )
-                    self.commit()
-                    
-                    if system_count % 25 == 1:
-                        avg_stations = total_station_count / (system_count or 1)
-                        progress.update(f"{sys_desc}{DIM} ({total_station_count}:station:, {avg_stations:.1f}per:glowing_star:){CLOSE}")
+                        progress.bump(sta_task)
+                
+                system_count += 1
+                if station_count:
+                    total_station_count += station_count
+                    total_ship_count += ship_count
+                    total_module_count += module_count
+                    total_commodity_count += commodity_count
+                    if self.tdenv.detail:
+                        self.print(
+                            f'{system_count:6d}  |  {upper_sys:50s}  |  '
+                            f'{station_count:3d} st {commodity_count:5d} co '
+                            f'{ship_count:4d} sh {module_count:4d} mo'
+                        )
+                self.commit()
+                
+                if not system_count % 25:
+                    avg_stations = total_station_count / (system_count or 1)
+                    progress.update(f"{sys_desc}{DIM} ({total_station_count}:station:, {system_count}:glowing_star:, {avg_stations:.1f}:station:/:glowing_star:){CLOSE}")
             
             self.commit()
             self.tdb.close()
-            
-            # 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'
+                f'{total_station_count} st {total_commodity_count} co '
+                f'{total_ship_count} sh {total_module_count} mo'
             )
         
         with Timing() as timing:
+            # Need to make sure cached tables are updated
             self.print('Exporting to cache...')
+            for table in ("Item", "Station", "System", "StationItem", "Ship", "ShipVendor", "Upgrade", "UpgradeVendor"):
+                self.print(f'Exporting {table}.csv            ', end='\r')
+                csvexport.exportTableToFile(self.tdb, self.tdenv, table)
+            self.print('Exporting TradeDangerous.prices', end='\r')
             cache.regeneratePricesFile(self.tdb, self.tdenv)
             self.print(f'Cache export completed in {timedelta(seconds=int(timing.elapsed))!s}')
         
         return False
     
     def data_stream(self):
+        stream = None
         if self.file == '-':
-            self.print('Reading prices from stdin')
+            self.print('Reading data from stdin')
             stream = sys.stdin
         elif self.file:
-            self.print(f'Reading prices from local file: "{self.file}"')
+            self.print(f'Reading data from local file: "{self.file}"')
             stream = open(self.file, 'r', encoding='utf8')
-        return ingest_stream(stream)
-    
-    def categorise_commodities(self, commodities):
-        categories = {}
-        for commodity in commodities:
-            categories.setdefault(commodity.category, []).append(commodity)
-        return categories
+        return self.ingest_stream(stream)
     
     def execute(self, query: str, *params, commitable: bool = False) -> sqlite3.Cursor:
-        """ helper method that performs retriable queries and marks the transaction as needing to commit
-            if the query is commitable."""
+        """ helper method that performs retriable queries and marks the transaction 
+            as needing to commit if the query is commitable."""
         if commitable:
             self.need_commit = True
         attempts = 5
@@ -443,8 +543,8 @@ class ImportPlugin(plugins.ImportPluginBase):
             self.tdenv.DEBUG0(f"load_known_systems query raised {e}")
             return {}
     
-    def load_known_stations(self) -> dict[int, tuple[str, int]]:
-        """ Returns a dictionary of {station_id -> (station_name, system_id)} for all current stations in the database. """
+    def load_known_stations(self) -> dict[int, tuple[str, int, float]]:
+        """ Returns a dictionary of {station_id -> (station_name, system_id, modified)} for all current stations in the database. """
         try:
             return {cols[0]: (cols[1], cols[2], parse_ts(cols[3])) for cols in self.cursor.execute('SELECT station_id, name, system_id, modified FROM Station')}
         except Exception as e:  # pylint: disable=broad-except
@@ -452,6 +552,24 @@ class ImportPlugin(plugins.ImportPluginBase):
             self.tdenv.DEBUG0(f"load_known_stations query raised {e}")
             return {}
     
+    def load_known_ships(self):
+        """ Returns a dictionary of {ship_id -> name} for all current ships in the database. """
+        try:
+            return dict(self.cursor.execute('SELECT ship_id, name FROM Ship'))
+        except Exception as e:  # pylint: disable=broad-except
+            self.print("[purple]:thinking_face:Assuming no ship data yet")
+            self.tdenv.DEBUG0(f"load_known_ships query raised {e}")
+            return {}
+    
+    def load_known_modules(self):
+        """ Returns a dictionary of {upgrade_id -> name} for all current modules in the database. """
+        try:
+            return dict(self.cursor.execute('SELECT upgrade_id, name FROM Upgrade'))
+        except Exception as e:  # pylint: disable=broad-except
+            self.print("[purple]:thinking_face:Assuming no module data yet")
+            self.tdenv.DEBUG0(f"load_known_modules query raised {e}")
+            return {}
+    
     def load_known_commodities(self):
         """ Returns a dictionary of {fdev_id -> name} for all current commodities in the database. """
         try:
@@ -516,9 +634,38 @@ class ImportPlugin(plugins.ImportPluginBase):
         )
         note = "Updated" if self.known_stations.get(station.id) else "Added"
         if self.tdenv.detail > 1:
-            self.print(f'        |  {station.name:50s}  |  {note} station')
+            system_name = self.known_systems[station.system_id]
+            upper_sys = system_name.upper()
+            fq_station_name = f'@{upper_sys}/{station.name}'
+            self.print(f'        |  {fq_station_name:50s}  |  {note} station')
         self.known_stations[station.id] = (station.name, station.system_id, station.modified)
     
+    def ensure_ship(self, ship: Ship):
+        """ Adds a record for a ship, and registers the ship in the known_ships dict. """
+        self.execute(
+            '''
+            INSERT INTO Ship (ship_id, name) VALUES (?, ?)
+            ''',
+            ship.id, ship.name,
+            commitable=True,
+        )
+        self.known_ships[ship.id] = ship.name
+        
+        return ship
+    
+    def ensure_module(self, module: Module):
+        """ Adds a record for a module, and registers the module in the known_modules dict. """
+        self.execute(
+            '''
+            INSERT INTO Upgrade (upgrade_id, name, class, rating, ship) VALUES (?, ?, ?, ?, ?)
+            ''',
+            module.id, module.name, module.cls, module.rating, module.ship,
+            commitable=True,
+        )
+        self.known_modules[module.id] = module.name
+        
+        return module
+    
     def ensure_commodity(self, commodity: Commodity):
         """ Adds a record for a commodity and registers the commodity in the known_commodities dict. """
         self.execute(
@@ -566,23 +713,28 @@ class ImportPlugin(plugins.ImportPluginBase):
     def bool_yn(self, value: Optional[bool]) -> str:
         """ translates a ternary (none, true, false) into the ?/Y/N representation """
         return '?' if value is None else ('Y' if value else 'N')
-
-
-def ingest_stream(stream):
-    """Ingest a spansh-style galaxy dump, yielding system-level data."""
-    for system_data in ijson.items(stream, 'item', use_float=True):
-        coords = system_data.get('coords', {})
-        yield (
-            System(
-                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),
-                modified=parse_ts(system_data.get('date')),
-            ),
-            ingest_stations(system_data),
-        )
+    
+    def ingest_stream(self, stream):
+        """Ingest a spansh-style galaxy dump, yielding system-level data."""
+        for system_data in ijson.items(stream, 'item', use_float=True):
+            if "Shinrarta Dezhra" in system_data.get('name') and self.tdenv.debug:
+                with open(Path(self.tdenv.tmpDir, "shin_dez.json"), 'w') as file:
+                    # file.write(system_data)
+                    import json
+                    json.dump(system_data, file, indent=4)
+            
+            coords = system_data.get('coords', {})
+            yield (
+                System(
+                    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),
+                    modified=parse_ts(system_data.get('date')),
+                ),
+                ingest_stations(system_data),
+            )
 
 
 def ingest_stations(system_data):
@@ -592,10 +744,16 @@ def ingest_stations(system_data):
     for target in targets:
         for station_data in target.get('stations', ()):
             services = set(station_data.get('services', ()))
-            if 'Market' not in services:
-                continue
-            market = station_data.get('market', {})
-            if not market.get('commodities'):
+            shipyard = None
+            if 'Shipyard' in services:
+                shipyard = station_data.get('shipyard', {})
+            outfitting = None
+            if 'Outfitting' in services:
+                outfitting = station_data.get('outfitting', {})
+            market = None
+            if 'Market' in services:
+                market = station_data.get('market', {})
+            if not shipyard and not outfitting and not market:
                 continue
             landing_pads = station_data.get('landingPads', {})
             max_pad_size = '?'
@@ -613,7 +771,7 @@ def ingest_stations(system_data):
                     name=station_data.get('name', 'Unnamed').strip(),
                     distance=station_data.get('distanceToArrival', 999999),
                     max_pad_size=max_pad_size,
-                    market=True,
+                    market='Market' in services,
                     black_market='Black Market' in services,
                     shipyard='Shipyard' in services,
                     outfitting='Outfitting' in services,
@@ -624,12 +782,40 @@ def ingest_stations(system_data):
                     type=station_type[0] if station_type else 0,
                     modified=parse_ts(station_data.get('updateTime')),
                 ),
+                ingest_shipyard(shipyard),
+                ingest_outfitting(outfitting),
                 ingest_market(market),
             )
 
+def ingest_shipyard(shipyard):
+    """Ingest station-level market data, yielding commodities."""
+    if not shipyard or not shipyard.get('ships'):
+        return None
+    for ship in shipyard['ships']:
+        yield Ship(
+            id=ship.get('shipId'),
+            name=ship.get('name'),
+            modified=parse_ts(shipyard.get('updateTime'))
+        )
+
+def ingest_outfitting(outfitting):
+    """Ingest station-level market data, yielding commodities."""
+    if not outfitting or not outfitting.get('modules'):
+        return None
+    for module in outfitting['modules']:
+        yield Module(
+            id=module.get('moduleId'),
+            name=module.get('name'),
+            cls=module.get('class'),
+            rating=module.get('rating'),
+            ship=module.get('ship'),
+            modified=parse_ts(outfitting.get('updateTime'))
+        )
 
 def ingest_market(market):
     """Ingest station-level market data, yielding commodities."""
+    if not market or not market.get('commodities'):
+        return None
     for commodity in market['commodities']:
         yield Commodity(
             id=commodity.get('commodityId'),
@@ -642,7 +828,6 @@ def ingest_market(market):
             modified=parse_ts(market.get('updateTime'))
         )
 
-
 def parse_ts(ts):
     if ts is None:
         return None

tradedangerous/submit-distances.py

@@ -45,7 +45,7 @@ sys.stderr.write("*** WARNING: submit-distances.py is deprecated; if you rely on
 class UsageError(Exception):
     def __init__(self, argv, error):
         self.argv, self.error = argv, error
-        
+    
     def __str__(self):
         return error + "\n" + argv.format_usage()
 

tradedangerous/templates/TradeDangerous.sql

@@ -102,7 +102,7 @@ CREATE TABLE Ship
  (
    ship_id INTEGER PRIMARY KEY,
    name VARCHAR(40) COLLATE nocase,
-   cost INTEGER NOT NULL,
+   cost INTEGER,
 
    UNIQUE (ship_id)
  );
@@ -130,8 +130,9 @@ CREATE TABLE Upgrade
  (
    upgrade_id INTEGER PRIMARY KEY,
    name VARCHAR(40) COLLATE nocase,
-   weight NUMBER NOT NULL,
-   cost NUMBER NOT NULL,
+   class NUMBER NOT NULL,
+   rating CHAR(1) NOT NULL,
+   ship VARCHAR(40) COLLATE nocase,
 
    UNIQUE (upgrade_id)
  );
@@ -141,7 +142,6 @@ CREATE TABLE UpgradeVendor
  (
    upgrade_id INTEGER NOT NULL,
    station_id INTEGER NOT NULL,
-   cost INTEGER,
    modified DATETIME NOT NULL,
 
    PRIMARY KEY (upgrade_id, station_id),

tradedangerous/templates/database_changes.json

@@ -0,0 +1,6 @@
+[
+    "DROP TABLE Ship;",
+    "CREATE TABLE Ship (ship_id INTEGER PRIMARY KEY, name VARCHAR(40) COLLATE nocase, cost INTEGER, UNIQUE (ship_id));",
+    "DROP TABLE Upgrade;",
+    "CREATE TABLE Upgrade(upgrade_id INTEGER PRIMARY KEY, name VARCHAR(40) COLLATE nocase, class NUMBER NOT NULL, rating CHAR(1) NOT NULL, ship VARCHAR(40) COLLATE nocase, UNIQUE (upgrade_id));"
+]

tradedangerous/tradecalc.py

@@ -1096,7 +1096,7 @@ class TradeCalc:
                     bestToDest[dstID] = (
                         dstStation, route, trade, dest.via, dest.distLy, score
                     )
-            
+        
         if connections == 0:
             raise NoHopsError(
                 "No destinations could be reached within the constraints."

tradedangerous/tradeenv.py

@@ -271,7 +271,7 @@ class TradeEnv(Utf8SafeConsoleIOMixin):
             return noteFn
         
         return None
-
+    
     def remove_file(self, *args) -> bool:
         """ Unlinks a file, as long as it exists, and logs the action at level 1. """
         path = Path(*args)
@@ -280,7 +280,7 @@ class TradeEnv(Utf8SafeConsoleIOMixin):
         path.unlink()
         self.DEBUG1(":cross_mark: deleted {}", path)
         return True
-
+    
     def rename_file(self, *, old: os.PathLike, new: os.PathLike) -> bool:
         """
         If 'new' exists, deletes it, and then attempts to rename old -> new. If new is not specified,
@@ -293,14 +293,14 @@ class TradeEnv(Utf8SafeConsoleIOMixin):
         # Promote new to a guaranteed Path and remove it if it's present.
         new = Path(new)
         self.remove_file(new)
-
+        
         # Promote new to a guaranteed Path and confirm it exists.
         old = Path(old)
         if not old.exists():
             return False
-
+        
         # Perform the rename and log it at level 1.
         old.rename(new)
         self.DEBUG1(":recycle: moved {} to {}", old, new)
-
+        
         return True

tradedangerous/transfers.py

@@ -69,10 +69,10 @@ def download(
     :param shebang:     function to call on the first line
     """
     tdenv.NOTE("Requesting {}".format(url))
-
+    
     if isinstance(length, str):
         length = int(length)
-
+    
     # If the caller provided an existing session stream, use that the fetch the request.
     req = (session or requests).get(url, headers=headers or None, stream=True, timeout=timeout)
     req.raise_for_status()
@@ -90,7 +90,7 @@ def download(
             raise TradeException(
                 "Remote server gave an empty response. Please try again later."
             )
-
+    
     # if the file is being compressed by the server, the headers tell us the
     # length of the compressed data, but in our loop below we will be receiving
     # the uncompressed data, which should be larger, which will cause our
@@ -125,7 +125,7 @@ def download(
             if prog:
                 prog.increment(len(data))
         tdenv.DEBUG0("End of data")
-
+    
     if not tdenv.quiet:
         elapsed = (time.time() - started) or 1
         tdenv.NOTE(
@@ -169,7 +169,7 @@ def get_json_data(url, *, timeout: int = 90):
         totalLength = int(totalLength)
         filename = get_filename_from_url(url)
         progBar = pbar.Progress(totalLength, 25, prefix=filename)
-
+        
         jsData = bytes()
         for data in req.iter_content():
             jsData += data

tradedangerous/version.py

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

{tradedangerous-11.4.0.dist-info → tradedangerous-11.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.4.0
+Version: 11.5.0
 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-11.4.0.dist-info → tradedangerous-11.5.0.dist-info}/RECORD

@@ -1,44 +1,44 @@
 trade.py,sha256=Skqy0bC47g1KujuYrVwa3T8AfJ9NoLLOZcVjjxJ2daQ,1769
 tradegui.py,sha256=q2HdIdoyeLUpeF2X0hVIGn7sU6T4zOzq1HN0zGvZdyE,788
 tradedangerous/__init__.py,sha256=bwsbE_GyCNsuyGDKnfXAg0RD-ewsWHliySJ5QfCK7h8,1166
-tradedangerous/cache.py,sha256=0Pyvh5XYrNzC7Pj7KzDIioI-Xhydx7JGUXZGcrO1org,37225
+tradedangerous/cache.py,sha256=BM3jxnezff0fd8WhIbnVn9dDuULtLMKld0oiY8h7nZU,37233
 tradedangerous/cli.py,sha256=dLekZ3MTbn9XcSGtE532qZF3iSnsb5G-ddQyErwTv9o,4559
 tradedangerous/corrections.py,sha256=_WLgo1IBWoskrrPFeshRwCOeJ2BeJb_x4tDQ0JdAo-s,1340
 tradedangerous/csvexport.py,sha256=_19bGVnCGJPzvx_8DzLGOs4rqx8Asn7eCVdXKdKu92E,8653
 tradedangerous/edscupdate.py,sha256=To7hL2FuR4A7A4gJfvow_jGl6mlD7aP-Drv1rEkwy-I,17310
 tradedangerous/edsmupdate.py,sha256=9IANIASA8ZKnZsLPBRAh7IArDRsa0jriL2UwjqKJ1fI,14928
 tradedangerous/formatting.py,sha256=R8GX2Zya1xazLOOBIWlLqUEjIESZJO41UlvhZDbyY4Q,6908
-tradedangerous/fs.py,sha256=41yUdriBSv-rinGEmxjBTKyKH4-RA2bIO4sKCMIwvUA,3861
+tradedangerous/fs.py,sha256=Uqc0wEbORJektD22MQgjqerxbJbc3mUee9MlXna5Wx0,3897
 tradedangerous/gui.py,sha256=DFsF5zATr-lyJShL6t5kPKvcLLJYkICurzBz0WBa-oQ,43676
-tradedangerous/jsonprices.py,sha256=GJ07fbZSNX5U_6lczWTSk6mWwme_weJbXgE8zcZBnpY,7225
+tradedangerous/jsonprices.py,sha256=vNj3Pz2NN39FgpHMo_TRH6MI3GQaFGIa2idg2HYYu2A,7229
 tradedangerous/mapping.py,sha256=Bf2G8LzP1Bat5k3hFs9XyeI1z3tfUpfeh4nuLP2QJuQ,4122
 tradedangerous/prices.py,sha256=JqiDVrtvvPd5pqE3HdwOHOuFgdAbOR-pt0GLD3ZIXM8,7425
-tradedangerous/submit-distances.py,sha256=xL7fwdbVrb05-zWNH-9nyYBDtV4bfUfP7OBx3NMBc34,11749
+tradedangerous/submit-distances.py,sha256=m1qAuqH_yq8euMSWSqkmkTNM4a136Vl5WrGmTk15LiM,11745
 tradedangerous/tools.py,sha256=pp-4WtA12SVaaQHFJFOMTF7EDFRCU2mQeOhC4xoXmEk,1331
-tradedangerous/tradecalc.py,sha256=GlJZ9UwkoQUoayqUGVwlefhQvs-1SxYB5Y6Vkr31nSg,42753
+tradedangerous/tradecalc.py,sha256=ZuTxp_9gMj4wDGalp1k_VfoVupwF8Oh9FOYML3vN-oM,42749
 tradedangerous/tradedb.py,sha256=mitKkS4MczivDK_K7A-IC94hkObUmGWFhwIrh_ts9qw,72282
-tradedangerous/tradeenv.py,sha256=o956HN7-7uzIcNi9vI4zh-L1z5jwBioVARyhhiAlsRQ,11885
+tradedangerous/tradeenv.py,sha256=aIeK291Ene98kaEEu1LvlJ4KT4EvPfIXlT4IfZnpVc0,11917
 tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk,368
-tradedangerous/transfers.py,sha256=s0fRWDZCsL-VYm5E4ceTMKcUelcvzcOUelsfg6TjYI8,6000
+tradedangerous/transfers.py,sha256=t_0Sjr4FI9lhIPwyPOXdR8d97bE611ujbKK4ioWShm0,6024
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=mKbYHoSAHiOL_sv28H0wQfisFwP0y4WYtsR_RnDyBf0,646
+tradedangerous/version.py,sha256=NMsHLdL8hA7iAFucNiKOx8yn15j7n8falWI0neiBfeI,646
 tradedangerous/commands/TEMPLATE.py,sha256=MOE69xsZPHPIMBQ-LXicfsOlCZdy-2gPX_nlnwYYil8,2026
 tradedangerous/commands/__init__.py,sha256=3gz2cnXNZNkV1gtZh0dOnCRxBkQHbeIyysRe3bM2WEE,9516
 tradedangerous/commands/buildcache_cmd.py,sha256=jhNSqHX_xX43SiSUMFiKtWpB9v4oeZ0sqfNq6DCrjUs,2181
-tradedangerous/commands/buy_cmd.py,sha256=GZa4wx5NKsZLKx1vtO1a47hSL8la5fatOY3dCazQSSo,13923
-tradedangerous/commands/commandenv.py,sha256=lzPbxhrgx4PJL_x8pRdYu22rqtL4U6kNQ5ExXTPoAao,9462
-tradedangerous/commands/exceptions.py,sha256=xJib2n0YRSgrs8WhZX5IeVHM-XakS3YwfjlF8_cNx4E,3476
+tradedangerous/commands/buy_cmd.py,sha256=qgOBTzCvcYgLOcdkx7BpqF-rSs6GFjOL_f3Gzutmx1I,13947
+tradedangerous/commands/commandenv.py,sha256=kw1FDkxDvJMaui92gWYHv8bNWsxxn5xHXCjmHGFeGUM,9794
+tradedangerous/commands/exceptions.py,sha256=sisGoBvOpt25TYWWjp-s-k_--O_nZe5Zd9HhAW3SElA,3487
 tradedangerous/commands/export_cmd.py,sha256=VfxwrNU_TzrSw71KrmtmXKYCBkpDGr5KRLGPXOBewnI,4405
 tradedangerous/commands/import_cmd.py,sha256=PKMrO1DhOGkqAn_q9vZBxhogpFL5MHp2JyYb4qiBdq0,5633
 tradedangerous/commands/local_cmd.py,sha256=tf7YMGX-vaVGNO2lvQF9EvQEN3Wj7DE9-NTSVrtaZx0,8392
 tradedangerous/commands/market_cmd.py,sha256=Ig16zDuksywiiF3Exps6UuM-ZhqgbXqkW6Lu2s9xQf0,5411
 tradedangerous/commands/nav_cmd.py,sha256=v245L1MxiUliITUgvWeeB4cL4UdkNO8n0CiP6ztrV54,8460
 tradedangerous/commands/olddata_cmd.py,sha256=6rpPRRs4kLhV9c0sogmctVAjta7v0L0Deu999spXY2s,7888
-tradedangerous/commands/parsing.py,sha256=_AoC41kXFWlHMHADZY8QqVmeyRNT6_VapoFhj7sSflY,6595
+tradedangerous/commands/parsing.py,sha256=IFYAVrEnlweocM08czG39oqRGuCgI7O5eN1-3NXQezs,6599
 tradedangerous/commands/rares_cmd.py,sha256=L_QoW2zIZTU9Jpavt_K2fZyu8T153nUSuVqIiz4uksQ,9207
 tradedangerous/commands/run_cmd.py,sha256=HtvxKfD2ef_fUCDdUzBv9yRwd2gBOqIq4hzUAOLgcyU,47650
 tradedangerous/commands/sell_cmd.py,sha256=yF0Bsq_gAycG8FQI0-JWmk_DvNnAgyno2wvj-PyrqBs,8269
-tradedangerous/commands/shipvendor_cmd.py,sha256=IA85tHmZK-dBAUM5Q2ds5cBSvRzDyhILnXxjNbq9Lsg,6980
+tradedangerous/commands/shipvendor_cmd.py,sha256=opszTmFMVDkker2ON-iAql82HzVmQ_5MDklb3MNUmJI,6984
 tradedangerous/commands/station_cmd.py,sha256=gnWOT-Z8DfOeA4GNjUwj57eNxuNGh5mPZ-D0E_BeoTw,16232
 tradedangerous/commands/trade_cmd.py,sha256=o4Xdel5asGY8i6qES95fLHdyfyjKdC5CTOQrZIeu0i4,3016
 tradedangerous/commands/update_cmd.py,sha256=2UWR6aDbAbvtKFtfmehVwFUBQfJM5KThR71HoC6wVnM,14564
@@ -58,22 +58,23 @@ tradedangerous/misc/edsc.py,sha256=SN_da9qZ7H8ozibyhoFVB8nAvwBDPF3Z_PMlt70J2Ro,1
 tradedangerous/misc/edsm.py,sha256=equDwO1SY3QTsoJIb3LjiHes4C8Dejaap_TMpYlCm8o,2910
 tradedangerous/misc/importeddbstats.py,sha256=iLAcrFzdwiMm_MnUuaHcT_xGgZF8pfEEd1qljhhWJTU,1787
 tradedangerous/misc/prices-json-exp.py,sha256=Fpm62ugP35ZBqnRs6ekYfS3GoDFYmvLD3b3SFJfaMOI,4944
-tradedangerous/misc/progress.py,sha256=pWBHPA8Xc5uzjufAwCn7mkTrz7UbwSpY46o2BgEi7HU,7058
+tradedangerous/misc/progress.py,sha256=QwWgbbhAuMB7LG0o-jy7WxN1uhLHtN0FwKkV314ulrA,7170
 tradedangerous/plugins/__init__.py,sha256=TL-OIptlqNENKhoFqkFeBJn_vSw8L0pVaDJgjhaTj7A,7860
 tradedangerous/plugins/edapi_plug.py,sha256=5nqBYmjUceAt-KTfiBn7IEl443R1SsGLDmfVXgbcyms,42262
 tradedangerous/plugins/edcd_plug.py,sha256=JuDtuEM_mN9Sz2H09-qYizM-9N3cuNjgvQy7Y-wHwKw,14412
-tradedangerous/plugins/eddblink_plug.py,sha256=V58hRCfjeZ7t3aAIgdzbS5VdO5l39A-9_QKbY7KNJ48,21209
+tradedangerous/plugins/eddblink_plug.py,sha256=dyVaQhpElq7ceLD0bJhVeuiZoMu8Jdo3Y2hwcAcgx-4,21305
 tradedangerous/plugins/edmc_batch_plug.py,sha256=rrP_lFFxWsba8DPEo0WF2EdCiMoRC7tCT8z62MIvtIo,4173
 tradedangerous/plugins/journal_plug.py,sha256=5HMyoxQ7z42qj7NiL8rDxSyTN9gKikoQjyWzJLD-SYQ,23746
 tradedangerous/plugins/netlog_plug.py,sha256=yUl47l9xt3kGj9oSiY_FZaDGdnQj63oa9MBtSeIy1Zo,13469
-tradedangerous/plugins/spansh_plug.py,sha256=FiIS9cN2_8VKDrAj8yvkdy1NIni2kEc0ECqhgrvML4E,27048
+tradedangerous/plugins/spansh_plug.py,sha256=y7-yedZdGbKpliHQucz48SlggzPfVJOV_MjX5QkSdA4,36952
 tradedangerous/templates/Added.csv,sha256=8o54civQCcS9y7_DBo0GX196XWRbbREQqKDYTKibsgQ,649
 tradedangerous/templates/Category.csv,sha256=8xwUDcBZE25T6x6dZGlRUMTCqeDLt3a9LXU5h6hRHV8,250
 tradedangerous/templates/RareItem.csv,sha256=F1RhRnTD82PiwrVUO-ai2ErGH2PTqNnQaDw5mcgljXs,10483
-tradedangerous/templates/TradeDangerous.sql,sha256=S9TH1bp0dfJLv90T6lTQ-TD8w8YGEZRMyUn8J1W4G3k,9330
-tradedangerous-11.4.0.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-11.4.0.dist-info/METADATA,sha256=1DbAmZFII4oH9A3B3IE2daweZD3Eyz0QyLTI4UMl1Rc,4435
-tradedangerous-11.4.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-11.4.0.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
-tradedangerous-11.4.0.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
-tradedangerous-11.4.0.dist-info/RECORD,,
+tradedangerous/templates/TradeDangerous.sql,sha256=XJ0T09OiS9UdYKJXXAG-rCe6T_ua4MU-icb2lD7iEz0,9342
+tradedangerous/templates/database_changes.json,sha256=-KszgXhUUhwI7FRPDxnkV3bv9paXGpTgnUZxZN7i5OA,371
+tradedangerous-11.5.0.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-11.5.0.dist-info/METADATA,sha256=qRJG-26PAjw7DiDR3HhJaGC0sj0bzvLGpuO1B5q8MLk,4435
+tradedangerous-11.5.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-11.5.0.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
+tradedangerous-11.5.0.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
+tradedangerous-11.5.0.dist-info/RECORD,,