tradedangerous 10.16.16__tar.gz → 10.17.0__tar.gz

{tradedangerous-10.16.16 → tradedangerous-10.17.0}/PKG-INFO

@@ -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 → tradedangerous-10.17.0}/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-10.16.16 → tradedangerous-10.17.0}/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-10.16.16 → tradedangerous-10.17.0}/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 → tradedangerous-10.17.0}/tradedangerous.egg-info/PKG-INFO

@@ -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