tradedangerous 10.14.3__tar.gz → 10.14.4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of tradedangerous might be problematic. Click here for more details.

Files changed (97) hide show
  1. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/PKG-INFO +1 -1
  2. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/plugins/spansh_plug.py +13 -6
  3. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/version.py +1 -1
  4. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous.egg-info/PKG-INFO +1 -1
  5. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/LICENSE +0 -0
  6. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/README.md +0 -0
  7. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/pyproject.toml +0 -0
  8. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/setup.cfg +0 -0
  9. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/setup.py +0 -0
  10. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tests/test_bootstrap_commands.py +0 -0
  11. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tests/test_bootstrap_plugins.py +0 -0
  12. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tests/test_cache.py +0 -0
  13. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tests/test_commands.py +0 -0
  14. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tests/test_fs.py +0 -0
  15. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tests/test_peek.py +0 -0
  16. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tests/test_tools.py +0 -0
  17. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tests/test_trade.py +0 -0
  18. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tests/test_trade_import_eddblink.py +0 -0
  19. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tests/test_trade_run.py +0 -0
  20. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tests/test_utils.py +0 -0
  21. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/__init__.py +0 -0
  22. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/cache.py +0 -0
  23. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/cli.py +0 -0
  24. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/TEMPLATE.py +0 -0
  25. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/__init__.py +0 -0
  26. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/buildcache_cmd.py +0 -0
  27. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/buy_cmd.py +0 -0
  28. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/commandenv.py +0 -0
  29. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/exceptions.py +0 -0
  30. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/export_cmd.py +0 -0
  31. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/import_cmd.py +0 -0
  32. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/local_cmd.py +0 -0
  33. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/market_cmd.py +0 -0
  34. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/nav_cmd.py +0 -0
  35. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/olddata_cmd.py +0 -0
  36. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/parsing.py +0 -0
  37. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/rares_cmd.py +0 -0
  38. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/run_cmd.py +0 -0
  39. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/sell_cmd.py +0 -0
  40. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/shipvendor_cmd.py +0 -0
  41. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/station_cmd.py +0 -0
  42. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/trade_cmd.py +0 -0
  43. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/update_cmd.py +0 -0
  44. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/commands/update_gui.py +0 -0
  45. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/corrections.py +0 -0
  46. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/csvexport.py +0 -0
  47. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/edscupdate.py +0 -0
  48. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/edsmupdate.py +0 -0
  49. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/formatting.py +0 -0
  50. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/fs.py +0 -0
  51. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/gui.py +0 -0
  52. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/jsonprices.py +0 -0
  53. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/mapping.py +0 -0
  54. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/mfd/__init__.py +0 -0
  55. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/mfd/saitek/__init__.py +0 -0
  56. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/mfd/saitek/directoutput.py +0 -0
  57. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/mfd/saitek/x52pro.py +0 -0
  58. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/misc/checkpricebounds.py +0 -0
  59. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/misc/clipboard.py +0 -0
  60. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/misc/coord64.py +0 -0
  61. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/misc/derp-sentinel.py +0 -0
  62. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/misc/diff-system-csvs.py +0 -0
  63. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/misc/eddb.py +0 -0
  64. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/misc/eddn.py +0 -0
  65. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/misc/edsc.py +0 -0
  66. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/misc/edsm.py +0 -0
  67. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/misc/importeddbstats.py +0 -0
  68. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/misc/prices-json-exp.py +0 -0
  69. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/misc/progress.py +0 -0
  70. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/plugins/__init__.py +0 -0
  71. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/plugins/edapi_plug.py +0 -0
  72. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/plugins/edcd_plug.py +0 -0
  73. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/plugins/eddblink_plug.py +0 -0
  74. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/plugins/edmc_batch_plug.py +0 -0
  75. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/plugins/journal_plug.py +0 -0
  76. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/plugins/netlog_plug.py +0 -0
  77. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/prices.py +0 -0
  78. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/submit-distances.py +0 -0
  79. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/templates/Added.csv +0 -0
  80. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/templates/DefaultShipIndex.json +0 -0
  81. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/templates/RareItem.csv +0 -0
  82. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/templates/TradeDangerous.sql +0 -0
  83. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/tools.py +0 -0
  84. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/trade.py +0 -0
  85. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/tradecalc.py +0 -0
  86. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/tradedb.py +0 -0
  87. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/tradeenv.py +0 -0
  88. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/tradeexcept.py +0 -0
  89. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/tradegui.py +0 -0
  90. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/transfers.py +0 -0
  91. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous/utils.py +0 -0
  92. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous.egg-info/SOURCES.txt +0 -0
  93. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous.egg-info/dependency_links.txt +0 -0
  94. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous.egg-info/entry_points.txt +0 -0
  95. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous.egg-info/not-zip-safe +0 -0
  96. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous.egg-info/requires.txt +0 -0
  97. {tradedangerous-10.14.3 → tradedangerous-10.14.4}/tradedangerous.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: tradedangerous
3
- Version: 10.14.3
3
+ Version: 10.14.4
4
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.
5
5
  Home-page: https://github.com/eyeonus/Trade-Dangerous
6
6
  Author: eyeonus
@@ -9,7 +9,7 @@ import requests
9
9
  import simdjson
10
10
  import sqlite3
11
11
 
12
- from .. import plugins, cache, fs
12
+ from .. import plugins, cache, fs, transfers
13
13
 
14
14
  SOURCE_URL = 'https://downloads.spansh.co.uk/galaxy_stations.json'
15
15
 
@@ -156,17 +156,24 @@ class ImportPlugin(plugins.ImportPluginBase):
156
156
  return False
157
157
 
158
158
  def data_stream(self):
159
+ if not self.file:
160
+ url = self.url or SOURCE_URL
161
+ self.print(f'Downloading prices from remote URL: {url}')
162
+ self.file = self.tdenv.tmpDir / Path("galaxy_stations.json")
163
+ transfers.download(self.tdenv, url, self.file)
164
+ self.print(f'Download complete, saved to local file: {self.file}')
165
+
159
166
  if self.file == '-':
160
167
  self.print('Reading prices from stdin')
161
168
  stream = sys.stdin
162
169
  elif self.file:
163
170
  self.print(f'Reading prices from local file: {self.file}')
164
171
  stream = open(self.file, 'r', encoding='utf8')
165
- else:
166
- url = self.url or SOURCE_URL
167
- self.print(f'Reading prices from remote URL: {url}')
168
- req = requests.get(url, stream=True)
169
- stream = req.iter_lines(decode_unicode=True)
172
+ # else:
173
+ # url = self.url or SOURCE_URL
174
+ # self.print(f'Reading prices from remote URL: {url}')
175
+ # req = requests.get(url, stream=True)
176
+ # stream = req.iter_lines(decode_unicode=True)
170
177
  return ingest_stream(stream)
171
178
 
172
179
  def categorise_commodities(self, commodities):
@@ -12,5 +12,5 @@
12
12
  """just keeper of current version"""
13
13
 
14
14
  # TODO: remember to update tests when version changes
15
- __version__ = '10.14.3'
15
+ __version__ = '10.14.4'
16
16
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: tradedangerous
3
- Version: 10.14.3
3
+ Version: 10.14.4
4
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.
5
5
  Home-page: https://github.com/eyeonus/Trade-Dangerous
6
6
  Author: eyeonus