tradedangerous 11.1.6__tar.gz → 11.2.1__tar.gz

{tradedangerous-11.1.6/tradedangerous.egg-info → tradedangerous-11.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.1.6
+Version: 11.2.1
 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.6 → tradedangerous-11.2.1}/tradedangerous/commands/parsing.py

@@ -60,7 +60,6 @@ class PadSizeArgument(int):
             'dest': 'padSize',
             'metavar': 'PADSIZES',
             'type': 'padsize',
-            'choices': 'SsMmLl?',
         }
 
 
@@ -153,7 +152,6 @@ class PlanetaryArgument(int):
             'dest': 'planetary',
             'metavar': 'PLANETARY',
             'type': 'planetary',
-            'choices': 'YyNn?',
         }
 
 
@@ -181,7 +179,6 @@ class FleetCarrierArgument(int):
             'dest': 'fleet',
             'metavar': 'FLEET',
             'type': 'fleet',
-            'choices': 'YyNn?',
         }
 
 class OdysseyArgument(int):
@@ -208,7 +205,6 @@ class OdysseyArgument(int):
             'dest': 'odyssey',
             'metavar': 'ODYSSEY',
             'type': 'odyssey',
-            'choices': 'YyNn?',
         }
 
 

{tradedangerous-11.1.6 → tradedangerous-11.2.1}/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-11.1.6 → tradedangerous-11.2.1}/tradedangerous/commands/station_cmd.py

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

{tradedangerous-11.1.6 → tradedangerous-11.2.1}/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-11.1.6 → tradedangerous-11.2.1}/tradedangerous/commands/update_cmd.py

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

{tradedangerous-11.1.6 → tradedangerous-11.2.1}/tradedangerous/commands/update_gui.py

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

{tradedangerous-11.1.6 → tradedangerous-11.2.1}/tradedangerous/edscupdate.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3.6
+# Deprecated
 
 """
 This tool looks for changes in the EDSC service since the most

{tradedangerous-11.1.6 → tradedangerous-11.2.1}/tradedangerous/edsmupdate.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3.6
+# Deprecated
 
 """
 based on edscupdate.py without the submit_distance()

{tradedangerous-11.1.6 → tradedangerous-11.2.1}/tradedangerous/jsonprices.py

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

{tradedangerous-11.1.6 → tradedangerous-11.2.1}/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.

{tradedangerous-11.1.6 → tradedangerous-11.2.1}/tradedangerous/plugins/eddblink_plug.py

@@ -118,6 +118,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         'force':        "Force regeneration of selected items even if source file not updated since previous run. "
                         "(Useful for updating Vendor tables if they were skipped during a '-O clean' run.)",
         'purge':        "Remove any empty systems that previously had fleet carriers.",
+        'optimize':     "Optimize ('vacuum') database after processing.",
         'solo':         "Don't download crowd-sourced market data. (Implies '-O skipvend', supercedes '-O all', '-O clean', '-O listings'.)",
     }
     
@@ -197,22 +198,10 @@ class ImportPlugin(plugins.ImportPluginBase):
         db = self.tdb.getDB()
         self.tdenv.NOTE("Purging Systems with no stations: Start time = {}", self.now())
 
-        db.execute("PRAGMA foreign_keys = OFF")
-
-        self.tdenv.DEBUG0("Saving systems with stations.... " + str(self.now()) + "\t\t\t\t", end="\r")
-        db.execute("DROP TABLE IF EXISTS System_copy")
-        db.execute("""CREATE TABLE System_copy AS SELECT * FROM System
-                            WHERE system_id IN (SELECT system_id FROM Station)
-                    """)
-
-        self.tdenv.DEBUG0("Erasing table and reinserting kept systems.... " + str(self.now()) + "\t\t\t\t", end="\r")
-        db.execute("DELETE FROM System")
-        db.execute("INSERT INTO System SELECT * FROM System_copy")
-
-        self.tdenv.DEBUG0("Removing copy.... " + str(self.now()) + "\t\t\t\t", end="\r")
-        db.execute("PRAGMA foreign_keys = ON")
-        db.execute("DROP TABLE IF EXISTS System_copy")
-
+        db.execute("""
+            DELETE FROM System
+             WHERE NOT EXISTS(SELECT 1 FROM Station WHERE Station.system_id = System.system_id)
+        """)
         db.commit()
 
         self.tdenv.NOTE("Finished purging Systems. End time = {}", self.now())
@@ -349,7 +338,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         
         # We can probably safely assume that the plugin
         # has never been run if the db file doesn't exist.
-        if not (self.tdb.dataPath / Path("TradeDangerous.db")).exists():
+        if not self.tdb.dbPath.exists():
             self.options["clean"] = True
         
         if self.getOption("clean"):
@@ -392,8 +381,11 @@ class ImportPlugin(plugins.ImportPluginBase):
                 if rib_path.exists():
                     rib_path.unlink()
                 ri_path.rename(rib_path)
-            
+
+            self.tdb.close()
+
             self.tdb.reloadCache()
+            self.tdb.close()
             
             # Now it's safe to move RareItems back.
             if ri_path.exists():
@@ -451,7 +443,7 @@ class ImportPlugin(plugins.ImportPluginBase):
             if self.downloadFile(self.upgradesPath) or self.getOption("force"):
                 transfers.download(self.tdenv, self.urlOutfitting, self.FDevOutfittingPath)
                 buildCache = True
-        
+
         if self.getOption("ship"):
             if self.downloadFile(self.shipPath) or self.getOption("force"):
                 transfers.download(self.tdenv, self.urlShipyard, self.FDevShipyardPath)
@@ -486,16 +478,18 @@ class ImportPlugin(plugins.ImportPluginBase):
         if buildCache:
             self.tdb.close()
             self.tdb.reloadCache()
-        
+            self.tdb.close()
+
         if self.getOption("purge"):
             self.purgeSystems()
+            self.tdb.close()
         
         if self.getOption("listings"):
             if self.downloadFile(self.listingsPath) or self.getOption("force"):
                 self.importListings(self.listingsPath)
             if self.downloadFile(self.liveListingsPath) or self.getOption("force"):
                 self.importListings(self.liveListingsPath)
-        
+
         if self.getOption("listings"):
             self.tdenv.NOTE("Regenerating .prices file.")
             cache.regeneratePricesFile(self.tdb, self.tdenv)

{tradedangerous-11.1.6 → tradedangerous-11.2.1}/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-11.1.6 → tradedangerous-11.2.1}/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-11.1.6 → tradedangerous-11.2.1}/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-11.1.6 → tradedangerous-11.2.1}/tradedangerous/version.py

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

{tradedangerous-11.1.6 → tradedangerous-11.2.1/tradedangerous.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.1.6
+Version: 11.2.1
 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