tradedangerous 10.14.2__py3-none-any.whl → 10.14.4__py3-none-any.whl

tradedangerous/gui.py

@@ -47,6 +47,7 @@ from pathlib import Path
 from appJar import gui
 import appJar
 
+
 # from tkinter import *
 # import tkinter.font as font
 # import tkinter.scrolledtext as scrolledtext

tradedangerous/plugins/spansh_plug.py

@@ -9,7 +9,7 @@ import requests
 import simdjson
 import sqlite3
 
-from .. import plugins
+from .. import plugins, cache, fs, transfers
 
 SOURCE_URL = 'https://downloads.spansh.co.uk/galaxy_stations.json'
 
@@ -55,12 +55,14 @@ class ImportPlugin(plugins.ImportPluginBase):
     pluginOptions = {
         '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',
+        'listener': 'For use by TD-listener, prevents updating cache from generated prices file',
     }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.url = self.getOption('url')
         self.file = self.getOption('file')
+        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()
@@ -71,12 +73,13 @@ class ImportPlugin(plugins.ImportPluginBase):
         return self.tdenv.uprint(*args, **kwargs)
 
     def run(self):
-        self.tdenv.filename = str(self.tdb.pricesPath)
+        fs.ensurefolder(self.tdenv.tmpDir)
+        filePath = self.tdenv.tmpDir / Path("spansh.prices")
         if self.tdenv.detail < 1:
             self.print('This will take at least several minutes...')
             self.print('You can increase verbosity (-v) to get a sense of progress')
-        with open(self.tdb.pricesPath, 'w') as f, Timing() as timing:
-            self.print(f'Writing prices to {self.tdb.pricesPath}')
+        with open(filePath, 'w') as f, Timing() as timing:
+            self.print(f'Writing prices to {filePath}')
             f.write('# Generated from spansh galaxy data\n')
             f.write(f'# Source: {self.file or self.url}\n')
             f.write('#\n')
@@ -143,20 +146,34 @@ class ImportPlugin(plugins.ImportPluginBase):
                 f'{timedelta(seconds=int(timing.elapsed))!s}  Done  '
                 f'{total_station_count} st  {total_commodity_count} co'
             )
-        return True
+            
+        if not self.listener:
+            with Timing() as timing:
+                self.print('Importing to cache...')
+                self.tdenv.mergeImport = True
+                cache.importDataFromFile(self.tdb, self.tdenv, filePath)
+                self.print(f'Cache import completed in {timedelta(seconds=int(timing.elapsed))!s}')
+        return False
 
     def data_stream(self):
+        if not self.file:
+            url = self.url or SOURCE_URL
+            self.print(f'Downloading prices from remote URL: {url}')
+            self.file = self.tdenv.tmpDir / Path("galaxy_stations.json")
+            transfers.download(self.tdenv, url, self.file)
+            self.print(f'Download complete, saved to local file: {self.file}')
+
         if self.file == '-':
             self.print('Reading prices from stdin')
             stream = sys.stdin
         elif self.file:
             self.print(f'Reading prices from local file: {self.file}')
             stream = open(self.file, 'r', encoding='utf8')
-        else:
-            url = self.url or SOURCE_URL
-            self.print(f'Reading prices from remote URL: {url}')
-            req = requests.get(url, stream=True)
-            stream = req.iter_lines(decode_unicode=True)
+        # else:
+        #     url = self.url or SOURCE_URL
+        #     self.print(f'Reading prices from remote URL: {url}')
+        #     req = requests.get(url, stream=True)
+        #     stream = req.iter_lines(decode_unicode=True)
         return ingest_stream(stream)
 
     def categorise_commodities(self, commodities):

tradedangerous/version.py

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

{tradedangerous-10.14.2.dist-info → tradedangerous-10.14.4.dist-info}/METADATA

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

@@ -7,7 +7,7 @@ tradedangerous/edscupdate.py,sha256=-aglmhmtCKYrUyYKO1SBs4xmEHafTL4CjVeAt8uproU,
 tradedangerous/edsmupdate.py,sha256=GesavwY7rI5tuoTTMrM8sjYSN50QaPsDqKR2rrVbRZk,14924
 tradedangerous/formatting.py,sha256=3uqO9zHOTdfgZdFfhhL32gK_jIpliYOPhJocY5C1cfU,6162
 tradedangerous/fs.py,sha256=zVh5dF9dnJB0WLPSGX1KlJ8Sgqff5my3wer7m_4ddwM,2530
-tradedangerous/gui.py,sha256=DvHUB-evcVSoJS1skTe7urx54ovD5jAi6rHPpVgh-xk,44100
+tradedangerous/gui.py,sha256=gHGiFSmprQNNYWewRVqdV22XK1EIt9eODnpgVrL3imA,44101
 tradedangerous/jsonprices.py,sha256=AQ2YFMc18s-KdvXAGZnYDw2bNbfBksWnM-vXRS8IP70,7013
 tradedangerous/mapping.py,sha256=RNjZy5hpokFVFDw_KkOUELmT4fPJC1RZiN9D8ZeAu5o,4034
 tradedangerous/prices.py,sha256=AcETd8b-lKwuyyx6cTud2jyoQLPZaxMuGgQNI9N-SYU,7593
@@ -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=5iuvqnu0uphkiczIVtwP6oY8olhV7oHQ5oaAUqtQt6g,647
+tradedangerous/version.py,sha256=3i41isl-Ux4yWjmzBWSkr9jKVz1mULwKmJQ0ZUkbUYg,647
 tradedangerous/commands/TEMPLATE.py,sha256=7oXL124aqxGHwnb0h9yRylUiwc6M5QrRrGVrubwI1gg,2124
 tradedangerous/commands/__init__.py,sha256=6B0WuqkFBOll5Hj67yKDAnhmyr5ZAnHc6nzUNEUh384,9640
 tradedangerous/commands/buildcache_cmd.py,sha256=oJvP06fA8svnHrfrpWkHKR16cba8GIhHdMOyZqds18Y,2332
@@ -66,14 +66,14 @@ tradedangerous/plugins/eddblink_plug.py,sha256=n8AzLh2pJdHdar1SnqSSjCwWPl4f-OKQ8
 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=ImU1tp995LhzFX7sJXApLiwrxx29b2WXR0jtWvm5O0U,14485
+tradedangerous/plugins/spansh_plug.py,sha256=vru5Mypzh07K8Xkbh1RMzDxhYt_uJFZD9zHAfzi7XFU,15393
 tradedangerous/templates/Added.csv,sha256=8o54civQCcS9y7_DBo0GX196XWRbbREQqKDYTKibsgQ,649
 tradedangerous/templates/DefaultShipIndex.json,sha256=m5cI3vkKiqRk1VKO1Z_8LZrG9nczV0PUMDfBSt4-1RM,94739
 tradedangerous/templates/RareItem.csv,sha256=F1RhRnTD82PiwrVUO-ai2ErGH2PTqNnQaDw5mcgljXs,10483
 tradedangerous/templates/TradeDangerous.sql,sha256=6sjEogGHy-9zYpjPo0Y2a5tElowmHFyJNwrimOUBfHk,8079
-tradedangerous-10.14.2.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-10.14.2.dist-info/METADATA,sha256=F90OuVRZ5eI8SzlzQDdmhrrOQQbEa0RnAMlRKXX-KBk,4421
-tradedangerous-10.14.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-10.14.2.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
-tradedangerous-10.14.2.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
-tradedangerous-10.14.2.dist-info/RECORD,,
+tradedangerous-10.14.4.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-10.14.4.dist-info/METADATA,sha256=g55fWxci045Ee1ZYkv_DWTtJ2Kuw6Pj2ccQQDEzH1e8,4421
+tradedangerous-10.14.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-10.14.4.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
+tradedangerous-10.14.4.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
+tradedangerous-10.14.4.dist-info/RECORD,,