tradedangerous 11.5.0__py3-none-any.whl → 11.5.2__py3-none-any.whl

tradedangerous/commands/commandenv.py

@@ -1,3 +1,5 @@
+import sqlite3
+
 from .exceptions import (
     CommandLineError, FleetCarrierError, OdysseyError,
     PadSizeError, PlanetaryError,
@@ -72,11 +74,13 @@ class CommandEnv(TradeEnv):
         self.tdb = tdb
         db_change = pathlib.Path(self.tdb.templatePath, 'database_changes.json')
         if pathlib.Path.exists(db_change):
-            import ijson
-            with open(db_change) as file:
-                for change in ijson.items(file, 'item'):
-                    self.tdb.getDB().execute(change)
-            db_change.unlink()
+            try:
+                import ijson
+                with open(db_change) as file:
+                    for change in ijson.items(file, 'item'):
+                        self.tdb.getDB().execute(change)
+            finally:
+                db_change.unlink()
         
         self.checkMFD()
         self.checkFromToNear()

tradedangerous/plugins/spansh_plug.py

@@ -4,16 +4,18 @@ from __future__ import annotations
 from collections import namedtuple
 from contextlib import contextmanager
 from datetime import datetime, timedelta
+from email.utils import parsedate_to_datetime
 from pathlib import Path
 from rich.progress import Progress
 
 from .. import plugins, cache, transfers, csvexport, corrections
 
+import os
+import requests
 import sqlite3
 import sys
 import time
 import typing
-
 import ijson
 
 if sys.version_info.major == 3 and sys.version_info.minor >= 10:
@@ -277,14 +279,32 @@ class ImportPlugin(plugins.ImportPluginBase):
         
         theme = self.tdenv.theme
         BOLD, CLOSE, DIM, ITALIC = theme.bold, theme.CLOSE, theme.dim, theme.italic  # pylint: disable=invalid-name
-        # TODO: don't download file if local copy is not older
-        # see eddblink_plug.download_file()
         if not self.file:
             url = self.url or SOURCE_URL
-            self.print(f'Downloading prices from remote URL: {url}')
+            local_mod_time = 0
             self.file = Path(self.tdenv.tmpDir, "galaxy_stations.json")
-            transfers.download(self.tdenv, url, self.file)
-            self.print(f'Download complete, saved to local file: "{self.file}"')
+            if self.file.exists():
+                local_mod_time = self.file.stat().st_mtime
+            
+            headers = {"User-Agent": "Trade-Dangerous", "Accept-Encoding": "identity"}
+            try:
+                response = requests.head(url, headers=headers, timeout=70)
+            except Exception as e:  # pylint: disable=broad-exception-caught
+                self.tdenv.WARN("Problem with download:\n    URL: {}\n    Error: {}", url, str(e))
+                return False
+            last_modified = response.headers.get("last-modified")
+            dump_mod_time = parsedate_to_datetime(last_modified).timestamp()
+            if local_mod_time < dump_mod_time:
+                if self.file.exists():
+                    self.file.unlink()
+                self.print(f'Downloading prices from remote URL: {url}')
+                try:
+                    transfers.download(self.tdenv, url, self.file)
+                except Exception as e:  # pylint: disable=broad-exception-caught
+                    self.tdenv.WARN("Problem with download:\n    URL: {}\n    Error: {}", url, str(e))
+                    return False
+                self.print(f'Download complete, saved to local file: "{self.file}"')
+                os.utime(self.file, (dump_mod_time, dump_mod_time))
         
         sys_desc = f"Importing {ITALIC}spansh{CLOSE} data"
         

tradedangerous/version.py

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

{tradedangerous-11.5.0.dist-info → tradedangerous-11.5.2.dist-info}/METADATA

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

@@ -21,12 +21,12 @@ tradedangerous/tradeenv.py,sha256=aIeK291Ene98kaEEu1LvlJ4KT4EvPfIXlT4IfZnpVc0,11
 tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk,368
 tradedangerous/transfers.py,sha256=t_0Sjr4FI9lhIPwyPOXdR8d97bE611ujbKK4ioWShm0,6024
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=NMsHLdL8hA7iAFucNiKOx8yn15j7n8falWI0neiBfeI,646
+tradedangerous/version.py,sha256=fz4ryPywxoVGOSsaRzrb_isVjrC3EkOFzHQj6J5dLCo,646
 tradedangerous/commands/TEMPLATE.py,sha256=MOE69xsZPHPIMBQ-LXicfsOlCZdy-2gPX_nlnwYYil8,2026
 tradedangerous/commands/__init__.py,sha256=3gz2cnXNZNkV1gtZh0dOnCRxBkQHbeIyysRe3bM2WEE,9516
 tradedangerous/commands/buildcache_cmd.py,sha256=jhNSqHX_xX43SiSUMFiKtWpB9v4oeZ0sqfNq6DCrjUs,2181
 tradedangerous/commands/buy_cmd.py,sha256=qgOBTzCvcYgLOcdkx7BpqF-rSs6GFjOL_f3Gzutmx1I,13947
-tradedangerous/commands/commandenv.py,sha256=kw1FDkxDvJMaui92gWYHv8bNWsxxn5xHXCjmHGFeGUM,9794
+tradedangerous/commands/commandenv.py,sha256=72hEqaZzUBsTiYzkJrGP6Z1EN7WyvyZrKHxlRQNp--4,9868
 tradedangerous/commands/exceptions.py,sha256=sisGoBvOpt25TYWWjp-s-k_--O_nZe5Zd9HhAW3SElA,3487
 tradedangerous/commands/export_cmd.py,sha256=VfxwrNU_TzrSw71KrmtmXKYCBkpDGr5KRLGPXOBewnI,4405
 tradedangerous/commands/import_cmd.py,sha256=PKMrO1DhOGkqAn_q9vZBxhogpFL5MHp2JyYb4qiBdq0,5633
@@ -66,15 +66,15 @@ tradedangerous/plugins/eddblink_plug.py,sha256=dyVaQhpElq7ceLD0bJhVeuiZoMu8Jdo3Y
 tradedangerous/plugins/edmc_batch_plug.py,sha256=rrP_lFFxWsba8DPEo0WF2EdCiMoRC7tCT8z62MIvtIo,4173
 tradedangerous/plugins/journal_plug.py,sha256=5HMyoxQ7z42qj7NiL8rDxSyTN9gKikoQjyWzJLD-SYQ,23746
 tradedangerous/plugins/netlog_plug.py,sha256=yUl47l9xt3kGj9oSiY_FZaDGdnQj63oa9MBtSeIy1Zo,13469
-tradedangerous/plugins/spansh_plug.py,sha256=y7-yedZdGbKpliHQucz48SlggzPfVJOV_MjX5QkSdA4,36952
+tradedangerous/plugins/spansh_plug.py,sha256=PXFarH_i0QASrIoTpkYjq27ZgeRqGSH9sac5OqYLMLU,38028
 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=XJ0T09OiS9UdYKJXXAG-rCe6T_ua4MU-icb2lD7iEz0,9342
 tradedangerous/templates/database_changes.json,sha256=-KszgXhUUhwI7FRPDxnkV3bv9paXGpTgnUZxZN7i5OA,371
-tradedangerous-11.5.0.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-11.5.0.dist-info/METADATA,sha256=qRJG-26PAjw7DiDR3HhJaGC0sj0bzvLGpuO1B5q8MLk,4435
-tradedangerous-11.5.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-11.5.0.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
-tradedangerous-11.5.0.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
-tradedangerous-11.5.0.dist-info/RECORD,,
+tradedangerous-11.5.2.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-11.5.2.dist-info/METADATA,sha256=ipZGrNpBEb6tAX_4qQjGNYtEf-ZDd0wvhv8hr8UUu94,4435
+tradedangerous-11.5.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-11.5.2.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
+tradedangerous-11.5.2.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
+tradedangerous-11.5.2.dist-info/RECORD,,