tradedangerous 11.3.0__tar.gz → 11.5.0__tar.gz

{tradedangerous-11.3.0/tradedangerous.egg-info → tradedangerous-11.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.3.0
+Version: 11.5.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.3.0 → tradedangerous-11.5.0}/setup.py

@@ -54,7 +54,7 @@ setup(name = package,
         ],
         license = "MPL",
         test_suite = "tests",
-        package_data = {"tradedangerous": ["templates/TradeDangerous.sql", "templates/Added.csv", "templates/Category.csv", "templates/RareItem.csv"]},
+        package_data = {"tradedangerous": ["templates/TradeDangerous.sql", "templates/Added.csv", "templates/Category.csv", "templates/RareItem.csv", "templates/database_changes.json"]},
         entry_points = {
             "console_scripts": [
                 "trade=trade:main",

{tradedangerous-11.3.0 → tradedangerous-11.5.0}/tests/test_bootstrap_commands.py

@@ -7,7 +7,7 @@ class TestBootstrapCommands(unittest.TestCase):
         
         self.assertIn('buildcache', commands.commandIndex)
         self.assertIn('buy', commands.commandIndex)
-
+    
     def test_import_buildcache_cmd(self):
         from tradedangerous.commands import buildcache_cmd
     

{tradedangerous-11.3.0 → tradedangerous-11.5.0}/tradedangerous/cache.py

@@ -1005,7 +1005,7 @@ def buildCache(tdb, tdenv):
                         importName
                     )
         prog.increment(1)
-
+        
         with prog.sub_task(description="Save DB"):
             tempDB.commit()
     

{tradedangerous-11.3.0 → tradedangerous-11.5.0}/tradedangerous/commands/buy_cmd.py

@@ -9,7 +9,7 @@ from .parsing import (
     NoPlanetSwitch, OdysseyArgument, PadSizeArgument, ParseArgument, PlanetaryArgument,
 )
 
-
+# TODO: Add UPGRADE_MODE
 ITEM_MODE = "Item"
 SHIP_MODE = "Ship"
 

{tradedangerous-11.3.0 → tradedangerous-11.5.0}/tradedangerous/commands/commandenv.py

@@ -70,6 +70,13 @@ class CommandEnv(TradeEnv):
             the properties we have are valid.
         """
         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()
         
         self.checkMFD()
         self.checkFromToNear()

{tradedangerous-11.3.0 → tradedangerous-11.5.0}/tradedangerous/commands/exceptions.py

@@ -7,7 +7,7 @@ from ..tradeexcept import TradeException
 class UsageError(TradeException):
     def __init__(self, title, usage):
         self.title, self.usage = title, usage
-
+    
     def __str__(self):
         return self.title + "\n\n" + self.usage
 
@@ -20,7 +20,7 @@ class CommandLineError(TradeException):
     """
     def __init__(self, errorStr, usage=None):
         self.errorStr, self.usage = errorStr, usage
- 
+    
     def __str__(self):
         if self.usage:
             return "ERROR: {}\n\n{}".format(self.errorStr, self.usage)
@@ -36,7 +36,7 @@ class NoDataError(TradeException):
     """
     def __init__(self, errorStr):
         self.errorStr = errorStr
-
+    
     def __str__(self):
         return f"""Error: {self.errorStr}
 Possible causes:

{tradedangerous-11.3.0 → tradedangerous-11.5.0}/tradedangerous/commands/parsing.py

@@ -28,7 +28,7 @@ class CreditParser(int):
     'k' for thousands, 'm' for millions and 'b' for billions.
     """
     suffixes = {'k': 10**3, 'm': 10**6, 'b': 10**9}
-
+    
     def __new__(cls, val, **kwargs):
         if isinstance(val, str):
             if val[-1] in CreditParser.suffixes:

{tradedangerous-11.3.0 → tradedangerous-11.5.0}/tradedangerous/commands/sell_cmd.py

@@ -37,6 +37,12 @@ switches = [
             metavar='N.NN',
             type=float,
     ),
+    ParseArgument('--age', '--max-days-old', '-MD',
+        help = 'Maximum age (in days) of trade data to use.',
+        metavar = 'DAYS',
+        type = float,
+        dest = 'maxAge',
+    ),
     AvoidPlacesArgument(),
     PadSizeArgument(),
     MutuallyExclusiveGroup(
@@ -165,6 +171,9 @@ def run(results, cmdenv, tdb: TradeDB):
             continue
         if station.system in avoidSystems:
             continue
+        maxAge, stnAge = cmdenv.maxAge, station.dataAge or float("inf")
+        if maxAge and stnAge > maxAge:
+            continue
         
         row = ResultRow()
         row.station = station

{tradedangerous-11.3.0 → tradedangerous-11.5.0}/tradedangerous/commands/shipvendor_cmd.py

@@ -208,7 +208,7 @@ def run(results, cmdenv, tdb):
     for ship in ships.values():
         if action(tdb, cmdenv, station, ship):
             dataToExport = True
-
+    
     cmdenv.DEBUG0("dataToExport = {}", dataToExport)
     
     maybeExportToCSV(tdb, cmdenv)

{tradedangerous-11.3.0 → tradedangerous-11.5.0}/tradedangerous/fs.py

@@ -35,7 +35,7 @@ def copy_if_newer(src, dst):
     dstPath = pathify(dst)
     if dstPath.exists() and dstPath.stat().st_mtime >= srcPath.stat().st_mtime:
         return srcPath
-
+    
     shcopy(str(srcPath), str(dstPath))
     return dstPath
 
@@ -105,29 +105,29 @@ def file_line_count(from_file: PathLike, buf_size: int = 128 * 1024, *, missing_
     """ counts the number of newline characters in a given file. """
     if not isinstance(from_file, Path):
         from_file = Path(from_file)
-
+    
     if missing_ok and not from_file.exists():
         return 0
-
+    
     # Pre-allocate a buffer so that we aren't putting pressure on the garbage collector.
     buf = bytearray(buf_size)
-
+    
     # Capture it's counting method, so we don't have to keep looking that up on
     # large files.
     counter = buf.count
-
+    
     total = 0
     with from_file.open("rb") as fh:
         # Capture the 'readinto' method to avoid lookups.
         reader = fh.readinto
-
+        
         # read into the buffer and capture the number of bytes fetched,
         # which will be 'size' until the last read from the file.
         read = reader(buf)
         while read == buf_size:  # nominal case for large files
             total += counter(b'\n')
             read = reader(buf)
-
+        
         # when 0 <= read < buf_size we're on the last page of the
         # file, so we need to take a slice of the buffer, which creates
         # a new object, thus we also have to lookup count. it's trivial

{tradedangerous-11.3.0 → tradedangerous-11.5.0}/tradedangerous/jsonprices.py

@@ -118,7 +118,7 @@ def load_prices_json(
             blackMarket = '?'
     except KeyError:
         blackMarket = '?'
-
+    
     try:
         maxPadSize = stnData['mps'].upper()
         if maxPadSize not in ['S', 'M', 'L']:

{tradedangerous-11.3.0 → tradedangerous-11.5.0}/tradedangerous/misc/progress.py

@@ -73,10 +73,10 @@ class Progress:
         self.show = bool(show)
         if not show:
             return
-
+        
         if style is None:
             style = DefaultBar
-
+        
         self.max_value = 0 if max_value is None else max(max_value, start)
         self.value = start
         self.prefix = prefix or ""
@@ -90,23 +90,23 @@ class Progress:
             # Hide it once it's finished, update it for us, 4x a second
             transient=True, auto_refresh=True, refresh_per_second=5
         )
-
+        
         # Now we add an actual task to track progress on.
         self.task = self.progress.add_task("Working...", total=max_value, start=True)
         if self.value:
             self.progress.update(self.task, advance=self.value)
-
+        
         # And show the task tracker.
         self.progress.start()
-
+    
     def __enter__(self):
         """ Context manager.
-        
+            
             Example use:
-
+                
                 import time
                 import tradedangerous.progress
-
+                
                 # Progress(max_value=100, width=32, style=progress.CountingBar)
                 with progress.Progress(100, 32, style=progress.CountingBar) as prog:
                     for i in range(100):
@@ -114,10 +114,10 @@ class Progress:
                         time.sleep(3)
         """
         return self
-
+    
     def __exit__(self, *args, **kwargs):
         self.clear()
-
+    
     def increment(self, value: Optional[float] = None, description: Optional[str] = None, *, progress: Optional[float] = None) -> None:
         """
         Increase the progress of the bar by a given amount.
@@ -139,30 +139,30 @@ class Progress:
         elif value:
             self.value += value              # Update our internal count
             bump = True
-
+        
         if self.value >= self.max_value:  # Did we go past the end? Increase the end.
             self.max_value += value * 2
             self.progress.update(self.task, description=self.prefix, total=self.max_value)
             bump = True
-
+        
         if bump and self.max_value > 0:
             self.progress.update(self.task, description=self.prefix, completed=self.value)
-
+    
     def clear(self) -> None:
         """ Remove the current progress bar, if any. """
         # These two shouldn't happen separately, but incase someone tinkers, test each
         # separately and shut them down.
         if not self.show:
             return
-
+        
         if self.task:
             self.progress.remove_task(self.task)
             self.task = None
-
+        
         if self.progress:
             self.progress.stop()
             self.progress = None
-            
+    
     @contextmanager
     def sub_task(self, description: str, max_value: Optional[int] = None, width: int = 25):
         if not self.show:
@@ -173,7 +173,7 @@ class Progress:
             yield task
         finally:
             self.progress.remove_task(task)
-
+    
     def update_task(self, task: TaskID, advance: Union[float, int], description: Optional[str] = None):
         if self.show:
             self.progress.update(task, advance=advance, description=description)

{tradedangerous-11.3.0 → tradedangerous-11.5.0}/tradedangerous/plugins/eddblink_plug.py

@@ -45,7 +45,7 @@ def _count_listing_entries(tdenv: TradeEnv, listings: Path) -> int:
         else:
             tdenv.DEBUG0("Listings file is empty, nothing to do.")
         return 0
-
+    
     return count + 1  # kfsone: Doesn't the header already make this + 1?
 
 
@@ -94,7 +94,7 @@ class ImportPlugin(plugins.ImportPluginBase):
     def __init__(self, tdb, tdenv):
         super().__init__(tdb, tdenv)
         
-        self.dataPath = Path(os.environ.get('TD_EDDB')) if os.environ.get('TD_EDDB') else self.tdb.dataPath / Path("eddb")
+        self.dataPath = os.environ.get('TD_EDDB') or self.tdenv.tmpDir
         self.categoriesPath = Path("Category.csv")
         self.commoditiesPath = Path("Item.csv")
         self.rareItemPath = Path("RareItem.csv")
@@ -166,13 +166,13 @@ class ImportPlugin(plugins.ImportPluginBase):
         """
         db = self.tdb.getDB()
         self.tdenv.NOTE("Purging Systems with no stations: Start time = {}", self.now())
-
+        
         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())
     
     def importListings(self, listings_file):
@@ -188,9 +188,9 @@ class ImportPlugin(plugins.ImportPluginBase):
         if not total:
             self.tdenv.NOTE("No listings")
             return
-
+        
         self.tdenv.NOTE("Processing market data from {}: Start time = {}. Live = {}", listings_file, self.now(), from_live)
-
+        
         db = self.tdb.getDB()
         stmt_unliven_station = """UPDATE StationItem SET from_live = 0 WHERE station_id = ?"""
         stmt_flush_station   = """DELETE from StationItem WHERE station_id = ?"""
@@ -253,7 +253,7 @@ class ImportPlugin(plugins.ImportPluginBase):
                             transaction_items += 1
                             skip_station = True
                             continue
-
+                        
                         # Unless the import file data is newer, nothing else needs to be done for this station,
                         # so the rest of the listings for this station can be skipped.
                         if listing_time <= last_modified:
@@ -276,7 +276,7 @@ class ImportPlugin(plugins.ImportPluginBase):
                 # listings.csv includes rare items, which we are ignoring.
                 if item_id not in item_lookup:
                     continue
-
+                
                 demand_price = int(listing['sell_price'])
                 demand_units = int(listing['demand'])
                 demand_level = int(listing.get('demand_bracket') or '-1')
@@ -292,16 +292,16 @@ class ImportPlugin(plugins.ImportPluginBase):
                         supply_price, supply_units, supply_level,
                 ))
                 transaction_items += 1
-
+        
         # These will take a little while, which has four steps, so we'll make it a counter.
         with pbar.Progress(1, 40, prefix="Saving"):
             # Do a final commit to be sure
             cursor.execute("COMMIT")
-
+        
         if self.getOption("optimize"):
             with pbar.Progress(1, 40, prefix="Optimizing"):
                 db.execute("VACUUM")
-
+        
         self.tdb.close()
         
         self.tdenv.NOTE("Finished processing market data. End time = {}", self.now())
@@ -370,9 +370,9 @@ 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()
             
@@ -432,7 +432,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)
@@ -468,7 +468,7 @@ class ImportPlugin(plugins.ImportPluginBase):
             self.tdb.close()
             self.tdb.reloadCache()
             self.tdb.close()
-
+        
         if self.getOption("purge"):
             self.purgeSystems()
             self.tdb.close()
@@ -478,7 +478,7 @@ class ImportPlugin(plugins.ImportPluginBase):
                 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)