tradedangerous 11.5.1__tar.gz → 11.5.3__tar.gz

{tradedangerous-11.5.1/tradedangerous.egg-info → tradedangerous-11.5.3}/PKG-INFO

@@ -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 → tradedangerous-11.5.3}/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-11.5.1 → tradedangerous-11.5.3}/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-11.5.1 → tradedangerous-11.5.3}/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-11.5.1 → tradedangerous-11.5.3}/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 → tradedangerous-11.5.3/tradedangerous.egg-info}/PKG-INFO

@@ -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 → tradedangerous-11.5.3}/tradedangerous.egg-info/SOURCES.txt

@@ -92,5 +92,4 @@ tradedangerous/plugins/spansh_plug.py
 tradedangerous/templates/Added.csv
 tradedangerous/templates/Category.csv
 tradedangerous/templates/RareItem.csv
-tradedangerous/templates/TradeDangerous.sql
-tradedangerous/templates/database_changes.json
+tradedangerous/templates/TradeDangerous.sql

tradedangerous-11.5.1/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));"
-]