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

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/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/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/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/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.dist-info → tradedangerous-10.16.3.dist-info}/METADATA

@@ -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.dist-info → tradedangerous-10.16.3.dist-info}/RECORD

@@ -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=VZHv_U1_EXRFUQbB5nS6YFlFKTO2zbrw37q4YWB2Jjc,73459
+tradedangerous/tradedb.py,sha256=6JzoSAiW1WJjkWxeGMJkN63GHTBp9RA0dkfRviuEHeM,73515
 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=RqmS4iVwJ9QzcB35EvHKE2AZG7oAO5y7RdQfn6ZvRGo,647
+tradedangerous/version.py,sha256=mt7nreZFYGnU1n0cPsvQoAV7W3dlvvg1q8Hq7jPnOts,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=Ne_5ltiWC1M3MOxS6XaY0DyESJL3XaGI9f-uLf67YiQ,21681
+tradedangerous/plugins/eddblink_plug.py,sha256=CaczfCLKyRNbGh3xecBI0qLp0dz-xpnZ2ww82qlv4qc,22009
 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=dDX34KEt_jSjwyP45utQTUgB-oew__F1sYcPb209bC8,21334
+tradedangerous/plugins/spansh_plug.py,sha256=FhaXH0qIuld03PeH5P7c6XeViCgM_7Epjd9BBVbGyyQ,21455
 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=6sjEogGHy-9zYpjPo0Y2a5tElowmHFyJNwrimOUBfHk,8079
-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,,
+tradedangerous/templates/TradeDangerous.sql,sha256=kHZ7JBSY5lh2DnqayAxoO-apvXKB510SqhAzkT21YHY,8138
+tradedangerous-10.16.3.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-10.16.3.dist-info/METADATA,sha256=8iliJb1RvPqPlQ0ifOY5Fvvo99mUFSj2RjwmNvnlK5c,4421
+tradedangerous-10.16.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-10.16.3.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
+tradedangerous-10.16.3.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
+tradedangerous-10.16.3.dist-info/RECORD,,