tradedangerous 10.16.1__tar.gz → 10.16.3__tar.gz

{tradedangerous-10.16.1 → tradedangerous-10.16.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 10.16.1
+Version: 10.16.3
 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.16.1 → tradedangerous-10.16.3}/tradedangerous/plugins/eddblink_plug.py

@@ -72,10 +72,12 @@ class ImportPlugin(plugins.ImportPluginBase):
         self.commoditiesPath = Path("Item.csv")
         self.rareItemPath = Path("RareItem.csv")
         self.shipPath = Path("Ship.csv")
+        self.FDevShipyardPath = Path("FDevShipyard.csv")
         self.shipVendorPath = Path("ShipVendor.csv")
         self.stationsPath = Path("Station.csv")
         self.sysPath = Path("System.csv")
         self.upgradesPath = Path("Upgrade.csv")
+        self.FDevOutfittingPath = Path("FDevOutfitting.csv")
         self.upgradeVendorPath = Path("UpgradeVendor.csv")
         self.listingsPath = Path("listings.csv")
         self.liveListingsPath = Path("listings-live.csv")
@@ -366,12 +368,15 @@ class ImportPlugin(plugins.ImportPluginBase):
             for name in [
                 "Category",
                 "Item",
+                "RareItem",
                 "Ship",
                 "ShipVendor",
                 "Station",
                 "System",
                 "Upgrade",
                 "UpgradeVendor",
+                "FDevShipyard",
+                "FDevOutfitting",
             ]:
                 file = self.tdb.dataPath / Path(name + ".csv")
                 try:
@@ -471,10 +476,12 @@ class ImportPlugin(plugins.ImportPluginBase):
         
         if self.getOption("upgrade"):
             if self.downloadFile(self.upgradesPath) or self.getOption("force"):
+                self.downloadFile(self.FDevOutfittingPath)
                 buildCache = True
         
         if self.getOption("ship"):
             if self.downloadFile(self.shipsPath) or self.getOption("force"):
+                self.downloadFile(self.FDevShipyardPath)
                 buildCache = True
         
         if self.getOption("rare"):

{tradedangerous-10.16.1 → tradedangerous-10.16.3}/tradedangerous/plugins/spansh_plug.py

@@ -77,7 +77,7 @@ 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()
-        if not self.tdb.dbPath.exists():
+        if not (self.tdb.dataPath / Path("TradeDangerous.prices")).exists():
             ri_path = self.tdb.dataPath / Path("RareItem.csv")
             rib_path = ri_path.with_suffix(".tmp")
             if ri_path.exists():
@@ -268,6 +268,8 @@ class ImportPlugin(plugins.ImportPluginBase):
             try:
                 return cursor.execute(query, params or kwparams)
             except sqlite3.OperationalError as ex:
+                if "no transaction is active" in str(ex):
+                    return
                 if not attempts:
                     raise
                 attempts -= 1

{tradedangerous-10.16.1 → tradedangerous-10.16.3}/tradedangerous/templates/TradeDangerous.sql

@@ -27,6 +27,8 @@
 PRAGMA foreign_keys=ON;
 PRAGMA synchronous=OFF;
 PRAGMA temp_store=MEMORY;
+PRAGMA journal_mode=WAL;
+PRAGMA auto_vacuum=INCREMENTAL;
 
 BEGIN TRANSACTION;
 

{tradedangerous-10.16.1 → tradedangerous-10.16.3}/tradedangerous/tradedb.py

@@ -705,6 +705,8 @@ class TradeDB(object):
         conn.execute("PRAGMA foreign_keys=ON")
         conn.execute("PRAGMA synchronous=OFF")
         conn.execute("PRAGMA temp_store=MEMORY")
+        conn.execute("PRAGMA auto_vacuum=INCREMENTAL")
+
         conn.create_function('dist2', 6, TradeDB.calculateDistance2)
         self.conn = conn
         return conn

{tradedangerous-10.16.1 → tradedangerous-10.16.3}/tradedangerous/version.py

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

{tradedangerous-10.16.1 → tradedangerous-10.16.3}/tradedangerous.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 10.16.1
+Version: 10.16.3
 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