tradedangerous 12.0.1__py3-none-any.whl → 12.0.2__py3-none-any.whl

tradedangerous/db/config.py

@@ -26,6 +26,18 @@ DEFAULTS: Dict[str, Dict[str, Any]] = {
         "connect_timeout": 10,
     },
 }
+# --- Runtime default path correction ----------------------------------------
+# Convert relative defaults ("./data", "./tmp") into absolute paths under the
+# current working directory. This prevents first-run installs from resolving
+# relative to the package install directory or venv when no db_config.ini exists.
+try:
+    _cwd = Path.cwd()
+    DEFAULTS["paths"]["data_dir"] = str((_cwd / "data").resolve())
+    DEFAULTS["paths"]["tmp_dir"]  = str((_cwd / "tmp").resolve())
+except Exception:
+    # Best effort; fall back to shipped defaults if CWD is inaccessible
+    pass
+# ---------------------------------------------------------------------------
 
 # Hardened parser: allow inline comments and disable interpolation
 CFG_KW = dict(inline_comment_prefixes=(";", "#"), interpolation=None)

tradedangerous/tradedb.py

@@ -660,11 +660,14 @@ class TradeDB:
 
         # --- Engine bootstrap ---
         from .db import make_engine_from_config, get_session_factory
+        from .db.paths import resolve_data_dir
         import os
 
-        cfg = getattr(tdenv, "dbConfig", None)
-        if not cfg:
-            cfg = os.environ.get("TD_DB_CONFIG", "db_config.ini")
+        # Determine user's real invocation directory, not venv/bin
+        user_cwd = Path(os.getenv("PWD", Path.cwd()))
+        data_dir = user_cwd / "data"
+
+        cfg = os.environ.get("TD_DB_CONFIG") or str(data_dir / "db_config.ini")
 
         self.engine = make_engine_from_config(cfg)
         self.Session = get_session_factory(self.engine)

tradedangerous/version.py

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

{tradedangerous-12.0.1.dist-info → tradedangerous-12.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tradedangerous
-Version: 12.0.1
+Version: 12.0.2
 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-12.0.1.dist-info → tradedangerous-12.0.2.dist-info}/RECORD

@@ -15,12 +15,12 @@ tradedangerous/prices.py,sha256=-hwu6Dgf_cS4_3ew35k_6iE6L41AYOSBfx5UaNgmCl8,6906
 tradedangerous/submit-distances.py,sha256=m1qAuqH_yq8euMSWSqkmkTNM4a136Vl5WrGmTk15LiM,11745
 tradedangerous/tools.py,sha256=pp-4WtA12SVaaQHFJFOMTF7EDFRCU2mQeOhC4xoXmEk,1331
 tradedangerous/tradecalc.py,sha256=LA37VAaVS8lSRW1Ydmo28R9FmFwhjoieOMG6KxVtn9A,46082
-tradedangerous/tradedb.py,sha256=nPd-RD5HtgBswnlRPAO0Z0nDbxXeJNj02g1DLpnl49s,78428
+tradedangerous/tradedb.py,sha256=I278pM42z-TXEuvDytwDVAfuVrskinnl77zgccZlbTo,78581
 tradedangerous/tradeenv.py,sha256=JA0yMStJ_zfLGHT2yxuY0s1cBvQz1ztL1zTYJslMZJk,12314
 tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk,368
 tradedangerous/transfers.py,sha256=t_0Sjr4FI9lhIPwyPOXdR8d97bE611ujbKK4ioWShm0,6024
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=Rh30JGNdda_HO5HfTjrrAKbcd3N-vLrGJf6eWPxtZQ0,646
+tradedangerous/version.py,sha256=gpJrI9RqdPX6fJtGRmHEjgBQF6D2dTz7VBGzWAJajiw,646
 tradedangerous/commands/TEMPLATE.py,sha256=seMXDN_Nf_Rvj_5BivI-0yhVT6W9iRDihr5yo8kr5qw,2069
 tradedangerous/commands/__init__.py,sha256=UvcWgcr_PVScbJ6R83iaUb2_4Ttmft85HYexTFo7FwU,9171
 tradedangerous/commands/buildcache_cmd.py,sha256=6CkmoDYthECkMcu5I3Ljyis42yy-bnUcllAlSF-Xwi8,3318
@@ -43,7 +43,7 @@ tradedangerous/commands/trade_cmd.py,sha256=o4Xdel5asGY8i6qES95fLHdyfyjKdC5CTOQr
 tradedangerous/commands/update_cmd.py,sha256=4u4j4IZKFQ3yJcSgDXdc4GelmRuCoEMcxsNwGTo1ZsU,2070
 tradedangerous/db/__init__.py,sha256=lT15zI5IaiIVGS5VWD5EY4Xg3gHhwC6nbJo0hTFrb1o,882
 tradedangerous/db/adapter.py,sha256=en1rVsa2vAcsFesEblImg9_qwwHLWIBbDZqtEnDdbJU,7272
-tradedangerous/db/config.py,sha256=PLFXMWS_eB6DN8ik5wZdHyDn66-Ot2ChE8PSDbJbeO4,3217
+tradedangerous/db/config.py,sha256=EFPLwmOokaIomL2jPx0CATZJ4WihIlte_1Piq83yixg,3870
 tradedangerous/db/engine.py,sha256=kJvImzqVpCLwSYtIlvKZ-j70kWoJ1Z0Z064h2JgJWVc,9390
 tradedangerous/db/lifecycle.py,sha256=HnI6PmNm0DvjyrlvchvWKBn354qEl7FFdh7ScW1ivyI,11572
 tradedangerous/db/locks.py,sha256=sBNc5YFpCAxLEGhD6shaHBXJQJlVck9GmU3pg5yc6rk,7896
@@ -75,9 +75,9 @@ tradedangerous/templates/Added.csv,sha256=8o54civQCcS9y7_DBo0GX196XWRbbREQqKDYTK
 tradedangerous/templates/Category.csv,sha256=8xwUDcBZE25T6x6dZGlRUMTCqeDLt3a9LXU5h6hRHV8,250
 tradedangerous/templates/RareItem.csv,sha256=F1RhRnTD82PiwrVUO-ai2ErGH2PTqNnQaDw5mcgljXs,10483
 tradedangerous/templates/TradeDangerous.sql,sha256=pCw2Js8GQniqAWC6N3SL-ujyqlLYCeR2-SI-qhk6VsI,9336
-tradedangerous-12.0.1.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-12.0.1.dist-info/METADATA,sha256=KP4Qmv2jETxUWN_Q-JGyGzQvakCJhQCLbZJ62FmXDl4,4787
-tradedangerous-12.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tradedangerous-12.0.1.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
-tradedangerous-12.0.1.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
-tradedangerous-12.0.1.dist-info/RECORD,,
+tradedangerous-12.0.2.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-12.0.2.dist-info/METADATA,sha256=ErwIIUz3gcGomJRuCso4oWTMeKHqc2BTeV-uszwM5nU,4787
+tradedangerous-12.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tradedangerous-12.0.2.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
+tradedangerous-12.0.2.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
+tradedangerous-12.0.2.dist-info/RECORD,,