tradedangerous 12.0.9__py3-none-any.whl → 12.0.11__py3-none-any.whl

tradedangerous/db/utils.py

@@ -264,7 +264,7 @@ def sqlite_upsert_modified(
     set_map[modified_col] = getattr(excluded, modified_col)
 
     # WHERE guard: only update if incoming is newer (or DB NULL)
-    where_guard = (getattr(excluded, modified_col) > getattr(table.c, modified_col)) | (
+    where_guard = (getattr(excluded, modified_col) >= getattr(table.c, modified_col)) | (
         getattr(table.c, modified_col).is_(None)
     )
 
@@ -348,7 +348,7 @@ def mysql_upsert_modified(
     inserted = ins.inserted  # alias to VALUES()/INSERTED
 
     # Guard: newer incoming timestamp or DB is NULL
-    guard = (inserted[modified_col] > table.c[modified_col]) | (table.c[modified_col].is_(None))
+    guard = (inserted[modified_col] >= table.c[modified_col]) | (table.c[modified_col].is_(None))
 
     # For each update col, write: IF(guard, inserted.col, table.col)
     set_map = {
@@ -545,7 +545,7 @@ def age_in_days(session, column: ClauseElement) -> ClauseElement:
 
     if dialect == "sqlite":
         # julianday() returns a fractional day difference (FLOAT).
-        return func.julianday(func.current_date()) - func.julianday(column)
+        return func.julianday() - func.julianday(column)
 
     if dialect in ("mysql", "mariadb"):
         # TIMESTAMPDIFF returns an integer number of DAY boundaries crossed.

tradedangerous/tradedb.py

@@ -591,6 +591,7 @@ class TradeDB:
         ('UpgradeVendor.csv', 'UpgradeVendor'),
         ('Category.csv', 'Category'),
         ('Item.csv', 'Item'),
+        ('StationItem.csv', 'StationItem'),
         ('RareItem.csv', 'RareItem'),
         ('FDevShipyard.csv', 'FDevShipyard'),
         ('FDevOutfitting.csv', 'FDevOutfitting'),

tradedangerous/version.py

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

{tradedangerous-12.0.9.dist-info → tradedangerous-12.0.11.dist-info}/METADATA

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

@@ -15,12 +15,12 @@ tradedangerous/prices.py,sha256=Ksudbz35MaMXIAdreHANklepjMkXiGO5AGjkLSoV1s4,7006
 tradedangerous/submit-distances.py,sha256=m1qAuqH_yq8euMSWSqkmkTNM4a136Vl5WrGmTk15LiM,11745
 tradedangerous/tools.py,sha256=pp-4WtA12SVaaQHFJFOMTF7EDFRCU2mQeOhC4xoXmEk,1331
 tradedangerous/tradecalc.py,sha256=5vhH0f73uqUHwE4ZmqCzpY3VyhGaQCKRdfxmJz4MTTA,46087
-tradedangerous/tradedb.py,sha256=s1ZFK1ZmJz1_EBdIBdW0IBeWNoT-UP0j1JhBxIFQvws,79215
+tradedangerous/tradedb.py,sha256=pdoPFuG3UvpfFsOtsTPX-LECj8BsyVVKZCy0w2Bcqu4,79259
 tradedangerous/tradeenv.py,sha256=FrKAqFQQO5N0jrld9Ie1Tw23PoXxVBpA85n9RyEw2xg,12338
 tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk,368
 tradedangerous/transfers.py,sha256=mx5bidC8g67ShP3G-1IoWcXjDgMOHH35Kw6qUROcP4Y,6363
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=QSHsJXXAtwQhEyY53VcLRqfgZQ9vro-qh7HCoUtQgAg,646
+tradedangerous/version.py,sha256=1Y6CdON-tJttNFSMtDitmwFY4JoGYpwKsxH01JRJJi0,647
 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=WwDRLcVGCWZSM9x2jKpXXj2QRt5RLkvrcHzmZ8UCI_s,3346
@@ -49,7 +49,7 @@ tradedangerous/db/lifecycle.py,sha256=0geThWBjWnJbTSNpxzZ4C5_mya4kO5TsRkLLKt-cXd
 tradedangerous/db/locks.py,sha256=sBNc5YFpCAxLEGhD6shaHBXJQJlVck9GmU3pg5yc6rk,7896
 tradedangerous/db/orm_models.py,sha256=ZvPlzA3Xjb4XwyPYOKA7vF7atNmkA6q1SVwDbATphnM,15796
 tradedangerous/db/paths.py,sha256=sqFiT4dM6Cwyz1yxeGrr6mon9xppaCOZDBu77wJi_Q8,3817
-tradedangerous/db/utils.py,sha256=vka8mFUzVi2UF56NyXn9mL7Pa28DLV7O99Kjshog1vg,24333
+tradedangerous/db/utils.py,sha256=rcFX2rdX14ElaoCummuZITTllufjeB-kESbLosI4MpQ,24316
 tradedangerous/mfd/__init__.py,sha256=g8pT9Ev_le_yOeAF7sr9fUuEi8VW3u9n_qq-xLga1xw,2958
 tradedangerous/mfd/saitek/__init__.py,sha256=CGgkAik87Kb5uc43G0bBFueD47bb_BydDM8qb7YQLyA,62
 tradedangerous/mfd/saitek/directoutput.py,sha256=ReBzax7ttoffzH8DLXx0AS2RFLLQWOQUw1ESQUjOMGk,24840
@@ -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.9.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-12.0.9.dist-info/METADATA,sha256=fDupwTo4uUzCHwVZ5vWiMBfyXlUqP0uoD5nr1bUfKis,4873
-tradedangerous-12.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tradedangerous-12.0.9.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
-tradedangerous-12.0.9.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
-tradedangerous-12.0.9.dist-info/RECORD,,
+tradedangerous-12.0.11.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-12.0.11.dist-info/METADATA,sha256=DcfNEZKqGUR7iDv2aPlFtJcfcSwLmMYBnpauzKkcPKE,4874
+tradedangerous-12.0.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tradedangerous-12.0.11.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
+tradedangerous-12.0.11.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
+tradedangerous-12.0.11.dist-info/RECORD,,