tradedangerous 10.16.16__py3-none-any.whl → 10.17.0__py3-none-any.whl

tradedangerous/plugins/eddblink_plug.py

@@ -89,7 +89,8 @@ class ImportPlugin(plugins.ImportPluginBase):
         'force':        "Force regeneration of selected items even if source file not updated since previous run. "
                         "(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'.)"
+        '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):
@@ -267,7 +268,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         stationItems = dict(self.execute('SELECT station_id, UNIXEPOCH(modified) FROM StationItem').fetchall())
         
         self.tdenv.DEBUG0("Processing entries...")
-        with listings_file.open("r", encoding="utf-8", errors="ignore") as fh:
+        with listings_path.open("r", encoding="utf-8", errors="ignore") as fh:
             prog = pbar.Progress(total, 50)
             listings = csv.DictReader(fh)
             
@@ -351,7 +352,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         default = True
         for option in self.options:
             # if not option in ('force', 'fallback', 'skipvend', 'progbar'):
-            if not option in ('force', 'skipvend'):
+            if not option in ('force', 'skipvend', 'prices'):
                 default = False
         if default:
             self.options["listings"] = True
@@ -508,7 +509,7 @@ class ImportPlugin(plugins.ImportPluginBase):
             if self.downloadFile(self.liveListingsPath) or self.getOption("force"):
                 self.importListings(self.liveListingsPath)
         
-        if self.getOption("listings"):
+        if self.getOption("prices"):
             self.tdenv.NOTE("Regenerating .prices file.")
             cache.regeneratePricesFile(self.tdb, self.tdenv)
         

tradedangerous/plugins/spansh_plug.py

@@ -65,7 +65,6 @@ class ImportPlugin(plugins.ImportPluginBase):
         'url':  f'URL to download galaxy data from (defaults to {SOURCE_URL})',
         'file': 'Local filename to import galaxy data from; use "-" to load from stdin',
         'maxage': 'Skip all entries older than specified age in days, ex.: maxage=1.5',
-        'listener': 'For use by TD-listener, prevents updating cache from generated prices file',
     }
 
     def __init__(self, *args, **kwargs):
@@ -73,7 +72,6 @@ class ImportPlugin(plugins.ImportPluginBase):
         self.url = self.getOption('url')
         self.file = self.getOption('file')
         self.maxage = float(self.getOption('maxage')) if self.getOption('maxage') else None
-        self.listener = self.getOption('listener')
         assert not (self.url and self.file), 'Provide either url or file, not both'
         if self.file and (self.file != '-'):
             self.file = (Path(self.tdenv.cwDir) / self.file).resolve()
@@ -170,11 +168,6 @@ 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/version.py

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

{tradedangerous-10.16.16.dist-info → tradedangerous-10.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 10.16.16
+Version: 10.17.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-10.16.16.dist-info → tradedangerous-10.17.0.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=vROLJSJzupfaXUWuLCNyZhDbAbuFvSrk3T-AY9MMAEc,648
+tradedangerous/version.py,sha256=ywjdWfhn1hu8HSR56vN66lbXMDuR0qaBvhQobN87l28,647
 tradedangerous/commands/TEMPLATE.py,sha256=7oXL124aqxGHwnb0h9yRylUiwc6M5QrRrGVrubwI1gg,2124
 tradedangerous/commands/__init__.py,sha256=6B0WuqkFBOll5Hj67yKDAnhmyr5ZAnHc6nzUNEUh384,9640
 tradedangerous/commands/buildcache_cmd.py,sha256=oJvP06fA8svnHrfrpWkHKR16cba8GIhHdMOyZqds18Y,2332
@@ -62,18 +62,18 @@ 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=3BOX6McE6huXq0AJevbN7m0rZXc_Mns4YnGlaH6nDP4,21964
+tradedangerous/plugins/eddblink_plug.py,sha256=DXkGYLs3704REJR4KrWnsC-OQF1ghZF2sSOUGPIbNok,22056
 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
-tradedangerous/plugins/spansh_plug.py,sha256=RXzLWHyVvRxmlzQEz4rhaZdtcEt1k3mdykjTphI9jdc,17088
+tradedangerous/plugins/spansh_plug.py,sha256=NPk7Yg3sammdwjY3WenXPdyX8gBSxXSN6LUZDsl2nMc,16692
 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=1EiJ7cNJQKvdW4X-LQAHw3Y1POc0roKf25LJJy6jGlo,8135
-tradedangerous-10.16.16.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-10.16.16.dist-info/METADATA,sha256=ZBKc1-gMkTbqzQl9YVoevR_fqnEiTxK6nIIQ8joxx94,4442
-tradedangerous-10.16.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-10.16.16.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
-tradedangerous-10.16.16.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
-tradedangerous-10.16.16.dist-info/RECORD,,
+tradedangerous-10.17.0.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-10.17.0.dist-info/METADATA,sha256=lHWSOrLqObYBndYkhkXaCjge77EWb9fhRvvljFfpGPU,4441
+tradedangerous-10.17.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-10.17.0.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
+tradedangerous-10.17.0.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
+tradedangerous-10.17.0.dist-info/RECORD,,