tradedangerous 10.16.12__tar.gz → 10.16.13__tar.gz

{tradedangerous-10.16.12 → tradedangerous-10.16.13}/PKG-INFO

@@ -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 → tradedangerous-10.16.13}/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-10.16.12 → tradedangerous-10.16.13}/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 → tradedangerous-10.16.13}/tradedangerous.egg-info/PKG-INFO

@@ -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 → tradedangerous-10.16.13}/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()