tradedangerous 11.0.4__tar.gz → 11.0.6__tar.gz

{tradedangerous-11.0.4/tradedangerous.egg-info → tradedangerous-11.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.0.4
+Version: 11.0.6
 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-11.0.4 → tradedangerous-11.0.6}/setup.py

@@ -30,7 +30,7 @@ setup(name = package,
         install_requires = ["requests", "appJar", "ijson", "rich"],
         setup_requires = ["pytest-runner"],
         tests_require = ["pytest"],
-        packages = ['tradedangerous', 'tradedangerous.commands', 'tradedangerous.mfd', 'tradedangerous.mfd.saitek', 'tradedangerous.misc', 'tradedangerous.plugins'],
+        packages = ['.', 'tradedangerous', 'tradedangerous.commands', 'tradedangerous.mfd', 'tradedangerous.mfd.saitek', 'tradedangerous.misc', 'tradedangerous.plugins'],
         url = "https://github.com/eyeonus/Trade-Dangerous",
         project_urls = {
             "Bug Tracker": "https://github.com/eyeonus/Trade-Dangerous/issues",
@@ -57,8 +57,8 @@ setup(name = package,
         package_data = {"tradedangerous": ["templates/TradeDangerous.sql", "templates/Added.csv", "templates/Category.csv", "templates/RareItem.csv"]},
         entry_points = {
             "console_scripts": [
-                "trade=tradedangerous.trade:main",
-                "tradegui=tradedangerous.tradegui:main"
+                "trade=trade:main",
+                "tradegui=tradegui:main"
             ]
         },
         zip_safe = False

{tradedangerous-11.0.4/tradedangerous → tradedangerous-11.0.6}/trade.py

@@ -33,19 +33,12 @@
 # DEVELOPERS: If you are a programmer who wants TD to do something
 # cool, please see the TradeDB and TradeCalc modules. TD is designed
 # to empower other programmers to do cool stuff.
-from __future__ import annotations
-
 from tradedangerous import cli
 
-import sys
-    
-
-def main(argv: list[tuple] = None) -> None:
-    """ Entry point for the TradeDangerous command-line app. """
-    if argv is None:
-        argv = sys.argv
-    cli.main(argv)
-
+def main(argv = None):
+  import sys
+  cli.main(sys.argv)
 
 if __name__ == "__main__":
-    cli.main(sys.argv)
+  import sys
+  cli.main(sys.argv)

{tradedangerous-11.0.4 → tradedangerous-11.0.6}/tradedangerous/commands/buildcache_cmd.py

@@ -57,11 +57,11 @@ def run(results, cmdenv, tdb: TradeDB):
     if not cmdenv.force:
         if tdb.dbPath.exists():
             raise CommandLineError(
-                "SQLite3 database '{tdb.dbFilename}' already exists.\n"
+                f"SQLite3 database '{tdb.dbFilename}' already exists.\n"
                 "Either remove the file first or use the '-f' option.")
     
     if not tdb.sqlPath.exists():
-        raise CommandLineError("SQL File does not exist: {tdb.sqlFilename}")
+        raise CommandLineError(f"SQL File does not exist: {tdb.sqlFilename}")
     
     buildCache(tdb, cmdenv)
     

{tradedangerous-11.0.4 → tradedangerous-11.0.6}/tradedangerous/jsonprices.py

@@ -1,8 +1,12 @@
-#!/usr/bin/env python3.6
+from tradedangerous import tradedb
+from tradedangerous.tradeexcept import TradeException
 
-import tradedb
-from tradeexcept import TradeException
 import json
+import sys
+
+
+sys.stderr.write("*** WARNING: jsonprices.py is deprecated; if you rely on it, please post a github issue\n")
+
 
 class UnknownSystemError(TradeException):
     def __str__(self):
@@ -12,6 +16,7 @@ class UnknownStationError(TradeException):
     def __str__(self):
         return "Unknown Station: " + ' '.join(self.args)
 
+
 def lookup_system(tdb, tdenv, name, x, y, z):
     try:
         system = tdb.systemByName[name.upper()]
@@ -112,6 +117,13 @@ def load_prices_json(
             blackMarket = '?'
     except KeyError:
         blackMarket = '?'
+
+    try:
+        maxPadSize = stnData['mps'].upper()
+        if maxPadSize not in ['S', 'M', 'L']:
+            maxPadSize = '?'
+    except KeyError:
+        maxPadSize = '?'
     
     system = lookup_system(
             tdb, tdenv,
@@ -139,6 +151,7 @@ def load_prices_json(
             stnName,
             lsFromStar,
             blackMarket,
+            maxPadSize,
             )
     if not station:
         if tdenv.ignoreUnknown:

{tradedangerous-11.0.4 → tradedangerous-11.0.6}/tradedangerous/plugins/eddblink_plug.py

@@ -129,7 +129,6 @@ class ImportPlugin(plugins.ImportPluginBase):
                         "(Useful for updating Vendor tables if they were skipped during a '-O clean' run.)",
         'purge':        "Remove any empty systems that previously had fleet carriers.",
         'solo':         "Don't download crowd-sourced market data. (Implies '-O skipvend', supercedes '-O all', '-O clean', '-O listings'.)",
-        "prices":       "Backup listings to the TradeDangerous.prices cache file",
     }
     
     def __init__(self, tdb, tdenv):
@@ -499,7 +498,7 @@ class ImportPlugin(plugins.ImportPluginBase):
             if self.downloadFile(self.liveListingsPath) or self.getOption("force"):
                 self.importListings(self.liveListingsPath)
         
-        if self.getOption("prices"):
+        if self.getOption("listings"):
             self.tdenv.NOTE("Regenerating .prices file.")
             cache.regeneratePricesFile(self.tdb, self.tdenv)
         

{tradedangerous-11.0.4 → tradedangerous-11.0.6}/tradedangerous/plugins/spansh_plug.py

@@ -294,19 +294,14 @@ class ImportPlugin(plugins.ImportPluginBase):
                     
                     for station, commodities in stations:
                         fq_station_name = f'@{upper_sys}/{station.name}'
-                        if age_cutoff and (now - station.modified) > age_cutoff:
-                            if self.tdenv.detail:
-                                self.print(f'        |  {fq_station_name:50s}  |  Skipping station due to age: {now - station.modified}, ts: {station.modified}')
-                            progress.bump(sys_task)
-                            continue
                         
                         station_info = self.known_stations.get(station.id)
-                        if not station_info:
+                        if not station_info or station.modified > station_info[2]:
                             self.ensure_station(station)
                         elif station_info[1] != station.system_id:
                             self.print(f'        |  {station.name:50s}  |  Megaship station moved, updating system')
                             self.execute("UPDATE Station SET system_id = ? WHERE station_id = ?", station.system_id, station.id, commitable=True)
-                            self.known_stations[station.id] = (station.name, station.system_id)
+                            self.known_stations[station.id] = (station.name, station.system_id, station.modified)
                         
                         items = []
                         db_times = dict(self.execute("SELECT item_id, modified FROM StationItem WHERE station_id = ?", station.id))
@@ -315,12 +310,19 @@ class ImportPlugin(plugins.ImportPluginBase):
                             if commodity.id not in self.known_commodities:
                                 commodity = self.ensure_commodity(commodity)
                             
+                            # We're concerned with the market age, not the station age,
+                            # as they each have their own 'modified' times.
+                            if age_cutoff and (now - commodity.modified) > age_cutoff:
+                                if self.tdenv.detail:
+                                    self.print(f'        |  {fq_station_name:50s}  |  Skipping station due to age: {now - station.modified}, ts: {station.modified}')
+                                break
+                            
                             db_modified = db_times.get(commodity.id)
                             modified = parse_ts(db_modified) if db_modified else None
                             if modified and commodity.modified <= modified:
                                 # All commodities in a station will have the same modified time,
                                 # so no need to check the rest if the fist is older.
-                                if self.tdenv.detail:
+                                if self.tdenv.detail > 2:
                                     self.print(f'        |  {fq_station_name:50s}  |  Skipping older commodity data')
                                 break
                             items.append((station.id, commodity.id, commodity.modified,
@@ -337,8 +339,8 @@ class ImportPlugin(plugins.ImportPluginBase):
                                 ?, ?, ?, ?
                             )""", items, commitable=True)
                             commodity_count += len(items)
-                            # Good time to save data and try to keep the transaction small
-                            self.commit()
+                        # Good time to save data and try to keep the transaction small
+                        self.commit()
                         
                         if commodity_count:
                             station_count += 1
@@ -360,12 +362,6 @@ class ImportPlugin(plugins.ImportPluginBase):
                         progress.update(f"{sys_desc}{DIM} ({total_station_count}:station:, {avg_stations:.1f}per:glowing_star:){CLOSE}")
             
             self.commit()
-            
-            # Need to make sure cached tables are updated, if changes were made
-            # if self.update_cache:
-            #     for table in [ "Item", "Station", "System" ]:
-            #         _, path = csvexport.exportTableToFile( self.tdb, self.tdenv, table )
-            
             self.tdb.close()
             
             # Need to make sure cached tables are updated
@@ -378,6 +374,11 @@ class ImportPlugin(plugins.ImportPluginBase):
                 f'{total_station_count} st  {total_commodity_count} co'
             )
         
+        with Timing() as timing:
+            self.print('Exporting to cache...')
+            cache.regeneratePricesFile(self.tdb, self.tdenv)
+            self.print(f'Cache export completed in {timedelta(seconds=int(timing.elapsed))!s}')
+        
         return False
     
     def data_stream(self):
@@ -445,7 +446,7 @@ class ImportPlugin(plugins.ImportPluginBase):
     def load_known_stations(self) -> dict[int, tuple[str, int]]:
         """ Returns a dictionary of {station_id -> (station_name, system_id)} for all current stations in the database. """
         try:
-            return {cols[0]: (cols[1], cols[2]) for cols in self.cursor.execute('SELECT station_id, name, system_id FROM Station')}
+            return {cols[0]: (cols[1], cols[2], parse_ts(cols[3])) for cols in self.cursor.execute('SELECT station_id, name, system_id, modified FROM Station')}
         except Exception as e:  # pylint: disable=broad-except
             self.print("[purple]:thinking_face:Assuming no station data yet")
             self.tdenv.DEBUG0(f"load_known_stations query raised {e}")
@@ -477,7 +478,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         """ Adds a record for a station, and registers the station in the known_stations dict. """
         self.execute(
             '''
-            INSERT INTO Station (
+            INSERT OR REPLACE INTO Station (
                 system_id, station_id, name,
                 ls_from_star, max_pad_size,
                 market, blackmarket, shipyard, outfitting,
@@ -513,9 +514,10 @@ class ImportPlugin(plugins.ImportPluginBase):
             station.type,
             commitable=True,
         )
+        note = "Updated" if self.known_stations.get(station.id) else "Added"
         if self.tdenv.detail > 1:
-            self.print(f'        |  {station.name:50s}  |  Added missing station')
-        self.known_stations[station.id] = (station.name, station.system_id)
+            self.print(f'        |  {station.name:50s}  |  {note} station')
+        self.known_stations[station.id] = (station.name, station.system_id, station.modified)
     
     def ensure_commodity(self, commodity: Commodity):
         """ Adds a record for a commodity and registers the commodity in the known_commodities dict. """

{tradedangerous-11.0.4 → tradedangerous-11.0.6}/tradedangerous/submit-distances.py

@@ -21,8 +21,8 @@ import sys
 import tradedb
 import tradeenv
 
-from misc.edsc import StarSubmission, StarSubmissionResult, SubmissionError
-from misc.clipboard import SystemNameClip
+from tradedangerous.misc.edsc import StarSubmission, StarSubmissionResult, SubmissionError
+from tradedangerous.misc.clipboard import SystemNameClip
 
 
 standardStars = [
@@ -33,6 +33,10 @@ standardStars = [
     "ASELLUS AUSTRALIS",
 ]
 
+
+sys.stderr.write("*** WARNING: submit-distances.py is deprecated; if you rely on it, please post a github issue\n")
+
+
 ############################################################################
 
 

{tradedangerous-11.0.4 → tradedangerous-11.0.6}/tradedangerous/version.py

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

{tradedangerous-11.0.4 → tradedangerous-11.0.6/tradedangerous.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.0.4
+Version: 11.0.6
 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-11.0.4 → tradedangerous-11.0.6}/tradedangerous.egg-info/SOURCES.txt

@@ -3,6 +3,8 @@ README.md
 pyproject.toml
 setup.cfg
 setup.py
+trade.py
+tradegui.py
 tests/test_bootstrap_commands.py
 tests/test_bootstrap_plugins.py
 tests/test_cache.py
@@ -28,12 +30,10 @@ tradedangerous/mapping.py
 tradedangerous/prices.py
 tradedangerous/submit-distances.py
 tradedangerous/tools.py
-tradedangerous/trade.py
 tradedangerous/tradecalc.py
 tradedangerous/tradedb.py
 tradedangerous/tradeenv.py
 tradedangerous/tradeexcept.py
-tradedangerous/tradegui.py
 tradedangerous/transfers.py
 tradedangerous/utils.py
 tradedangerous/version.py

tradedangerous-11.0.6/tradedangerous.egg-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+trade = trade:main
+tradegui = tradegui:main

{tradedangerous-11.0.4 → tradedangerous-11.0.6}/tradedangerous.egg-info/top_level.txt

@@ -1 +1,2 @@
+
 tradedangerous

tradedangerous-11.0.4/tradedangerous.egg-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-trade = tradedangerous.trade:main
-tradegui = tradedangerous.tradegui:main