tradedangerous 10.16.11__tar.gz → 10.16.13__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 10.16.11
+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
@@ -22,6 +22,7 @@ License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: appJar
 Requires-Dist: pysimdjson
+Requires-Dist: rich
 
 
 ----------

{tradedangerous-10.16.11 → tradedangerous-10.16.13}/setup.py

@@ -27,7 +27,7 @@ exec(open("tradedangerous/version.py").read())  # pylint: disable=W0122
 
 setup(name = package,
         version = __version__,  # pylint: disable=E0602
-        install_requires = ["requests", "appJar", "pysimdjson"],
+        install_requires = ["requests", "appJar", "pysimdjson", "rich"],
         setup_requires = ["pytest-runner"],
         tests_require = ["pytest"],
         packages = ['tradedangerous', 'tradedangerous.commands', 'tradedangerous.mfd', 'tradedangerous.mfd.saitek', 'tradedangerous.misc', 'tradedangerous.plugins'],

{tradedangerous-10.16.11 → tradedangerous-10.16.13}/tradedangerous/plugins/eddblink_plug.py

@@ -72,12 +72,14 @@ 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.urlShipyard = "https://raw.githubusercontent.com/EDCD/FDevIDs/master/shipyard.csv"
+        self.FDevShipyardPath = self.tdb.dataPath / 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.urlOutfitting = "https://raw.githubusercontent.com/EDCD/FDevIDs/master/outfitting.csv"
+        self.FDevOutfittingPath = self.tdb.dataPath / Path("FDevOutfitting.csv")
         self.upgradeVendorPath = Path("UpgradeVendor.csv")
         self.listingsPath = Path("listings.csv")
         self.liveListingsPath = Path("listings-live.csv")
@@ -414,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
@@ -472,12 +461,12 @@ class ImportPlugin(plugins.ImportPluginBase):
         buildCache = False
         if self.getOption("upgrade"):
             if self.downloadFile(self.upgradesPath) or self.getOption("force"):
-                self.downloadFile(self.FDevOutfittingPath)
+                transfers.download(self.tdenv, self.urlOutfitting, self.FDevOutfittingPath)
                 buildCache = True
         
         if self.getOption("ship"):
             if self.downloadFile(self.shipPath) or self.getOption("force"):
-                self.downloadFile(self.FDevShipyardPath)
+                transfers.download(self.tdenv, self.urlShipyard, self.FDevShipyardPath)
                 buildCache = True
         
         if self.getOption("rare"):
@@ -507,8 +496,22 @@ class ImportPlugin(plugins.ImportPluginBase):
         
         # Remake the .db files with the updated info.
         if buildCache:
+            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-10.16.11 → tradedangerous-10.16.13}/tradedangerous/templates/TradeDangerous.sql

@@ -104,7 +104,6 @@ CREATE TABLE Ship
    ship_id INTEGER PRIMARY KEY,
    name VARCHAR(40) COLLATE nocase,
    cost INTEGER NOT NULL,
-   fdev_id INTEGER,
 
    UNIQUE (ship_id)
  );
@@ -160,7 +159,7 @@ CREATE INDEX idx_vendor_by_station_id ON UpgradeVendor (station_id);
 
 CREATE TABLE RareItem
  (
-   rare_id INTEGER PRIMARY KEY AUTOINCREMENT,
+   rare_id INTEGER PRIMARY KEY,
    station_id INTEGER NOT NULL,
    category_id INTEGER NOT NULL,
    name VARCHAR(40) COLLATE nocase,
@@ -278,6 +277,7 @@ CREATE TABLE FDevShipyard
    id INTEGER NOT NULL,
    symbol VARCHAR(40),
    name VARCHAR(40) COLLATE nocase,
+   entitlement VARCHAR(50),
 
    UNIQUE (id)
  );
@@ -297,7 +297,7 @@ CREATE TABLE FDevOutfitting
    ship VARCHAR(40) COLLATE nocase,
    class CHAR(1) NOT NULL,
    rating CHAR(1) NOT NULL,
-   entitlement CHAR(10),
+   entitlement VARCHAR(50),
 
    UNIQUE (id)
  );

{tradedangerous-10.16.11 → 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.11 → 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.11'
+__version__ = '10.16.13'
 

{tradedangerous-10.16.11 → tradedangerous-10.16.13}/tradedangerous.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 10.16.11
+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
@@ -22,6 +22,7 @@ License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: appJar
 Requires-Dist: pysimdjson
+Requires-Dist: rich
 
 
 ----------

{tradedangerous-10.16.11 → tradedangerous-10.16.13}/tradedangerous.egg-info/requires.txt

@@ -1,3 +1,4 @@
 requests
 appJar
 pysimdjson
+rich