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

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")
@@ -472,12 +474,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,6 +509,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         
         # Remake the .db files with the updated info.
         if buildCache:
+            self.tdb.close()
             cache.buildCache(self.tdb, self.tdenv)
         
         if self.getOption("purge"):

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/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.12'
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 10.16.11
+Version: 10.16.12
 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.dist-info → tradedangerous-10.16.12.dist-info}/RECORD

@@ -21,7 +21,7 @@ tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk
 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=BV5It3d62BF5GhEeSfIzL1rZ7TJs5UsvyfMfrDKf4lc,648
+tradedangerous/version.py,sha256=Vx8jvW69Uth2ThVn-QdqSmgGU532csejhFasrFT13nE,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=7lqUjXQrZFuEBsXZNNmX6lQvGuqZeWrVSJI_nzAIqys,22033
+tradedangerous/plugins/eddblink_plug.py,sha256=BCA87Y8dZdzWUae2dc46hqISy6GN3uDwnwagXcCZhmI,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
@@ -70,10 +70,10 @@ tradedangerous/plugins/spansh_plug.py,sha256=WOpTm9C4oXPfFeEaSQtcu82OqX1uAuNGNy8
 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=kHZ7JBSY5lh2DnqayAxoO-apvXKB510SqhAzkT21YHY,8138
-tradedangerous-10.16.11.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-10.16.11.dist-info/METADATA,sha256=3ABvfKWRpcrTpz8weaPffXQJ5eTllqRD1R6XkzPUFb0,4422
-tradedangerous-10.16.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-10.16.11.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
-tradedangerous-10.16.11.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
-tradedangerous-10.16.11.dist-info/RECORD,,
+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,,