tradedangerous 11.5.1__py3-none-any.whl → 11.5.3__py3-none-any.whl

tradedangerous/commands/import_cmd.py

@@ -25,9 +25,9 @@ help = (
 name = 'import'
 epilog = (
     "This sub-command provides a plugin infrastructure, and comes "
-    "with a module to import data from Maddavo's Market Share "
-    "(http://www.davek.com.au/td/).\n"
-    "See \"import -P maddavo -O help\" for more help."
+    "with a module to import data from Tromador's Trading Dangerously server"
+    "(https://elite.tromador.com/).\n"
+    "See \"trade import -P eddblink -O help\" for more help."
 )
 wantsTradeDB = False
 arguments = [

tradedangerous/plugins/eddblink_plug.py

@@ -69,7 +69,8 @@ def _collect_station_modified_times(tdenv: TradeEnv, db: sqlite3.Cursor) -> dict
 
 class ImportPlugin(plugins.ImportPluginBase):
     """
-    Plugin that downloads data from eddb.
+    Import plugin that uses data files from
+    https://elite.tromador.com/ to update the Database.
     """
     pluginOptions = {
         'item':         "Update Items using latest file from server. (Implies '-O system,station')",

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.1'
+__version__ = '11.5.3'
 

{tradedangerous-11.5.1.dist-info → tradedangerous-11.5.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: tradedangerous
-Version: 11.5.1
+Version: 11.5.3
 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
@@ -23,6 +23,17 @@ Requires-Dist: requests
 Requires-Dist: appJar
 Requires-Dist: ijson
 Requires-Dist: rich
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: summary
 
 
 ----------

{tradedangerous-11.5.1.dist-info → tradedangerous-11.5.3.dist-info}/RECORD

@@ -21,7 +21,7 @@ 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=2l-1rl3V6vbIVm-7o42LmVsvK3wJUU0uWAuL58dbpHM,646
+tradedangerous/version.py,sha256=zRa68iWjzmvpmz4IBsUJcKlNaDnryOab6peG9xB5FHI,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
@@ -29,7 +29,7 @@ tradedangerous/commands/buy_cmd.py,sha256=qgOBTzCvcYgLOcdkx7BpqF-rSs6GFjOL_f3Gzu
 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
+tradedangerous/commands/import_cmd.py,sha256=czbfBR0H1jTGX67b38BxiFi77EB8COM8ImztP7yPdzo,5654
 tradedangerous/commands/local_cmd.py,sha256=tf7YMGX-vaVGNO2lvQF9EvQEN3Wj7DE9-NTSVrtaZx0,8392
 tradedangerous/commands/market_cmd.py,sha256=Ig16zDuksywiiF3Exps6UuM-ZhqgbXqkW6Lu2s9xQf0,5411
 tradedangerous/commands/nav_cmd.py,sha256=v245L1MxiUliITUgvWeeB4cL4UdkNO8n0CiP6ztrV54,8460
@@ -62,19 +62,18 @@ tradedangerous/misc/progress.py,sha256=QwWgbbhAuMB7LG0o-jy7WxN1uhLHtN0FwKkV314ul
 tradedangerous/plugins/__init__.py,sha256=TL-OIptlqNENKhoFqkFeBJn_vSw8L0pVaDJgjhaTj7A,7860
 tradedangerous/plugins/edapi_plug.py,sha256=5nqBYmjUceAt-KTfiBn7IEl443R1SsGLDmfVXgbcyms,42262
 tradedangerous/plugins/edcd_plug.py,sha256=JuDtuEM_mN9Sz2H09-qYizM-9N3cuNjgvQy7Y-wHwKw,14412
-tradedangerous/plugins/eddblink_plug.py,sha256=dyVaQhpElq7ceLD0bJhVeuiZoMu8Jdo3Y2hwcAcgx-4,21305
+tradedangerous/plugins/eddblink_plug.py,sha256=J54Lm2-bd1wFZhK_6ZdLUT5_bHdNcJcCx3VRN6gU5Ew,21363
 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.1.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-11.5.1.dist-info/METADATA,sha256=yYK-c5TnEqaGG9gmaTSVGX5tzjxrY7PMuo24Vk1ljIQ,4435
-tradedangerous-11.5.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-11.5.1.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
-tradedangerous-11.5.1.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
-tradedangerous-11.5.1.dist-info/RECORD,,
+tradedangerous-11.5.3.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-11.5.3.dist-info/METADATA,sha256=FLfC5lbHnXnJ38BZ3uPDrtj79OJQlhBEi4cnhUVV584,4663
+tradedangerous-11.5.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tradedangerous-11.5.3.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
+tradedangerous-11.5.3.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
+tradedangerous-11.5.3.dist-info/RECORD,,

{tradedangerous-11.5.1.dist-info → tradedangerous-11.5.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tradedangerous/templates/database_changes.json

@@ -1,6 +0,0 @@
-[
-    "DROP TABLE Ship;",
-    "CREATE TABLE Ship (ship_id INTEGER PRIMARY KEY, name VARCHAR(40) COLLATE nocase, cost INTEGER, UNIQUE (ship_id));",
-    "DROP TABLE Upgrade;",
-    "CREATE TABLE Upgrade(upgrade_id INTEGER PRIMARY KEY, name VARCHAR(40) COLLATE nocase, class NUMBER NOT NULL, rating CHAR(1) NOT NULL, ship VARCHAR(40) COLLATE nocase, UNIQUE (upgrade_id));"
-]