tradedangerous 10.14.4__py3-none-any.whl → 10.15.1__py3-none-any.whl

tradedangerous/cache.py

@@ -632,17 +632,34 @@ def processPricesFile(tdenv, db, pricesPath, pricesFh = None, defaultZero = Fals
     removedItems = len(zeros)
     
     if items:
-        db.executemany("""
-            INSERT OR REPLACE INTO StationItem (
-                station_id, item_id, modified,
-                demand_price, demand_units, demand_level,
-                supply_price, supply_units, supply_level
-            ) VALUES (
-                ?, ?, IFNULL(?, CURRENT_TIMESTAMP),
-                ?, ?, ?,
-                ?, ?, ?
-            )
-        """, items)
+        for item in items:
+            try:
+                db.execute("""
+                    INSERT OR REPLACE INTO StationItem (
+                        station_id, item_id, modified,
+                        demand_price, demand_units, demand_level,
+                        supply_price, supply_units, supply_level
+                    ) VALUES (
+                        ?, ?, IFNULL(?, CURRENT_TIMESTAMP),
+                        ?, ?, ?,
+                        ?, ?, ?
+                    )
+                """, item)
+            except sqlite3.IntegrityError as e:
+                print(e)
+                print(item)
+                raise e
+        # db.executemany("""
+        #     INSERT OR REPLACE INTO StationItem (
+        #         station_id, item_id, modified,
+        #         demand_price, demand_units, demand_level,
+        #         supply_price, supply_units, supply_level
+        #     ) VALUES (
+        #         ?, ?, IFNULL(?, CURRENT_TIMESTAMP),
+        #         ?, ?, ?,
+        #         ?, ?, ?
+        #     )
+        # """, items)
     updatedItems = len(items)
     
     tdenv.DEBUG0("Marking populated stations as having a market")
@@ -654,6 +671,7 @@ def processPricesFile(tdenv, db, pricesPath, pricesFh = None, defaultZero = Fals
              ")"
     )
     
+    tdenv.DEBUG0(f'Committing...')
     db.commit()
     
     changes = " and ".join("{} {}".format(v, k) for k, v in {

tradedangerous/plugins/spansh_plug.py

@@ -55,6 +55,7 @@ class ImportPlugin(plugins.ImportPluginBase):
     pluginOptions = {
         'url':  f'URL to download galaxy data from (defaults to {SOURCE_URL})',
         'file': 'Local filename to import galaxy data from; use "-" to load from stdin',
+        'maxage': 'Skip all entries older than specified age in days, ex.: maxage=1.5',
         'listener': 'For use by TD-listener, prevents updating cache from generated prices file',
     }
 
@@ -62,6 +63,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         super().__init__(*args, **kwargs)
         self.url = self.getOption('url')
         self.file = self.getOption('file')
+        self.maxage = float(self.getOption('maxage'))
         self.listener = self.getOption('listener')
         assert not (self.url and self.file), 'Provide either url or file, not both'
         if self.file and (self.file != '-'):
@@ -104,8 +106,12 @@ class ImportPlugin(plugins.ImportPluginBase):
                 station_count = 0
                 commodity_count = 0
                 for station, commodities in stations:
+                    fq_station_name = f'@{system.name.upper()}/{station.name}'
+                    if (datetime.now() - station.modified) > timedelta(days=self.maxage):
+                        if self.tdenv.detail >= 1:
+                            self.print(f'        |  @{fq_station_name:50s}  |  Skipping station due to age: {datetime.now() - station.modified}, ts: {station.modified}')
+                        continue
                     if (system.name.upper(), station.name.upper()) in seen_stations:
-                        fq_station_name = f'@{system.name.upper()}/{station.name}'
                         if self.tdenv.detail >= 1:
                             self.print(f'        |  {fq_station_name:50s}  |  Skipping duplicate station record')
                         continue
@@ -183,15 +189,15 @@ class ImportPlugin(plugins.ImportPluginBase):
         return categories
 
     def execute(self, query, *params, **kwparams):
-        attempts = 5
+        # attempts = 5
         cursor = self.tdb.getDB().cursor()
         while True:
             try:
                 return cursor.execute(query, params or kwparams)
             except sqlite3.OperationalError as ex:
-                if not attempts:
-                    raise
-                attempts -= 1
+                # if not attempts:
+                #     raise
+                # attempts -= 1
                 self.print(f'Retrying query: {ex!s}')
                 time.sleep(1)
 

tradedangerous/version.py

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

{tradedangerous-10.14.4.dist-info → tradedangerous-10.15.1.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 tradedangerous/__init__.py,sha256=5ZeypoZaM8hlh6c-yTkD8x5hZYP8q3Q8a3bVeicHr90,1122
-tradedangerous/cache.py,sha256=t9--q6etNH5vigvA_1VLf_XTdoC_116qkjnqswhshpg,32942
+tradedangerous/cache.py,sha256=R-QTud9KwrRKbe-sVHDHXYZQblkXKuKxK1nYegM90BA,33647
 tradedangerous/cli.py,sha256=ycGkzMszwpP9OrngFIyhQbYoZ2wzRhJMTDCW1YhLrNI,4727
 tradedangerous/corrections.py,sha256=QMs-7MKLw2imFgIHthnwcpqWT1yJTb3CrABJw9LaKLA,1441
 tradedangerous/csvexport.py,sha256=OcOKe_VIgafw6rCvG3k5tM11KwwoYXMNY5DSSfCC0mU,8705
@@ -21,7 +21,7 @@ tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk
 tradedangerous/tradegui.py,sha256=JbGFnsWupgesk6hrcUgKSdD9NNDyo0U9gh6m3DccAwU,782
 tradedangerous/transfers.py,sha256=NmXXk2aF88YkAvYqc9Syt_aO6d2jJjC-OxoRFoOyQH4,9923
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=3i41isl-Ux4yWjmzBWSkr9jKVz1mULwKmJQ0ZUkbUYg,647
+tradedangerous/version.py,sha256=M9o3Tu_24MsgIHunLoBWoFvA4fOOo8cRR-09sJe9q-Q,647
 tradedangerous/commands/TEMPLATE.py,sha256=7oXL124aqxGHwnb0h9yRylUiwc6M5QrRrGVrubwI1gg,2124
 tradedangerous/commands/__init__.py,sha256=6B0WuqkFBOll5Hj67yKDAnhmyr5ZAnHc6nzUNEUh384,9640
 tradedangerous/commands/buildcache_cmd.py,sha256=oJvP06fA8svnHrfrpWkHKR16cba8GIhHdMOyZqds18Y,2332
@@ -66,14 +66,14 @@ tradedangerous/plugins/eddblink_plug.py,sha256=n8AzLh2pJdHdar1SnqSSjCwWPl4f-OKQ8
 tradedangerous/plugins/edmc_batch_plug.py,sha256=3Ptr-SZqaZFR8ViIIrp9Ak7rvfU3zl11AZYBhIceN7s,4224
 tradedangerous/plugins/journal_plug.py,sha256=K1oIeI7E3mb04fvYLXyoAh7fOTyM9NBelibTI88MIDQ,23696
 tradedangerous/plugins/netlog_plug.py,sha256=Gw_HSZWpN17D--OIYEM3Vo8y9SvDOv9UwAUfY24kz28,13460
-tradedangerous/plugins/spansh_plug.py,sha256=vru5Mypzh07K8Xkbh1RMzDxhYt_uJFZD9zHAfzi7XFU,15393
+tradedangerous/plugins/spansh_plug.py,sha256=BpgovN9Qhalot9NTi6OR4bqxrN3QsK1NxEK1j1GsyS0,15883
 tradedangerous/templates/Added.csv,sha256=8o54civQCcS9y7_DBo0GX196XWRbbREQqKDYTKibsgQ,649
 tradedangerous/templates/DefaultShipIndex.json,sha256=m5cI3vkKiqRk1VKO1Z_8LZrG9nczV0PUMDfBSt4-1RM,94739
 tradedangerous/templates/RareItem.csv,sha256=F1RhRnTD82PiwrVUO-ai2ErGH2PTqNnQaDw5mcgljXs,10483
 tradedangerous/templates/TradeDangerous.sql,sha256=6sjEogGHy-9zYpjPo0Y2a5tElowmHFyJNwrimOUBfHk,8079
-tradedangerous-10.14.4.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-10.14.4.dist-info/METADATA,sha256=g55fWxci045Ee1ZYkv_DWTtJ2Kuw6Pj2ccQQDEzH1e8,4421
-tradedangerous-10.14.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-10.14.4.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
-tradedangerous-10.14.4.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
-tradedangerous-10.14.4.dist-info/RECORD,,
+tradedangerous-10.15.1.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-10.15.1.dist-info/METADATA,sha256=MRj-aL34og1_STMii3oOxFxBRv9_wqdDzFMcN7Oc_m0,4421
+tradedangerous-10.15.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-10.15.1.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
+tradedangerous-10.15.1.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
+tradedangerous-10.15.1.dist-info/RECORD,,