tradedangerous 11.1.5__py3-none-any.whl → 11.2.0__py3-none-any.whl

tradedangerous/commands/buy_cmd.py

@@ -412,5 +412,5 @@ def render(results, cmdenv, tdb):
         print(stnRowFmt.format(row))
     
     if singleMode and cmdenv.detail:
-        msg = "-- Ship Cost" if mode is SHIP_MODE else "-- Average",
+        msg = "-- Ship Cost" if mode is SHIP_MODE else "-- Average"
         print(f"{msg:{maxStnLen}} {results.summary.avg:>10n}")

tradedangerous/commands/shipvendor_cmd.py

@@ -1,3 +1,5 @@
+# Deprecated
+# Can already use buy command for ship searching
 from .commandenv import ResultRow
 from .exceptions import CommandLineError
 from .parsing import MutuallyExclusiveGroup, ParseArgument

tradedangerous/commands/station_cmd.py

@@ -1,3 +1,4 @@
+# Deprecated
 from .commandenv import ResultRow
 from .exceptions import CommandLineError
 from .parsing import MutuallyExclusiveGroup, ParseArgument

tradedangerous/commands/trade_cmd.py

@@ -6,7 +6,7 @@ from ..formatting import RowFormat, max_len
 ######################################################################
 # Parser config
 
-help='Find places to buy a given item within range of a given station.'
+help='Find potential trades between two given stations.'
 name='trade'
 epilog=None
 wantsTradeDB=True

tradedangerous/commands/update_cmd.py

@@ -1,3 +1,4 @@
+# Deprecated
 from .parsing import MutuallyExclusiveGroup, ParseArgument
 from ..tradeexcept import TradeException
 from .exceptions import CommandLineError

tradedangerous/commands/update_gui.py

@@ -1,3 +1,4 @@
+# Deprecated
 import tkinter as tk
 import tkinter.messagebox as mbox
 import sqlite3

tradedangerous/edscupdate.py

@@ -1,3 +1,4 @@
+# Deprecated
 #!/usr/bin/env python3.6
 
 """

tradedangerous/edsmupdate.py

@@ -1,3 +1,4 @@
+# Deprecated
 #!/usr/bin/env python3.6
 
 """

tradedangerous/jsonprices.py

@@ -1,3 +1,4 @@
+# Deprecated
 from tradedangerous import tradedb
 from tradedangerous.tradeexcept import TradeException
 

tradedangerous/mapping.py

@@ -1,7 +1,8 @@
 #
 # Mapping class for FDEV-IDs to TD names
 #
-
+# Deprecated
+# FDEVMappingItems and FDEVMappingShips used by edapi plugin
 class FDEVMappingBase:
     """
     Base class to map FDEV-IDs to TD names, do not use directly.
@@ -100,7 +101,7 @@ class FDEVMappingItems(FDEVMappingBase):
         Maps ID to TD and EDDN items
     """
     tableName = "Item"
-    colNames  = [ 'fdev_id', 'name' ]
+    colNames  = [ 'item_id', 'name' ]
     
     def mapUnknown(self):
         # no ID known yet for:
@@ -113,7 +114,7 @@ class FDEVMappingShips(FDEVMappingBase):
         Maps ID to TD ships
     """
     tableName = "Ship"
-    colNames  = [ 'fdev_id', 'name' ]
+    colNames  = [ 'ship_id', 'name' ]
 
 class FDEVMappingShipyard(FDEVMappingBase):
     """

tradedangerous/submit-distances.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3.6
+# Deprecated
+# Website no longer exists
 
 """
 Small tool to submit new star data to EDStarCoordinator.

tradedangerous/tradeenv.py

@@ -2,6 +2,7 @@
 # into a single object, the TradeEnv. See TradeEnv docstring for more.
 from __future__ import annotations
 
+from pathlib import Path
 import os
 import sys
 import traceback
@@ -270,3 +271,36 @@ class TradeEnv(Utf8SafeConsoleIOMixin):
             return noteFn
         
         return None
+
+    def remove_file(self, *args) -> bool:
+        """ Unlinks a file, as long as it exists, and logs the action at level 1. """
+        path = Path(*args)
+        if not path.exists():
+            return False
+        path.unlink()
+        self.DEBUG1(":cross_mark: deleted {}", path)
+        return True
+
+    def rename_file(self, *, old: os.PathLike, new: os.PathLike) -> bool:
+        """
+        If 'new' exists, deletes it, and then attempts to rename old -> new. If new is not specified,
+        then '.old' is appended to the end of the old filename while retaining the original suffix.
+        
+        :param old:             The current path/name of the file.
+        :param new:             The path/name to rename the file to and remove before attempting.
+        :returns:               True if the file existed and was renamed.
+        """
+        # Promote new to a guaranteed Path and remove it if it's present.
+        new = Path(new)
+        self.remove_file(new)
+
+        # Promote new to a guaranteed Path and confirm it exists.
+        old = Path(old)
+        if not old.exists():
+            return False
+
+        # Perform the rename and log it at level 1.
+        old.rename(new)
+        self.DEBUG1(":recycle: moved {} to {}", old, new)
+
+        return True

tradedangerous/transfers.py

@@ -6,7 +6,6 @@ from .tradeexcept import TradeException
 from .misc import progress as pbar
 from . import fs
 
-import csv
 import json
 import time
 import typing
@@ -50,6 +49,7 @@ def download(
             timeout:    int = 90,
             *,
             length:     Optional[Union[int, str]] = None,
+            session:    Optional[requests.Session] = None,
         ):
     """
     Fetch data from a URL and save the output
@@ -75,7 +75,8 @@ def download(
     if isinstance(length, str):
         length = int(length)
 
-    req = requests.get(url, headers=headers or None, stream=True, timeout=timeout)
+    # If the caller provided an existing session stream, use that the fetch the request.
+    req = (session or requests).get(url, headers=headers or None, stream=True, timeout=timeout)
     req.raise_for_status()
     
     encoding = req.headers.get('content-encoding', 'uncompress')
@@ -85,7 +86,7 @@ def download(
         # chunked transfer-encoding doesn't need a content-length
         if content_length is None:
             print(req.headers)
-            raise Exception("Remote server replied with invalid content-length.")
+            raise TradeException("Remote server replied with invalid content-length.")
         content_length = int(content_length)
         if content_length <= 0:
             raise TradeException(
@@ -210,52 +211,3 @@ def get_json_data(url, *, timeout: int = 90):
         progBar.clear()
     
     return json.loads(jsData.decode())
-
-class CSVStream:
-    """
-    Provides an iterator that fetches CSV data from a given URL
-    and presents it as an iterable of (columns, values).
-    
-    Example:
-        stream = transfers.CSVStream("http://blah.com/foo.csv")
-        for cols, vals in stream:
-            print("{} = {}".format(cols[0], vals[0]))
-    """
-    
-    def __init__(self, url, tdenv=None, *, timeout: int = 90):
-        self.url = url
-        self.tdenv = tdenv
-        if not url.startswith("file:///"):
-            self.req = requests.get(self.url, stream=True, timeout=timeout)
-            self.lines = self.req.iter_lines()
-        else:
-            self.lines = open(url[8:], "rUb")
-        self.columns = self.next_line().split(',')
-    
-    def next_line(self):
-        """ Fetch the next line as a text string """
-        while True:
-            line = next(self.lines)
-            try:
-                return line.decode(encoding="utf-8")
-            except UnicodeDecodeError as e:
-                if not self.tdenv:
-                    raise e
-                self.tdenv.WARN(
-                    "{}: line:{}: {}\n{}",
-                    self.url, self.csvin.line_num, line, e
-                )
-    
-    def __iter__(self):
-        """
-        Iterate across data received as csv values.
-        Yields [column headings], [column values]
-        """
-        self.csvin = csvin = csv.reader(
-            iter(self.next_line, 'END'),
-            delimiter=',', quotechar="'", doublequote=True
-        )
-        columns = self.columns
-        for values in csvin:
-            if values and len(values) == len(columns):
-                yield columns, values

tradedangerous/version.py

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

{tradedangerous-11.1.5.dist-info → tradedangerous-11.2.0.dist-info}/METADATA

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

@@ -5,27 +5,27 @@ tradedangerous/cache.py,sha256=N7z1e2fov003wIh_aHkw1pdByKDPt3FkDZiH_EEPdMc,36080
 tradedangerous/cli.py,sha256=dLekZ3MTbn9XcSGtE532qZF3iSnsb5G-ddQyErwTv9o,4559
 tradedangerous/corrections.py,sha256=_WLgo1IBWoskrrPFeshRwCOeJ2BeJb_x4tDQ0JdAo-s,1340
 tradedangerous/csvexport.py,sha256=_19bGVnCGJPzvx_8DzLGOs4rqx8Asn7eCVdXKdKu92E,8653
-tradedangerous/edscupdate.py,sha256=G8N-j61MZbCgY07WIVK23CCw6eMPE3WkraXHeARt9QE,17297
-tradedangerous/edsmupdate.py,sha256=jpDUxUkDKxlG_gS3qWy5fg9p3mBPC-akU2pHSlfTPkI,14915
+tradedangerous/edscupdate.py,sha256=uZpapPnGLSEGXFR0u0_DydpXD6TF2oq-FOeXsLgrcwE,17310
+tradedangerous/edsmupdate.py,sha256=n3fkY2A5EBAcAiIn7j2nt4w7icWf56ikI8yd6CiyWsk,14928
 tradedangerous/formatting.py,sha256=K3XL_mZJ4cAiTTTmJmTXK7ePYzzsSxg7EoBVFh7gj60,6931
 tradedangerous/fs.py,sha256=_5OJHIRy_M-WFHEZO4g2EIgqDxdrz4s8tcdDmgG7NME,2494
 tradedangerous/gui.py,sha256=DFsF5zATr-lyJShL6t5kPKvcLLJYkICurzBz0WBa-oQ,43676
-tradedangerous/jsonprices.py,sha256=V9Xm3pocQfEHoC38VYWomzbwX0wu9R2zJ2gB99JzYPQ,7212
-tradedangerous/mapping.py,sha256=eGBQeYPD04Kq_ygZCDRafKMGz9EnxSgXUzQU-u78_2A,4049
+tradedangerous/jsonprices.py,sha256=GJ07fbZSNX5U_6lczWTSk6mWwme_weJbXgE8zcZBnpY,7225
+tradedangerous/mapping.py,sha256=Bf2G8LzP1Bat5k3hFs9XyeI1z3tfUpfeh4nuLP2QJuQ,4122
 tradedangerous/prices.py,sha256=JqiDVrtvvPd5pqE3HdwOHOuFgdAbOR-pt0GLD3ZIXM8,7425
-tradedangerous/submit-distances.py,sha256=zxHtRpX10soJKLuRcun9uelfXGq2S9jvIWxD--P9zus,11709
+tradedangerous/submit-distances.py,sha256=xL7fwdbVrb05-zWNH-9nyYBDtV4bfUfP7OBx3NMBc34,11749
 tradedangerous/tools.py,sha256=pp-4WtA12SVaaQHFJFOMTF7EDFRCU2mQeOhC4xoXmEk,1331
 tradedangerous/tradecalc.py,sha256=A7peEMiaCjlwFvReSq3E7_Ar0shUoFedQi83ZmOc7uY,42075
 tradedangerous/tradedb.py,sha256=mitKkS4MczivDK_K7A-IC94hkObUmGWFhwIrh_ts9qw,72282
-tradedangerous/tradeenv.py,sha256=SDzRC6ERYZzzb_I6uexmFpFJJrnbzXa-1ogYt_GH26w,10576
+tradedangerous/tradeenv.py,sha256=o956HN7-7uzIcNi9vI4zh-L1z5jwBioVARyhhiAlsRQ,11885
 tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk,368
-tradedangerous/transfers.py,sha256=KwskYBB5_TYDXx5fkN1ABYsPuPnICKdkEx0WUfC7BnA,8378
+tradedangerous/transfers.py,sha256=NdPNzrpa5YuZeo2wBK6X8sy1VyFUaAXb0EtASyVXsuQ,6885
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=RW4r1F63KW3hk-PZN1UtKuplBR5kfZV1j0tMS5F4kaw,646
+tradedangerous/version.py,sha256=CIRQudWzY9CP4niZ5hY2VqrxXsnZnG_3vA77k9Otwo8,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=VbHSUI9eocaQAdzaLRnHr-Nsnu15Q2WlhC3VzMK_3KQ,13924
+tradedangerous/commands/buy_cmd.py,sha256=GZa4wx5NKsZLKx1vtO1a47hSL8la5fatOY3dCazQSSo,13923
 tradedangerous/commands/commandenv.py,sha256=lzPbxhrgx4PJL_x8pRdYu22rqtL4U6kNQ5ExXTPoAao,9462
 tradedangerous/commands/exceptions.py,sha256=xJib2n0YRSgrs8WhZX5IeVHM-XakS3YwfjlF8_cNx4E,3476
 tradedangerous/commands/export_cmd.py,sha256=VfxwrNU_TzrSw71KrmtmXKYCBkpDGr5KRLGPXOBewnI,4405
@@ -38,11 +38,11 @@ tradedangerous/commands/parsing.py,sha256=RUnCnML59IOXYI6jEljE5lrE_WKcDmFFqKF1JV
 tradedangerous/commands/rares_cmd.py,sha256=L_QoW2zIZTU9Jpavt_K2fZyu8T153nUSuVqIiz4uksQ,9207
 tradedangerous/commands/run_cmd.py,sha256=HtvxKfD2ef_fUCDdUzBv9yRwd2gBOqIq4hzUAOLgcyU,47650
 tradedangerous/commands/sell_cmd.py,sha256=RI8T1DWaBuQkYSy2Pjoo0Kxy5n9UgRTqtlSBE0Vg1SI,7943
-tradedangerous/commands/shipvendor_cmd.py,sha256=PQXMmPin3HsAAdeBesnyDVuqAh-GATWwp2C2gnHdS9I,6918
-tradedangerous/commands/station_cmd.py,sha256=pN0IuisOp_ngWE8lrUKMkLpfOO7p3DxidgTGiKOrWCE,16219
-tradedangerous/commands/trade_cmd.py,sha256=3oTAsnV4ka18I7aQkgwtdQNIzS1Vt3LdisXMbrHw1WY,3031
-tradedangerous/commands/update_cmd.py,sha256=2A3i8J1XGe5TOfpvKyTXon2cVzhUosiaWuekEpbAh4U,14551
-tradedangerous/commands/update_gui.py,sha256=IhHXSQvLdol-i4LibOGgdvVUG9V2oS2g7Zqc60qf0YI,23318
+tradedangerous/commands/shipvendor_cmd.py,sha256=IA85tHmZK-dBAUM5Q2ds5cBSvRzDyhILnXxjNbq9Lsg,6980
+tradedangerous/commands/station_cmd.py,sha256=gnWOT-Z8DfOeA4GNjUwj57eNxuNGh5mPZ-D0E_BeoTw,16232
+tradedangerous/commands/trade_cmd.py,sha256=o4Xdel5asGY8i6qES95fLHdyfyjKdC5CTOQrZIeu0i4,3016
+tradedangerous/commands/update_cmd.py,sha256=2UWR6aDbAbvtKFtfmehVwFUBQfJM5KThR71HoC6wVnM,14564
+tradedangerous/commands/update_gui.py,sha256=WwZvvad7pF0LasZztjO6v5OTWzCZlcey2DFj8h91dWg,23331
 tradedangerous/mfd/__init__.py,sha256=g8pT9Ev_le_yOeAF7sr9fUuEi8VW3u9n_qq-xLga1xw,2958
 tradedangerous/mfd/saitek/__init__.py,sha256=CGgkAik87Kb5uc43G0bBFueD47bb_BydDM8qb7YQLyA,62
 tradedangerous/mfd/saitek/directoutput.py,sha256=ReBzax7ttoffzH8DLXx0AS2RFLLQWOQUw1ESQUjOMGk,24840
@@ -71,9 +71,9 @@ tradedangerous/templates/Added.csv,sha256=8o54civQCcS9y7_DBo0GX196XWRbbREQqKDYTK
 tradedangerous/templates/Category.csv,sha256=8xwUDcBZE25T6x6dZGlRUMTCqeDLt3a9LXU5h6hRHV8,250
 tradedangerous/templates/RareItem.csv,sha256=F1RhRnTD82PiwrVUO-ai2ErGH2PTqNnQaDw5mcgljXs,10483
 tradedangerous/templates/TradeDangerous.sql,sha256=VlQK7QGtEi2brGtWaIZDvKmbJ_vLocD4CJ8h_6kKptU,7808
-tradedangerous-11.1.5.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-11.1.5.dist-info/METADATA,sha256=vL1cKyh5Qp1R9sHAv_mlmJgU-vqjEQQumPuyibG-Wew,4435
-tradedangerous-11.1.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-11.1.5.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
-tradedangerous-11.1.5.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
-tradedangerous-11.1.5.dist-info/RECORD,,
+tradedangerous-11.2.0.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-11.2.0.dist-info/METADATA,sha256=uSI0GspaqOSLmD6k3Kn3wPvlc7hsNOEPl2sRHq7LKCM,4435
+tradedangerous-11.2.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-11.2.0.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
+tradedangerous-11.2.0.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
+tradedangerous-11.2.0.dist-info/RECORD,,