tradedangerous 11.0.5__tar.gz → 11.0.6__tar.gz

{tradedangerous-11.0.5/tradedangerous.egg-info → tradedangerous-11.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.0.5
+Version: 11.0.6
 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-11.0.5 → tradedangerous-11.0.6}/tradedangerous/commands/buildcache_cmd.py

@@ -57,11 +57,11 @@ def run(results, cmdenv, tdb: TradeDB):
     if not cmdenv.force:
         if tdb.dbPath.exists():
             raise CommandLineError(
-                "SQLite3 database '{tdb.dbFilename}' already exists.\n"
+                f"SQLite3 database '{tdb.dbFilename}' already exists.\n"
                 "Either remove the file first or use the '-f' option.")
     
     if not tdb.sqlPath.exists():
-        raise CommandLineError("SQL File does not exist: {tdb.sqlFilename}")
+        raise CommandLineError(f"SQL File does not exist: {tdb.sqlFilename}")
     
     buildCache(tdb, cmdenv)
     

{tradedangerous-11.0.5 → tradedangerous-11.0.6}/tradedangerous/jsonprices.py

@@ -1,8 +1,12 @@
-#!/usr/bin/env python3.6
+from tradedangerous import tradedb
+from tradedangerous.tradeexcept import TradeException
 
-import tradedb
-from tradeexcept import TradeException
 import json
+import sys
+
+
+sys.stderr.write("*** WARNING: jsonprices.py is deprecated; if you rely on it, please post a github issue\n")
+
 
 class UnknownSystemError(TradeException):
     def __str__(self):
@@ -12,6 +16,7 @@ class UnknownStationError(TradeException):
     def __str__(self):
         return "Unknown Station: " + ' '.join(self.args)
 
+
 def lookup_system(tdb, tdenv, name, x, y, z):
     try:
         system = tdb.systemByName[name.upper()]
@@ -112,6 +117,13 @@ def load_prices_json(
             blackMarket = '?'
     except KeyError:
         blackMarket = '?'
+
+    try:
+        maxPadSize = stnData['mps'].upper()
+        if maxPadSize not in ['S', 'M', 'L']:
+            maxPadSize = '?'
+    except KeyError:
+        maxPadSize = '?'
     
     system = lookup_system(
             tdb, tdenv,
@@ -139,6 +151,7 @@ def load_prices_json(
             stnName,
             lsFromStar,
             blackMarket,
+            maxPadSize,
             )
     if not station:
         if tdenv.ignoreUnknown:

{tradedangerous-11.0.5 → tradedangerous-11.0.6}/tradedangerous/plugins/eddblink_plug.py

@@ -129,7 +129,6 @@ class ImportPlugin(plugins.ImportPluginBase):
                         "(Useful for updating Vendor tables if they were skipped during a '-O clean' run.)",
         'purge':        "Remove any empty systems that previously had fleet carriers.",
         'solo':         "Don't download crowd-sourced market data. (Implies '-O skipvend', supercedes '-O all', '-O clean', '-O listings'.)",
-        "prices":       "Backup listings to the TradeDangerous.prices cache file",
     }
     
     def __init__(self, tdb, tdenv):
@@ -499,7 +498,7 @@ class ImportPlugin(plugins.ImportPluginBase):
             if self.downloadFile(self.liveListingsPath) or self.getOption("force"):
                 self.importListings(self.liveListingsPath)
         
-        if self.getOption("prices"):
+        if self.getOption("listings"):
             self.tdenv.NOTE("Regenerating .prices file.")
             cache.regeneratePricesFile(self.tdb, self.tdenv)
         

{tradedangerous-11.0.5 → tradedangerous-11.0.6}/tradedangerous/plugins/spansh_plug.py

@@ -374,6 +374,11 @@ class ImportPlugin(plugins.ImportPluginBase):
                 f'{total_station_count} st  {total_commodity_count} co'
             )
         
+        with Timing() as timing:
+            self.print('Exporting to cache...')
+            cache.regeneratePricesFile(self.tdb, self.tdenv)
+            self.print(f'Cache export completed in {timedelta(seconds=int(timing.elapsed))!s}')
+        
         return False
     
     def data_stream(self):

{tradedangerous-11.0.5 → tradedangerous-11.0.6}/tradedangerous/submit-distances.py

@@ -21,8 +21,8 @@ import sys
 import tradedb
 import tradeenv
 
-from misc.edsc import StarSubmission, StarSubmissionResult, SubmissionError
-from misc.clipboard import SystemNameClip
+from tradedangerous.misc.edsc import StarSubmission, StarSubmissionResult, SubmissionError
+from tradedangerous.misc.clipboard import SystemNameClip
 
 
 standardStars = [
@@ -33,6 +33,10 @@ standardStars = [
     "ASELLUS AUSTRALIS",
 ]
 
+
+sys.stderr.write("*** WARNING: submit-distances.py is deprecated; if you rely on it, please post a github issue\n")
+
+
 ############################################################################
 
 

{tradedangerous-11.0.5 → tradedangerous-11.0.6}/tradedangerous/version.py

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

{tradedangerous-11.0.5 → tradedangerous-11.0.6/tradedangerous.egg-info}/PKG-INFO

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