tradedangerous 10.16.2__tar.gz → 10.16.4__tar.gz

{tradedangerous-10.16.2 → tradedangerous-10.16.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 10.16.2
+Version: 10.16.4
 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.2 → tradedangerous-10.16.4}/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.2 → tradedangerous-10.16.4}/tradedangerous/plugins/spansh_plug.py

@@ -171,8 +171,8 @@ class ImportPlugin(plugins.ImportPluginBase):
                                 ?, ?, ?,
                                 ?, ?, ?, ?
                             )""", *item )
+                            commodity_count += 1
                         self.execute('COMMIT')
-                        commodity_count += 1
                     
                     # categories = self.categorise_commodities(commodities)
                     # for category_name, category_commodities in categories.items():
@@ -212,6 +212,7 @@ class ImportPlugin(plugins.ImportPluginBase):
             #         _, path = csvexport.exportTableToFile( self.tdb, self.tdenv, table )
             
             self.execute('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 )
@@ -268,6 +269,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.2 → tradedangerous-10.16.4}/tradedangerous/version.py

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

{tradedangerous-10.16.2 → tradedangerous-10.16.4}/tradedangerous.egg-info/PKG-INFO

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