tradedangerous 10.16.5__py3-none-any.whl → 10.16.6__py3-none-any.whl

tradedangerous/plugins/spansh_plug.py

@@ -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')

tradedangerous/version.py

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

{tradedangerous-10.16.5.dist-info → tradedangerous-10.16.6.dist-info}/METADATA

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

@@ -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=sQh4u9prPaBYuj_06ckAx_U_4KlIAU8RW8YtykXe2M8,647
+tradedangerous/version.py,sha256=5s268cPYzpwQ4v3OZauXXP9_buUYL3VALOWd0TzfSaI,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=CaczfCLKyRNbGh3xecBI0qLp0dz-xpnZ2
 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=5-C431UsscuwT-IQ6Cd_2HV3SqSv9X_VGRX_uhe4Ly0,21529
+tradedangerous/plugins/spansh_plug.py,sha256=FSdmBAxpLxud2tmEvY3zhCPXwMRi66DCb0HYhC_up2w,21807
 tradedangerous/templates/Added.csv,sha256=8o54civQCcS9y7_DBo0GX196XWRbbREQqKDYTKibsgQ,649
 tradedangerous/templates/Category.csv,sha256=8xwUDcBZE25T6x6dZGlRUMTCqeDLt3a9LXU5h6hRHV8,250
 tradedangerous/templates/RareItem.csv,sha256=F1RhRnTD82PiwrVUO-ai2ErGH2PTqNnQaDw5mcgljXs,10483
 tradedangerous/templates/TradeDangerous.sql,sha256=kHZ7JBSY5lh2DnqayAxoO-apvXKB510SqhAzkT21YHY,8138
-tradedangerous-10.16.5.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-10.16.5.dist-info/METADATA,sha256=RA4JVWEmSFk1Bxt4LKRbj5_wKLnFqZErE37KqjiD5M4,4421
-tradedangerous-10.16.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-10.16.5.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
-tradedangerous-10.16.5.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
-tradedangerous-10.16.5.dist-info/RECORD,,
+tradedangerous-10.16.6.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-10.16.6.dist-info/METADATA,sha256=PCMBreEgsWuXi1Q23vgORjlqifTXV40s2mn4L4szbzw,4421
+tradedangerous-10.16.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-10.16.6.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
+tradedangerous-10.16.6.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
+tradedangerous-10.16.6.dist-info/RECORD,,