tradedangerous 10.15.0__py3-none-any.whl → 10.15.2__py3-none-any.whl

tradedangerous/cache.py

@@ -548,17 +548,18 @@ def processPrices(tdenv, priceFile, db, defaultZero):
         
         processedItems[itemID] = lineNo
     
+    space_cleanup = re.compile(r'\s{2,}').sub
     for line in priceFile:
         lineNo += 1
         text, _, comment = line.partition('#')
-        text = text.strip()
+        text = space_cleanup(line, ' ').strip()
         if not text:
             continue
         
-        # replace whitespace with single spaces
-        if text.find("  "):
-            # http://stackoverflow.com/questions/2077897
-            text = ' '.join(text.split())
+        # # replace whitespace with single spaces
+        # if text.find("  "):
+        #     # http://stackoverflow.com/questions/2077897
+        #     text = ' '.join(text.split())
         
         ########################################
         # ## "@ STAR/Station" lines.

tradedangerous/plugins/spansh_plug.py

@@ -9,7 +9,7 @@ import requests
 import simdjson
 import sqlite3
 
-from .. import plugins, cache, fs, transfers
+from .. import plugins, cache, fs, transfers, csvexport
 
 SOURCE_URL = 'https://downloads.spansh.co.uk/galaxy_stations.json'
 
@@ -63,7 +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.maxage = float(self.getOption('maxage')) if self.getOption('maxage') else None
         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 != '-'):
@@ -100,18 +100,19 @@ class ImportPlugin(plugins.ImportPluginBase):
             total_station_count = 0
             total_commodity_count = 0
             self.need_commit = False
+            self.update_cache = False
             seen_stations = set()
             for system, stations in self.data_stream():
                 self.ensure_system(system)
                 station_count = 0
                 commodity_count = 0
                 for station, commodities in stations:
-                    if (datetime.now() - station.modified) > timedelta(days=self.maxage):
+                    fq_station_name = f'@{system.name.upper()}/{station.name}'
+                    if self.maxage and (datetime.now() - station.modified) > timedelta(days=self.maxage):
                         if self.tdenv.detail >= 1:
-                            self.print(f'        |  @{system.name.upper()}/{station.name.upper():50s}  |  Skipping station due to age: {datetime.now() - station.modified}, ts: {station.modified}')
+                            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
@@ -148,6 +149,13 @@ class ImportPlugin(plugins.ImportPluginBase):
                 if self.need_commit:
                     self.execute('COMMIT')
                     self.need_commit = False
+                    self.update_cache = True
+                    
+            # 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.print(
                 f'{timedelta(seconds=int(timing.elapsed))!s}  Done  '
                 f'{total_station_count} st  {total_commodity_count} co'
@@ -198,7 +206,7 @@ class ImportPlugin(plugins.ImportPluginBase):
                 # if not attempts:
                 #     raise
                 # attempts -= 1
-                self.print(f'Retrying query: {ex!s}')
+                self.print(f'Retrying query \'{query}\': {ex!s}')
                 time.sleep(1)
 
     def load_known_space(self):
@@ -296,13 +304,35 @@ class ImportPlugin(plugins.ImportPluginBase):
             return commodity
         self.execute(
             '''
-            INSERT INTO Item (category_id, name, fdev_id)
-            VALUES ((SELECT category_id FROM Category WHERE upper(name) = ?), ?, ?)
+            INSERT INTO Item (item_id, category_id, name, fdev_id)
+            VALUES (?, (SELECT category_id FROM Category WHERE upper(name) = ?), ?, ?)
             ''',
+            commodity.id,
             commodity.category.upper(),
             commodity.name,
             commodity.id,
         )
+        
+        # Need to update ui_order
+        temp = self.execute("""SELECT
+                        name, category_id, fdev_id
+                        FROM Item
+                        ORDER BY category_id, name
+                        """)
+        cat_id = 0
+        ui_order = 1
+        self.tdenv.DEBUG0("Adding ui_order data to items.")
+        for line in temp:
+            if line[1] != cat_id:
+                ui_order = 1
+                cat_id = line[1]
+            else:
+                ui_order += 1
+            self.execute("""UPDATE Item
+                        set ui_order = ?
+                        WHERE fdev_id = ?""",
+                        ui_order, line[2],)                    
+        
         self.need_commit = True
         if self.tdenv.detail >= 2:
             self.print(f'        |  {commodity.name:50s}  |  Added missing commodity')

tradedangerous/version.py

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

{tradedangerous-10.15.0.dist-info → tradedangerous-10.15.2.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 tradedangerous/__init__.py,sha256=5ZeypoZaM8hlh6c-yTkD8x5hZYP8q3Q8a3bVeicHr90,1122
-tradedangerous/cache.py,sha256=R-QTud9KwrRKbe-sVHDHXYZQblkXKuKxK1nYegM90BA,33647
+tradedangerous/cache.py,sha256=Zt1Mkf5h4tSFdxUV8mpe5v-LTOHLuSlVwuL4aq06fXQ,33721
 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=HvTZZF5gQzfcRfEd7T27CYhdQFzmH1fwqUuu3623Bh0,647
+tradedangerous/version.py,sha256=8Ar6G_NOScaKIeRlxzF9L9L6TzUEwTmHyrzuUBkS3mU,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=VBq0hl8p8x4HVIATpEFnCcj3gNPP5ilxdpZbitz71Mg,15914
+tradedangerous/plugins/spansh_plug.py,sha256=6gTCln2vKnU2AIF5FsuAP0-ZP2a2tFMJnYkR_FElAVQ,17095
 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.15.0.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-10.15.0.dist-info/METADATA,sha256=8Y24VwY_h_KlhtqxWs1qRVcmM6HdawZdF6vCPEJhp-I,4421
-tradedangerous-10.15.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-10.15.0.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
-tradedangerous-10.15.0.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
-tradedangerous-10.15.0.dist-info/RECORD,,
+tradedangerous-10.15.2.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-10.15.2.dist-info/METADATA,sha256=u2wFl6SsgCIi4JpYjoAbw-yNgEUNP77UgKCanjyck9E,4421
+tradedangerous-10.15.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-10.15.2.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
+tradedangerous-10.15.2.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
+tradedangerous-10.15.2.dist-info/RECORD,,