tradedangerous 11.5.3__py3-none-any.whl → 12.0.0__py3-none-any.whl

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 (38) hide show
  1. tradedangerous/cache.py +567 -395
  2. tradedangerous/cli.py +2 -2
  3. tradedangerous/commands/TEMPLATE.py +25 -26
  4. tradedangerous/commands/__init__.py +8 -16
  5. tradedangerous/commands/buildcache_cmd.py +40 -10
  6. tradedangerous/commands/buy_cmd.py +57 -46
  7. tradedangerous/commands/commandenv.py +0 -2
  8. tradedangerous/commands/export_cmd.py +78 -50
  9. tradedangerous/commands/import_cmd.py +67 -31
  10. tradedangerous/commands/market_cmd.py +52 -19
  11. tradedangerous/commands/olddata_cmd.py +120 -107
  12. tradedangerous/commands/rares_cmd.py +122 -110
  13. tradedangerous/commands/run_cmd.py +118 -66
  14. tradedangerous/commands/sell_cmd.py +52 -45
  15. tradedangerous/commands/shipvendor_cmd.py +49 -234
  16. tradedangerous/commands/station_cmd.py +55 -485
  17. tradedangerous/commands/update_cmd.py +56 -420
  18. tradedangerous/csvexport.py +173 -162
  19. tradedangerous/gui.py +2 -2
  20. tradedangerous/plugins/eddblink_plug.py +387 -251
  21. tradedangerous/plugins/spansh_plug.py +2488 -821
  22. tradedangerous/prices.py +124 -142
  23. tradedangerous/templates/TradeDangerous.sql +6 -6
  24. tradedangerous/tradecalc.py +1227 -1109
  25. tradedangerous/tradedb.py +533 -384
  26. tradedangerous/tradeenv.py +12 -1
  27. tradedangerous/version.py +1 -1
  28. {tradedangerous-11.5.3.dist-info → tradedangerous-12.0.0.dist-info}/METADATA +6 -4
  29. {tradedangerous-11.5.3.dist-info → tradedangerous-12.0.0.dist-info}/RECORD +33 -38
  30. {tradedangerous-11.5.3.dist-info → tradedangerous-12.0.0.dist-info}/WHEEL +1 -1
  31. tradedangerous/commands/update_gui.py +0 -721
  32. tradedangerous/jsonprices.py +0 -254
  33. tradedangerous/plugins/edapi_plug.py +0 -1071
  34. tradedangerous/plugins/journal_plug.py +0 -537
  35. tradedangerous/plugins/netlog_plug.py +0 -316
  36. {tradedangerous-11.5.3.dist-info → tradedangerous-12.0.0.dist-info}/entry_points.txt +0 -0
  37. {tradedangerous-11.5.3.dist-info → tradedangerous-12.0.0.dist-info/licenses}/LICENSE +0 -0
  38. {tradedangerous-11.5.3.dist-info → tradedangerous-12.0.0.dist-info}/top_level.txt +0 -0
@@ -258,8 +258,18 @@ class TradeEnv(Utf8SafeConsoleIOMixin):
258
258
  if key == "WARN":
259
259
 
260
260
  def _WARN_ENABLED(outText, *args, stderr: bool = False, **kwargs):
261
+ try:
262
+ # Try to apply .format if args/kwargs are supplied
263
+ if args or kwargs:
264
+ msg = str(outText).format(*args, **kwargs)
265
+ else:
266
+ msg = str(outText)
267
+ except Exception:
268
+ # Fallback: dump raw message + args/kwargs repr
269
+ msg = f"{outText} {args!r} {kwargs!r}"
270
+
261
271
  self.uprint(
262
- f"{self.theme.warn}{self.theme.WARNING}: {str(outText).format(*args, **kwargs)}",
272
+ f"{self.theme.warn}{self.theme.WARNING}: {msg}",
263
273
  stderr=stderr,
264
274
  )
265
275
 
@@ -269,6 +279,7 @@ class TradeEnv(Utf8SafeConsoleIOMixin):
269
279
  noteFn = _WARN_DISABLED if self.quiet > 1 else _WARN_ENABLED
270
280
  setattr(self, key, noteFn)
271
281
  return noteFn
282
+
272
283
 
273
284
  return None
274
285
 
tradedangerous/version.py CHANGED
@@ -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__ = '11.5.3'
15
+ __version__ = '12.0.0'
16
16
 
@@ -1,6 +1,6 @@
1
- Metadata-Version: 2.2
1
+ Metadata-Version: 2.4
2
2
  Name: tradedangerous
3
- Version: 11.5.3
3
+ Version: 12.0.0
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
@@ -31,6 +31,7 @@ Dynamic: description-content-type
31
31
  Dynamic: home-page
32
32
  Dynamic: keywords
33
33
  Dynamic: license
34
+ Dynamic: license-file
34
35
  Dynamic: project-url
35
36
  Dynamic: requires-dist
36
37
  Dynamic: summary
@@ -41,9 +42,10 @@ Dynamic: summary
41
42
  TradeDangerous
42
43
  Copyright (C) Oliver "kfsone" Smith, July 2014
43
44
  Copyright (C) Bernd 'Gazelle' Gollesch 2016, 2017
44
- Copyright (C) Jonathan 'eyeonus' Jones 2018 - 2021
45
+ Copyright (C) Stefan 'Tromador' Morrell 2025
46
+ Copyright (C) Jonathan 'eyeonus' Jones 2018 - 2025
45
47
 
46
- REQUIRES PYTHON 3.4 OR HIGHER.
48
+ REQUIRES PYTHON 3.10 OR HIGHER.
47
49
 
48
50
  ----------
49
51
 
@@ -1,48 +1,46 @@
1
1
  trade.py,sha256=Skqy0bC47g1KujuYrVwa3T8AfJ9NoLLOZcVjjxJ2daQ,1769
2
2
  tradegui.py,sha256=q2HdIdoyeLUpeF2X0hVIGn7sU6T4zOzq1HN0zGvZdyE,788
3
3
  tradedangerous/__init__.py,sha256=bwsbE_GyCNsuyGDKnfXAg0RD-ewsWHliySJ5QfCK7h8,1166
4
- tradedangerous/cache.py,sha256=BM3jxnezff0fd8WhIbnVn9dDuULtLMKld0oiY8h7nZU,37233
5
- tradedangerous/cli.py,sha256=dLekZ3MTbn9XcSGtE532qZF3iSnsb5G-ddQyErwTv9o,4559
4
+ tradedangerous/cache.py,sha256=fhnEzE2g4999sMI6JowTKYZj1epgsUdLZFjLBKKgsKQ,43829
5
+ tradedangerous/cli.py,sha256=aTZf6N7BD_G99r43n58xDSYH4gmvz0CBRU6vAgS3__4,4561
6
6
  tradedangerous/corrections.py,sha256=_WLgo1IBWoskrrPFeshRwCOeJ2BeJb_x4tDQ0JdAo-s,1340
7
- tradedangerous/csvexport.py,sha256=_19bGVnCGJPzvx_8DzLGOs4rqx8Asn7eCVdXKdKu92E,8653
7
+ tradedangerous/csvexport.py,sha256=bwDcFKYPe-qdEG0HJONJ5Ij8PTphAD1mBOi_kK4nXSo,7970
8
8
  tradedangerous/edscupdate.py,sha256=To7hL2FuR4A7A4gJfvow_jGl6mlD7aP-Drv1rEkwy-I,17310
9
9
  tradedangerous/edsmupdate.py,sha256=9IANIASA8ZKnZsLPBRAh7IArDRsa0jriL2UwjqKJ1fI,14928
10
10
  tradedangerous/formatting.py,sha256=R8GX2Zya1xazLOOBIWlLqUEjIESZJO41UlvhZDbyY4Q,6908
11
11
  tradedangerous/fs.py,sha256=Uqc0wEbORJektD22MQgjqerxbJbc3mUee9MlXna5Wx0,3897
12
- tradedangerous/gui.py,sha256=DFsF5zATr-lyJShL6t5kPKvcLLJYkICurzBz0WBa-oQ,43676
13
- tradedangerous/jsonprices.py,sha256=vNj3Pz2NN39FgpHMo_TRH6MI3GQaFGIa2idg2HYYu2A,7229
12
+ tradedangerous/gui.py,sha256=BWazhqpOKVCy7Bv_Hc-i1JfNYc2FN5xKX8NOgDlDqtM,43676
14
13
  tradedangerous/mapping.py,sha256=Bf2G8LzP1Bat5k3hFs9XyeI1z3tfUpfeh4nuLP2QJuQ,4122
15
- tradedangerous/prices.py,sha256=JqiDVrtvvPd5pqE3HdwOHOuFgdAbOR-pt0GLD3ZIXM8,7425
14
+ tradedangerous/prices.py,sha256=-hwu6Dgf_cS4_3ew35k_6iE6L41AYOSBfx5UaNgmCl8,6906
16
15
  tradedangerous/submit-distances.py,sha256=m1qAuqH_yq8euMSWSqkmkTNM4a136Vl5WrGmTk15LiM,11745
17
16
  tradedangerous/tools.py,sha256=pp-4WtA12SVaaQHFJFOMTF7EDFRCU2mQeOhC4xoXmEk,1331
18
- tradedangerous/tradecalc.py,sha256=ZuTxp_9gMj4wDGalp1k_VfoVupwF8Oh9FOYML3vN-oM,42749
19
- tradedangerous/tradedb.py,sha256=mitKkS4MczivDK_K7A-IC94hkObUmGWFhwIrh_ts9qw,72282
20
- tradedangerous/tradeenv.py,sha256=aIeK291Ene98kaEEu1LvlJ4KT4EvPfIXlT4IfZnpVc0,11917
17
+ tradedangerous/tradecalc.py,sha256=LA37VAaVS8lSRW1Ydmo28R9FmFwhjoieOMG6KxVtn9A,46082
18
+ tradedangerous/tradedb.py,sha256=nPd-RD5HtgBswnlRPAO0Z0nDbxXeJNj02g1DLpnl49s,78428
19
+ tradedangerous/tradeenv.py,sha256=JA0yMStJ_zfLGHT2yxuY0s1cBvQz1ztL1zTYJslMZJk,12314
21
20
  tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk,368
22
21
  tradedangerous/transfers.py,sha256=t_0Sjr4FI9lhIPwyPOXdR8d97bE611ujbKK4ioWShm0,6024
23
22
  tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
24
- tradedangerous/version.py,sha256=zRa68iWjzmvpmz4IBsUJcKlNaDnryOab6peG9xB5FHI,646
25
- tradedangerous/commands/TEMPLATE.py,sha256=MOE69xsZPHPIMBQ-LXicfsOlCZdy-2gPX_nlnwYYil8,2026
26
- tradedangerous/commands/__init__.py,sha256=3gz2cnXNZNkV1gtZh0dOnCRxBkQHbeIyysRe3bM2WEE,9516
27
- tradedangerous/commands/buildcache_cmd.py,sha256=jhNSqHX_xX43SiSUMFiKtWpB9v4oeZ0sqfNq6DCrjUs,2181
28
- tradedangerous/commands/buy_cmd.py,sha256=qgOBTzCvcYgLOcdkx7BpqF-rSs6GFjOL_f3Gzutmx1I,13947
29
- tradedangerous/commands/commandenv.py,sha256=72hEqaZzUBsTiYzkJrGP6Z1EN7WyvyZrKHxlRQNp--4,9868
23
+ tradedangerous/version.py,sha256=-bA7lcvaa54DZPfk0VgcJgVtYF_xFSqoOWaQgVAKJeI,646
24
+ tradedangerous/commands/TEMPLATE.py,sha256=seMXDN_Nf_Rvj_5BivI-0yhVT6W9iRDihr5yo8kr5qw,2069
25
+ tradedangerous/commands/__init__.py,sha256=UvcWgcr_PVScbJ6R83iaUb2_4Ttmft85HYexTFo7FwU,9171
26
+ tradedangerous/commands/buildcache_cmd.py,sha256=6CkmoDYthECkMcu5I3Ljyis42yy-bnUcllAlSF-Xwi8,3318
27
+ tradedangerous/commands/buy_cmd.py,sha256=hRX2uAR9MAHc_Zk7TodS14f9gQ8kf3eduGRUmTXODbY,14568
28
+ tradedangerous/commands/commandenv.py,sha256=4czlC31wtfk2l9EORlDMTiD9LIefHgwJkxzqOAsKbaM,9852
30
29
  tradedangerous/commands/exceptions.py,sha256=sisGoBvOpt25TYWWjp-s-k_--O_nZe5Zd9HhAW3SElA,3487
31
- tradedangerous/commands/export_cmd.py,sha256=VfxwrNU_TzrSw71KrmtmXKYCBkpDGr5KRLGPXOBewnI,4405
32
- tradedangerous/commands/import_cmd.py,sha256=czbfBR0H1jTGX67b38BxiFi77EB8COM8ImztP7yPdzo,5654
30
+ tradedangerous/commands/export_cmd.py,sha256=y70eamRQOXuWTpcsBfF1e1lWTN10Aqcg9A-AKIREYtM,6011
31
+ tradedangerous/commands/import_cmd.py,sha256=jO3S63AugsV_0jsqFqtY7lRyTUi2jEqmN-bqXWFxjAs,7337
33
32
  tradedangerous/commands/local_cmd.py,sha256=tf7YMGX-vaVGNO2lvQF9EvQEN3Wj7DE9-NTSVrtaZx0,8392
34
- tradedangerous/commands/market_cmd.py,sha256=Ig16zDuksywiiF3Exps6UuM-ZhqgbXqkW6Lu2s9xQf0,5411
33
+ tradedangerous/commands/market_cmd.py,sha256=Pdvk_Q_XKw-ztE6O-__W44tUHLYaX_ouUhdix188h_E,6228
35
34
  tradedangerous/commands/nav_cmd.py,sha256=v245L1MxiUliITUgvWeeB4cL4UdkNO8n0CiP6ztrV54,8460
36
- tradedangerous/commands/olddata_cmd.py,sha256=6rpPRRs4kLhV9c0sogmctVAjta7v0L0Deu999spXY2s,7888
35
+ tradedangerous/commands/olddata_cmd.py,sha256=qanF6vVHBumMaFb_0Ds8jTwdAsQFQFDXmOh_xPfTRm0,8823
37
36
  tradedangerous/commands/parsing.py,sha256=IFYAVrEnlweocM08czG39oqRGuCgI7O5eN1-3NXQezs,6599
38
- tradedangerous/commands/rares_cmd.py,sha256=L_QoW2zIZTU9Jpavt_K2fZyu8T153nUSuVqIiz4uksQ,9207
39
- tradedangerous/commands/run_cmd.py,sha256=HtvxKfD2ef_fUCDdUzBv9yRwd2gBOqIq4hzUAOLgcyU,47650
40
- tradedangerous/commands/sell_cmd.py,sha256=yF0Bsq_gAycG8FQI0-JWmk_DvNnAgyno2wvj-PyrqBs,8269
41
- tradedangerous/commands/shipvendor_cmd.py,sha256=opszTmFMVDkker2ON-iAql82HzVmQ_5MDklb3MNUmJI,6984
42
- tradedangerous/commands/station_cmd.py,sha256=gnWOT-Z8DfOeA4GNjUwj57eNxuNGh5mPZ-D0E_BeoTw,16232
37
+ tradedangerous/commands/rares_cmd.py,sha256=Wftrxv99Qmvkwi5wANZPJi3DvJCakHxxDWQWi6pW4rs,8740
38
+ tradedangerous/commands/run_cmd.py,sha256=QI38iueb_k6ezvaApVUs3Lb10NnMzPaCzX4YpIIhs-U,49929
39
+ tradedangerous/commands/sell_cmd.py,sha256=Cv88Ikp3xRtL88yzjfRmXJSCbGdCVLuiFo6URdcCydA,8810
40
+ tradedangerous/commands/shipvendor_cmd.py,sha256=EsdQvCEkoGsJFnhFP6hYszAWNpAtPTGzhj-oCCo0sgI,1829
41
+ tradedangerous/commands/station_cmd.py,sha256=ovBXj7feWZaQeyG3ZykTJJRoW82oaetkW8AgW6JcUuE,2182
43
42
  tradedangerous/commands/trade_cmd.py,sha256=o4Xdel5asGY8i6qES95fLHdyfyjKdC5CTOQrZIeu0i4,3016
44
- tradedangerous/commands/update_cmd.py,sha256=2UWR6aDbAbvtKFtfmehVwFUBQfJM5KThR71HoC6wVnM,14564
45
- tradedangerous/commands/update_gui.py,sha256=WwZvvad7pF0LasZztjO6v5OTWzCZlcey2DFj8h91dWg,23331
43
+ tradedangerous/commands/update_cmd.py,sha256=4u4j4IZKFQ3yJcSgDXdc4GelmRuCoEMcxsNwGTo1ZsU,2070
46
44
  tradedangerous/mfd/__init__.py,sha256=g8pT9Ev_le_yOeAF7sr9fUuEi8VW3u9n_qq-xLga1xw,2958
47
45
  tradedangerous/mfd/saitek/__init__.py,sha256=CGgkAik87Kb5uc43G0bBFueD47bb_BydDM8qb7YQLyA,62
48
46
  tradedangerous/mfd/saitek/directoutput.py,sha256=ReBzax7ttoffzH8DLXx0AS2RFLLQWOQUw1ESQUjOMGk,24840
@@ -60,20 +58,17 @@ tradedangerous/misc/importeddbstats.py,sha256=iLAcrFzdwiMm_MnUuaHcT_xGgZF8pfEEd1
60
58
  tradedangerous/misc/prices-json-exp.py,sha256=Fpm62ugP35ZBqnRs6ekYfS3GoDFYmvLD3b3SFJfaMOI,4944
61
59
  tradedangerous/misc/progress.py,sha256=QwWgbbhAuMB7LG0o-jy7WxN1uhLHtN0FwKkV314ulrA,7170
62
60
  tradedangerous/plugins/__init__.py,sha256=TL-OIptlqNENKhoFqkFeBJn_vSw8L0pVaDJgjhaTj7A,7860
63
- tradedangerous/plugins/edapi_plug.py,sha256=5nqBYmjUceAt-KTfiBn7IEl443R1SsGLDmfVXgbcyms,42262
64
61
  tradedangerous/plugins/edcd_plug.py,sha256=JuDtuEM_mN9Sz2H09-qYizM-9N3cuNjgvQy7Y-wHwKw,14412
65
- tradedangerous/plugins/eddblink_plug.py,sha256=J54Lm2-bd1wFZhK_6ZdLUT5_bHdNcJcCx3VRN6gU5Ew,21363
62
+ tradedangerous/plugins/eddblink_plug.py,sha256=xXucqBeZwjLGd9gJfL2RIJSv4mEB3I6xV0Y0paVvMXs,26981
66
63
  tradedangerous/plugins/edmc_batch_plug.py,sha256=rrP_lFFxWsba8DPEo0WF2EdCiMoRC7tCT8z62MIvtIo,4173
67
- tradedangerous/plugins/journal_plug.py,sha256=5HMyoxQ7z42qj7NiL8rDxSyTN9gKikoQjyWzJLD-SYQ,23746
68
- tradedangerous/plugins/netlog_plug.py,sha256=yUl47l9xt3kGj9oSiY_FZaDGdnQj63oa9MBtSeIy1Zo,13469
69
- tradedangerous/plugins/spansh_plug.py,sha256=PXFarH_i0QASrIoTpkYjq27ZgeRqGSH9sac5OqYLMLU,38028
64
+ tradedangerous/plugins/spansh_plug.py,sha256=7emfdC3WzoEDOadRZ4wfX7zHVQKahPsntpP-qrRaGSg,108482
70
65
  tradedangerous/templates/Added.csv,sha256=8o54civQCcS9y7_DBo0GX196XWRbbREQqKDYTKibsgQ,649
71
66
  tradedangerous/templates/Category.csv,sha256=8xwUDcBZE25T6x6dZGlRUMTCqeDLt3a9LXU5h6hRHV8,250
72
67
  tradedangerous/templates/RareItem.csv,sha256=F1RhRnTD82PiwrVUO-ai2ErGH2PTqNnQaDw5mcgljXs,10483
73
- tradedangerous/templates/TradeDangerous.sql,sha256=XJ0T09OiS9UdYKJXXAG-rCe6T_ua4MU-icb2lD7iEz0,9342
74
- tradedangerous-11.5.3.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
75
- tradedangerous-11.5.3.dist-info/METADATA,sha256=FLfC5lbHnXnJ38BZ3uPDrtj79OJQlhBEi4cnhUVV584,4663
76
- tradedangerous-11.5.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
77
- tradedangerous-11.5.3.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
78
- tradedangerous-11.5.3.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
79
- tradedangerous-11.5.3.dist-info/RECORD,,
68
+ tradedangerous/templates/TradeDangerous.sql,sha256=pCw2Js8GQniqAWC6N3SL-ujyqlLYCeR2-SI-qhk6VsI,9336
69
+ tradedangerous-12.0.0.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
70
+ tradedangerous-12.0.0.dist-info/METADATA,sha256=fdcK1MuJEbWm3KSpHWZaRSafXcviQh_N-fe4bOmF2ZI,4735
71
+ tradedangerous-12.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
72
+ tradedangerous-12.0.0.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
73
+ tradedangerous-12.0.0.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
74
+ tradedangerous-12.0.0.dist-info/RECORD,,
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: setuptools (75.8.0)
2
+ Generator: setuptools (80.9.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5