tradedangerous 11.0.5__py3-none-any.whl → 11.1.0__py3-none-any.whl

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/commands/buy_cmd.py

@@ -55,6 +55,12 @@ switches = (
         type = int,
     ),
     AvoidPlacesArgument(),
+    ParseArgument('--age', '--max-days-old', '-MD',
+        help = 'Maximum age (in days) of trade data to use.',
+        metavar = 'DAYS',
+        type = float,
+        dest = 'maxAge',
+    ),
     PadSizeArgument(),
     MutuallyExclusiveGroup(
         NoPlanetSwitch(),
@@ -100,7 +106,7 @@ switches = (
         type = "credits",
     ),
     ParseArgument('--ls-max',
-        help='Only consider stations upto this many ls from their star.',
+        help='Only consider stations up to this many ls from their star.',
         metavar='LS',
         dest='maxLs',
         type=int,
@@ -300,6 +306,9 @@ def run(results, cmdenv, tdb):
             continue
         if station.system in avoidSystems:
             continue
+        maxAge, stnAge = cmdenv.maxAge, station.dataAge or float("inf")
+        if maxAge and stnAge > maxAge:
+            continue
         
         row = ResultRow()
         row.station = station

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

{tradedangerous-11.0.5.dist-info → tradedangerous-11.1.0.dist-info}/METADATA

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

@@ -10,10 +10,10 @@ tradedangerous/edsmupdate.py,sha256=jpDUxUkDKxlG_gS3qWy5fg9p3mBPC-akU2pHSlfTPkI,
 tradedangerous/formatting.py,sha256=-FdlH1yMKPkqhpCtKmbl0chbyZ1VjKZsZ8OLc8v-Knc,6927
 tradedangerous/fs.py,sha256=_5OJHIRy_M-WFHEZO4g2EIgqDxdrz4s8tcdDmgG7NME,2494
 tradedangerous/gui.py,sha256=DFsF5zATr-lyJShL6t5kPKvcLLJYkICurzBz0WBa-oQ,43676
-tradedangerous/jsonprices.py,sha256=GAaNbfEs1LX_F5f69MiEhHIEwoGZtubGC8EQ9MM4B9A,6878
+tradedangerous/jsonprices.py,sha256=V9Xm3pocQfEHoC38VYWomzbwX0wu9R2zJ2gB99JzYPQ,7212
 tradedangerous/mapping.py,sha256=eGBQeYPD04Kq_ygZCDRafKMGz9EnxSgXUzQU-u78_2A,4049
 tradedangerous/prices.py,sha256=JqiDVrtvvPd5pqE3HdwOHOuFgdAbOR-pt0GLD3ZIXM8,7425
-tradedangerous/submit-distances.py,sha256=EMpqxXFauo3oaR9OAnHCHCsrqwABK1nZdmg92m62zrk,11560
+tradedangerous/submit-distances.py,sha256=zxHtRpX10soJKLuRcun9uelfXGq2S9jvIWxD--P9zus,11709
 tradedangerous/tools.py,sha256=pp-4WtA12SVaaQHFJFOMTF7EDFRCU2mQeOhC4xoXmEk,1331
 tradedangerous/tradecalc.py,sha256=A7peEMiaCjlwFvReSq3E7_Ar0shUoFedQi83ZmOc7uY,42075
 tradedangerous/tradedb.py,sha256=3nGB55dYs4igP3U3J4Ye1-M6Kt9A4xPAMmnX7JEDW7w,72220
@@ -21,11 +21,11 @@ tradedangerous/tradeenv.py,sha256=SDzRC6ERYZzzb_I6uexmFpFJJrnbzXa-1ogYt_GH26w,10
 tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk,368
 tradedangerous/transfers.py,sha256=88gIvXpjd8T6NLxBrBRzmH2IfUmDDtiMcDTrc7qF3OI,7830
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=Ruo3PXeo9RbLy-XofnontsIw0ImQFoMJhP0mTVqQ3Jg,646
+tradedangerous/version.py,sha256=4Zj8Hs-cCcFQf-Q7EsVSQT_GT7Slpn15PXsZDx_XPOc,646
 tradedangerous/commands/TEMPLATE.py,sha256=MOE69xsZPHPIMBQ-LXicfsOlCZdy-2gPX_nlnwYYil8,2026
 tradedangerous/commands/__init__.py,sha256=3gz2cnXNZNkV1gtZh0dOnCRxBkQHbeIyysRe3bM2WEE,9516
-tradedangerous/commands/buildcache_cmd.py,sha256=_8vKu9e3tQy0HEPrnG8Ts0OoQ_kF6gZPQ9EOfTUd73w,2179
-tradedangerous/commands/buy_cmd.py,sha256=jfN1KwLVWAssx4MABgPD32BzP7FhhwIr2o62u6kpLc8,13597
+tradedangerous/commands/buildcache_cmd.py,sha256=jhNSqHX_xX43SiSUMFiKtWpB9v4oeZ0sqfNq6DCrjUs,2181
+tradedangerous/commands/buy_cmd.py,sha256=VbHSUI9eocaQAdzaLRnHr-Nsnu15Q2WlhC3VzMK_3KQ,13924
 tradedangerous/commands/commandenv.py,sha256=lzPbxhrgx4PJL_x8pRdYu22rqtL4U6kNQ5ExXTPoAao,9462
 tradedangerous/commands/exceptions.py,sha256=xJib2n0YRSgrs8WhZX5IeVHM-XakS3YwfjlF8_cNx4E,3476
 tradedangerous/commands/export_cmd.py,sha256=VfxwrNU_TzrSw71KrmtmXKYCBkpDGr5KRLGPXOBewnI,4405
@@ -62,18 +62,18 @@ tradedangerous/misc/progress.py,sha256=NKvKP1OSCTpItc1CNxDuEH2A1oGJ6aWSyCdPSAjsG
 tradedangerous/plugins/__init__.py,sha256=TL-OIptlqNENKhoFqkFeBJn_vSw8L0pVaDJgjhaTj7A,7860
 tradedangerous/plugins/edapi_plug.py,sha256=5nqBYmjUceAt-KTfiBn7IEl443R1SsGLDmfVXgbcyms,42262
 tradedangerous/plugins/edcd_plug.py,sha256=JuDtuEM_mN9Sz2H09-qYizM-9N3cuNjgvQy7Y-wHwKw,14412
-tradedangerous/plugins/eddblink_plug.py,sha256=EWJrVn5twwPVT-vGicmWuL4NAwf69G_0mw9lnjzn1Xw,21606
+tradedangerous/plugins/eddblink_plug.py,sha256=m1fSG9YQZZcJZhGzEk4y_OyAMK-psczZ-WxJ5JwxSbA,21525
 tradedangerous/plugins/edmc_batch_plug.py,sha256=rrP_lFFxWsba8DPEo0WF2EdCiMoRC7tCT8z62MIvtIo,4173
 tradedangerous/plugins/journal_plug.py,sha256=5HMyoxQ7z42qj7NiL8rDxSyTN9gKikoQjyWzJLD-SYQ,23746
 tradedangerous/plugins/netlog_plug.py,sha256=yUl47l9xt3kGj9oSiY_FZaDGdnQj63oa9MBtSeIy1Zo,13469
-tradedangerous/plugins/spansh_plug.py,sha256=RoqCapz_nL4tqCJuN-mYDYbo99TlsXXZVwvTBXDhJNc,26801
+tradedangerous/plugins/spansh_plug.py,sha256=FiIS9cN2_8VKDrAj8yvkdy1NIni2kEc0ECqhgrvML4E,27048
 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=VlQK7QGtEi2brGtWaIZDvKmbJ_vLocD4CJ8h_6kKptU,7808
-tradedangerous-11.0.5.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-11.0.5.dist-info/METADATA,sha256=H1ImbOKei8lEN5zMQ-7ocsKAKXYJ_BoDnh8fBbBZkCQ,4435
-tradedangerous-11.0.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-11.0.5.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
-tradedangerous-11.0.5.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
-tradedangerous-11.0.5.dist-info/RECORD,,
+tradedangerous-11.1.0.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-11.1.0.dist-info/METADATA,sha256=wZnOMQk_kwZf5ho0VpdQ2gfKVTPqhI3oDpyoTvt97F0,4435
+tradedangerous-11.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-11.1.0.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
+tradedangerous-11.1.0.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
+tradedangerous-11.1.0.dist-info/RECORD,,