tradedangerous 10.16.4__tar.gz → 10.16.6__tar.gz

{tradedangerous-10.16.4 → tradedangerous-10.16.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 10.16.4
+Version: 10.16.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-10.16.4 → tradedangerous-10.16.6}/tradedangerous/plugins/spansh_plug.py

@@ -9,7 +9,7 @@ import requests
 import simdjson
 import sqlite3
 
-from .. import plugins, cache, fs, transfers, csvexport
+from .. import plugins, cache, fs, transfers, csvexport, corrections
 
 SOURCE_URL = 'https://downloads.spansh.co.uk/galaxy_stations.json'
 
@@ -154,9 +154,11 @@ class ImportPlugin(plugins.ImportPluginBase):
                                         station.id, commodity.id, ).fetchone()
                         modified = parse_ts(result[0]) if result else None
                         if modified and commodity.modified <= modified:
-                            if self.tdenv.detail > 2:
-                                self.print(f'        |  {commodity.name:50s}  |  Skipping older commodity data')
-                            continue
+                            # 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:
+                                self.print(f'        |  {fq_station_name:50s}  |  Skipping older commodity data')
+                            break
                         items.append((station.id, commodity.id, commodity.modified,
                             commodity.sell, commodity.demand, -1,
                             commodity.buy, commodity.supply, -1, 0))
@@ -191,15 +193,17 @@ class ImportPlugin(plugins.ImportPluginBase):
                     #             modified=commodity.modified,
                     #         ))
                     #         commodity_count += 1
-                    station_count += 1
-                system_count += 1
-                total_station_count += station_count
-                total_commodity_count += commodity_count
-                if self.tdenv.detail:
-                    self.print(
-                        f'{system_count:6d}  |  {system.name.upper():50s}  |  '
-                        f'{station_count:3d} st  {commodity_count:6d} co'
-                    )
+                    if commodity_count:
+                        station_count += 1
+                if station_count:
+                    system_count += 1
+                    total_station_count += station_count
+                    total_commodity_count += commodity_count
+                    if self.tdenv.detail:
+                        self.print(
+                            f'{system_count:6d}  |  {system.name.upper():50s}  |  '
+                            f'{station_count:3d} st  {commodity_count:6d} co'
+                        )
                 # self.execute('COMMIT')
                 # if self.need_commit:
                 #     self.execute('COMMIT')
@@ -399,7 +403,7 @@ class ImportPlugin(plugins.ImportPluginBase):
             ''',
             commodity.id,
             commodity.category.upper(),
-            commodity.name,
+            corrections.correctItem(commodity.name),
             commodity.id,
         )
         
@@ -411,7 +415,7 @@ class ImportPlugin(plugins.ImportPluginBase):
                         """)
         cat_id = 0
         ui_order = 1
-        self.tdenv.DEBUG0("Adding ui_order data to items.")
+        self.tdenv.DEBUG0("Updating ui_order data for items.")
         for line in temp:
             if line[1] != cat_id:
                 ui_order = 1

{tradedangerous-10.16.4 → tradedangerous-10.16.6}/tradedangerous/version.py

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

{tradedangerous-10.16.4 → tradedangerous-10.16.6}/tradedangerous.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 10.16.4
+Version: 10.16.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