tradedangerous 10.16.12__py3-none-any.whl → 10.16.13__py3-none-any.whl

tradedangerous/plugins/eddblink_plug.py

@@ -416,19 +416,6 @@ class ImportPlugin(plugins.ImportPluginBase):
             self.options["all"] = True
             self.options["force"] = True
         
-        self.tdenv.ignoreUnknown = True
-        
-        success = False
-        while not success:
-            try:
-                self.tdenv.DEBUG0("Loading Database. {}", self.now())
-                self.tdb.load(maxSystemLinkLy = self.tdenv.maxSystemLinkLy)
-                success = True
-            except sqlite3.OperationalError:
-                print("Database is locked, waiting for access.", end = "\r")
-                time.sleep(1)
-        self.tdenv.DEBUG0("Database loaded.")
-        
         # Select which options will be updated
         if self.getOption("listings"):
             self.options["item"] = True
@@ -512,6 +499,19 @@ class ImportPlugin(plugins.ImportPluginBase):
             self.tdb.close()
             cache.buildCache(self.tdb, self.tdenv)
         
+        self.tdenv.ignoreUnknown = True
+        
+        success = False
+        while not success:
+            try:
+                self.tdenv.DEBUG0("Loading Database. {}", self.now())
+                self.tdb.load(maxSystemLinkLy = self.tdenv.maxSystemLinkLy)
+                success = True
+            except sqlite3.OperationalError:
+                print("Database is locked, waiting for access.", end = "\r")
+                time.sleep(1)
+        self.tdenv.DEBUG0("Database loaded.")
+        
         if self.getOption("purge"):
             self.purgeSystems()
             # self.commit()

tradedangerous/tradedb.py

@@ -438,16 +438,15 @@ class Station(object):
 
 
 class Ship(namedtuple('Ship', (
-        'ID', 'dbname', 'cost', 'fdevID', 'stations'
+        'ID', 'dbname', 'cost', 'stations'
         ))):
     """
     Ship description.
     
     Attributes:
-        ID          -- The database ID
+        ID          -- FDevID as provided by the companion API.
         dbname      -- The name as present in the database
         cost        -- How many credits to buy
-        fdevID      -- FDevID as provided by the companion API.
         stations    -- List of Stations ship is sold at.
     """
     
@@ -1837,7 +1836,7 @@ class TradeDB(object):
         CAUTION: Will orphan previously loaded objects.
         """
         stmt = """
-            SELECT ship_id, name, cost, fdev_id
+            SELECT ship_id, name, cost
               FROM Ship
         """
         self.shipByID = {

tradedangerous/version.py

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

{tradedangerous-10.16.12.dist-info → tradedangerous-10.16.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 10.16.12
+Version: 10.16.13
 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.12.dist-info → tradedangerous-10.16.13.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=6JzoSAiW1WJjkWxeGMJkN63GHTBp9RA0dkfRviuEHeM,73515
+tradedangerous/tradedb.py,sha256=RD8oOwoGqjVRThGPrWVXhf_Hklp4SqQ08awh-cYbDdY,73457
 tradedangerous/tradeenv.py,sha256=8uByR4m-xzZxNSBLQnDHS4uJMPohf3mP5R_rsXnhmds,7887
 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=Vx8jvW69Uth2ThVn-QdqSmgGU532csejhFasrFT13nE,648
+tradedangerous/version.py,sha256=S1jb8VOmPotT54PhfK7awkMhFUDB5KzTv3Z0Py_9Qd8,648
 tradedangerous/commands/TEMPLATE.py,sha256=7oXL124aqxGHwnb0h9yRylUiwc6M5QrRrGVrubwI1gg,2124
 tradedangerous/commands/__init__.py,sha256=6B0WuqkFBOll5Hj67yKDAnhmyr5ZAnHc6nzUNEUh384,9640
 tradedangerous/commands/buildcache_cmd.py,sha256=oJvP06fA8svnHrfrpWkHKR16cba8GIhHdMOyZqds18Y,2332
@@ -62,7 +62,7 @@ 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=BCA87Y8dZdzWUae2dc46hqISy6GN3uDwnwagXcCZhmI,22362
+tradedangerous/plugins/eddblink_plug.py,sha256=q18e6Iv0wgOtxRElornrYZzqqSd719wHUKxnpgWnDQE,22362
 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
@@ -71,9 +71,9 @@ tradedangerous/templates/Added.csv,sha256=8o54civQCcS9y7_DBo0GX196XWRbbREQqKDYTK
 tradedangerous/templates/Category.csv,sha256=8xwUDcBZE25T6x6dZGlRUMTCqeDLt3a9LXU5h6hRHV8,250
 tradedangerous/templates/RareItem.csv,sha256=F1RhRnTD82PiwrVUO-ai2ErGH2PTqNnQaDw5mcgljXs,10483
 tradedangerous/templates/TradeDangerous.sql,sha256=1EiJ7cNJQKvdW4X-LQAHw3Y1POc0roKf25LJJy6jGlo,8135
-tradedangerous-10.16.12.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-10.16.12.dist-info/METADATA,sha256=Hl6Op6z_O5_VrFO59KIsDHSzkklQwcePOEa_DJTdzOQ,4442
-tradedangerous-10.16.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-10.16.12.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
-tradedangerous-10.16.12.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
-tradedangerous-10.16.12.dist-info/RECORD,,
+tradedangerous-10.16.13.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-10.16.13.dist-info/METADATA,sha256=d7Oph0sSkFC-vKJwMBcgV5NuYJsqvj35gB3pyoalo-A,4442
+tradedangerous-10.16.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-10.16.13.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
+tradedangerous-10.16.13.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
+tradedangerous-10.16.13.dist-info/RECORD,,