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

tradedangerous/tradecalc.py

@@ -930,176 +930,173 @@ class TradeCalc:
                     odyssey = odyssey,
                 )
         
-        prog = pbar.Progress(len(routes), 25)
-        connections = 0
-        getSelling = self.stationsSelling.get
-        for route in routes:
-            if tdenv.progress:
-                prog.increment(1)
-            tdenv.DEBUG1("Route = {}", route.text(lambda x, y: y))
-            
-            srcStation = route.lastStation
-            startCr = credits + int(route.gainCr * safetyMargin)
-            
-            srcSelling = getSelling(srcStation.ID, None)
-            srcSelling = tuple(
-                values for values in srcSelling
-                if values[1] <= startCr
-            )
-            if not srcSelling:
-                tdenv.DEBUG1("Nothing sold/affordable - next.")
-                continue
-            
-            if goalSystem:
-                origSystem = route.firstSystem
-                srcSystem = srcStation.system
-                srcDistTo = srcSystem.distanceTo
-                goalDistTo = goalSystem.distanceTo
-                origDistTo = origSystem.distanceTo
-                srcGoalDist = srcDistTo(goalSystem)
-                srcOrigDist = srcDistTo(origSystem)
-                origGoalDist = origDistTo(goalSystem)
-            
-            if unique:
-                uniquePath = route.route
-            elif loopInt:
-                pos_from_end = 0 - loopInt
-                uniquePath = route.route[pos_from_end:-1]
-            
-            stations = (d for d in station_iterator(srcStation)
-              if (d.station != srcStation) and
-                (d.station.blackMarket == 'Y' if reqBlackMarket else True) and
-                (d.station not in uniquePath if uniquePath else True) and
-                (d.station in restrictStations if restrictStations else True) and
-                (d.station.dataAge and d.station.dataAge <= maxAge if maxAge else True) and
-                (((d.system is not srcSystem) if bool(tdenv.unique) else (d.system is goalSystem or d.distLy < srcGoalDist)) if goalSystem else True)
-            )
-            
-            if tdenv.debug >= 1:
+        with pbar.Progress(max_value=len(routes), width=25, show=tdenv.progress) as prog:
+            connections = 0
+            getSelling = self.stationsSelling.get
+            for route_no, route in enumerate(routes):
+                prog.increment(progress=route_no)
+                tdenv.DEBUG1("Route = {}", route.text(lambda x, y: y))
                 
-                def annotate(dest):
-                    tdenv.DEBUG1(
-                        "destSys {}, destStn {}, jumps {}, distLy {}",
-                        dest.system.dbname,
-                        dest.station.dbname,
-                        "->".join(jump.text() for jump in dest.via),
-                        dest.distLy
-                    )
-                    return True
-                
-                stations = (d for d in stations if annotate(d))
-            
-            for dest in stations:
-                dstStation = dest.station
+                srcStation = route.lastStation
+                startCr = credits + int(route.gainCr * safetyMargin)
                 
-                connections += 1
-                items = self.getTrades(srcStation, dstStation, srcSelling)
-                if not items:
+                srcSelling = getSelling(srcStation.ID, None)
+                srcSelling = tuple(
+                    values for values in srcSelling
+                    if values[1] <= startCr
+                )
+                if not srcSelling:
+                    tdenv.DEBUG1("Nothing sold/affordable - next.")
                     continue
-                trade = fitFunction(items, startCr, capacity, maxUnits)
                 
-                multiplier = 1.0
-                # Calculate total K-lightseconds supercruise time.
-                # This will amortize for the start/end stations
-                dstSys = dest.system
-                if goalSystem and dstSys is not goalSystem:
-                    dstGoalDist = goalDistTo(dstSys)
-                    # Biggest reward for shortening distance to goal
-                    score = 5000 * origGoalDist / dstGoalDist
-                    # bias towards bigger reductions
-                    score += 50 * srcGoalDist / dstGoalDist
-                    # discourage moving back towards origin
-                    if dstSys is not origSystem:
-                        score += 10 * (origDistTo(dstSys) - srcOrigDist)
-                    # Gain per unit pays a small part
-                    score += (trade.gainCr / trade.units) / 25
-                else:
-                    score = trade.gainCr
-                if lsPenalty:
-                    # [kfsone] Only want 1dp
+                if goalSystem:
+                    origSystem = route.firstSystem
+                    srcSystem = srcStation.system
+                    srcDistTo = srcSystem.distanceTo
+                    goalDistTo = goalSystem.distanceTo
+                    origDistTo = origSystem.distanceTo
+                    srcGoalDist = srcDistTo(goalSystem)
+                    srcOrigDist = srcDistTo(origSystem)
+                    origGoalDist = origDistTo(goalSystem)
+                
+                if unique:
+                    uniquePath = route.route
+                elif loopInt:
+                    pos_from_end = 0 - loopInt
+                    uniquePath = route.route[pos_from_end:-1]
+                
+                stations = (d for d in station_iterator(srcStation)
+                if (d.station != srcStation) and
+                    (d.station.blackMarket == 'Y' if reqBlackMarket else True) and
+                    (d.station not in uniquePath if uniquePath else True) and
+                    (d.station in restrictStations if restrictStations else True) and
+                    (d.station.dataAge and d.station.dataAge <= maxAge if maxAge else True) and
+                    (((d.system is not srcSystem) if bool(tdenv.unique) else (d.system is goalSystem or d.distLy < srcGoalDist)) if goalSystem else True)
+                )
+                
+                if tdenv.debug >= 1:
                     
-                    cruiseKls = int(dstStation.lsFromStar / 100) / 10
-                    # Produce a curve that favors distances under 1kls
-                    # positively, starts to penalize distances over 1k,
-                    # and after 4kls starts to penalize aggressively
-                    # http://goo.gl/Otj2XP
+                    def annotate(dest):
+                        tdenv.DEBUG1(
+                            "destSys {}, destStn {}, jumps {}, distLy {}",
+                            dest.system.dbname,
+                            dest.station.dbname,
+                            "->".join(jump.text() for jump in dest.via),
+                            dest.distLy
+                        )
+                        return True
                     
-                    # [eyeonus] As aadler pointed out, this goes into negative
-                    # numbers, which causes problems.
-                    # penalty = ((cruiseKls ** 2) - cruiseKls) / 3
-                    # penalty *= lsPenalty
-                    # multiplier *= (1 - penalty)
+                    stations = (d for d in stations if annotate(d))
+                
+                for dest in stations:
+                    dstStation = dest.station
                     
-                    # [eyeonus]:
-                    # (Keep in mind all this ignores values of x<0.)
-                    # The sigmoid: (1-(25(x-1))/(1+abs(25(x-1))))/4
-                    # ranges between 0.5 and 0 with a drop around x=1,
-                    # which makes it great for giving a boost to distances < 1Kls.
-                    #
-                    # The sigmoid: (-1-(50(x-4))/(1+abs(50(x-4))))/4
-                    # ranges between 0 and -0.5 with a drop around x=4,
-                    # making it great for penalizing distances > 4Kls.
-                    #
-                    # The curve: (-1+1/(x+1)^((x+1)/4))/2
-                    # ranges between 0 and -0.5 in a smooth arc,
-                    # which will be used for making distances
-                    # closer to 4Kls get a slightly higher penalty
-                    # then distances closer to 1Kls.
-                    #
-                    # Adding the three together creates a doubly-kinked curve
-                    # that ranges from ~0.5 to -1.0, with drops around x=1 and x=4,
-                    # which closely matches ksfone's intention without going into
-                    # negative numbers and causing problems when we add it to
-                    # the multiplier variable. ( 1 + -1 = 0 )
-                    #
-                    # You can see a graph of the formula here:
-                    # https://goo.gl/sn1PqQ
-                    # NOTE: The black curve is at a penalty of 0%,
-                    # the red curve at a penalty of 100%, with intermediates at
-                    # 25%, 50%, and 75%.
-                    # The other colored lines show the penalty curves individually
-                    # and the teal composite of all three.
+                    connections += 1
+                    items = self.getTrades(srcStation, dstStation, srcSelling)
+                    if not items:
+                        continue
+                    trade = fitFunction(items, startCr, capacity, maxUnits)
                     
-                    def sigmoid(x):
-                        return x / (1 + abs(x))
+                    multiplier = 1.0
+                    # Calculate total K-lightseconds supercruise time.
+                    # This will amortize for the start/end stations
+                    dstSys = dest.system
+                    if goalSystem and dstSys is not goalSystem:
+                        dstGoalDist = goalDistTo(dstSys)
+                        # Biggest reward for shortening distance to goal
+                        score = 5000 * origGoalDist / dstGoalDist
+                        # bias towards bigger reductions
+                        score += 50 * srcGoalDist / dstGoalDist
+                        # discourage moving back towards origin
+                        if dstSys is not origSystem:
+                            score += 10 * (origDistTo(dstSys) - srcOrigDist)
+                        # Gain per unit pays a small part
+                        score += (trade.gainCr / trade.units) / 25
+                    else:
+                        score = trade.gainCr
+                    if lsPenalty:
+                        # [kfsone] Only want 1dp
+                        
+                        cruiseKls = int(dstStation.lsFromStar / 100) / 10
+                        # Produce a curve that favors distances under 1kls
+                        # positively, starts to penalize distances over 1k,
+                        # and after 4kls starts to penalize aggressively
+                        # http://goo.gl/Otj2XP
+                        
+                        # [eyeonus] As aadler pointed out, this goes into negative
+                        # numbers, which causes problems.
+                        # penalty = ((cruiseKls ** 2) - cruiseKls) / 3
+                        # penalty *= lsPenalty
+                        # multiplier *= (1 - penalty)
+                        
+                        # [eyeonus]:
+                        # (Keep in mind all this ignores values of x<0.)
+                        # The sigmoid: (1-(25(x-1))/(1+abs(25(x-1))))/4
+                        # ranges between 0.5 and 0 with a drop around x=1,
+                        # which makes it great for giving a boost to distances < 1Kls.
+                        #
+                        # The sigmoid: (-1-(50(x-4))/(1+abs(50(x-4))))/4
+                        # ranges between 0 and -0.5 with a drop around x=4,
+                        # making it great for penalizing distances > 4Kls.
+                        #
+                        # The curve: (-1+1/(x+1)^((x+1)/4))/2
+                        # ranges between 0 and -0.5 in a smooth arc,
+                        # which will be used for making distances
+                        # closer to 4Kls get a slightly higher penalty
+                        # then distances closer to 1Kls.
+                        #
+                        # Adding the three together creates a doubly-kinked curve
+                        # that ranges from ~0.5 to -1.0, with drops around x=1 and x=4,
+                        # which closely matches ksfone's intention without going into
+                        # negative numbers and causing problems when we add it to
+                        # the multiplier variable. ( 1 + -1 = 0 )
+                        #
+                        # You can see a graph of the formula here:
+                        # https://goo.gl/sn1PqQ
+                        # NOTE: The black curve is at a penalty of 0%,
+                        # the red curve at a penalty of 100%, with intermediates at
+                        # 25%, 50%, and 75%.
+                        # The other colored lines show the penalty curves individually
+                        # and the teal composite of all three.
+                        
+                        def sigmoid(x):
+                            return x / (1 + abs(x))
+                        
+                        boost = (1 - sigmoid(25 * (cruiseKls - 1))) / 4
+                        drop = (-1 - sigmoid(50 * (cruiseKls - 4))) / 4
+                        try:
+                            penalty = (-1 + 1 / (cruiseKls + 1) ** ((cruiseKls + 1) / 4)) / 2
+                        except OverflowError:
+                            penalty = -0.5
+                        
+                        multiplier += (penalty + boost + drop) * lsPenalty
                     
-                    boost = (1 - sigmoid(25 * (cruiseKls - 1))) / 4
-                    drop = (-1 - sigmoid(50 * (cruiseKls - 4))) / 4
-                    try:
-                        penalty = (-1 + 1 / (cruiseKls + 1) ** ((cruiseKls + 1) / 4)) / 2
-                    except OverflowError:
-                        penalty = -0.5
+                    score *= multiplier
                     
-                    multiplier += (penalty + boost + drop) * lsPenalty
-                
-                score *= multiplier
-                
-                dstID = dstStation.ID
-                try:
-                    # See if there is already a candidate for this destination
-                    btd = bestToDest[dstID]
-                except KeyError:
-                    # No existing candidate, we win by default
-                    pass
-                else:
-                    bestRoute = btd[1]
-                    bestScore = btd[5]
-                    # Check if it is a better option than we just produced
-                    bestTradeScore = bestRoute.score + bestScore
-                    newTradeScore = route.score + score
-                    if bestTradeScore > newTradeScore:
-                        continue
-                    if bestTradeScore == newTradeScore:
-                        bestLy = btd[4]
-                        if bestLy <= dest.distLy:
+                    dstID = dstStation.ID
+                    try:
+                        # See if there is already a candidate for this destination
+                        btd = bestToDest[dstID]
+                    except KeyError:
+                        # No existing candidate, we win by default
+                        pass
+                    else:
+                        bestRoute = btd[1]
+                        bestScore = btd[5]
+                        # Check if it is a better option than we just produced
+                        bestTradeScore = bestRoute.score + bestScore
+                        newTradeScore = route.score + score
+                        if bestTradeScore > newTradeScore:
                             continue
-                
-                bestToDest[dstID] = (
-                    dstStation, route, trade, dest.via, dest.distLy, score
-                )
-        
-        prog.clear()
-        
+                        if bestTradeScore == newTradeScore:
+                            bestLy = btd[4]
+                            if bestLy <= dest.distLy:
+                                continue
+                    
+                    bestToDest[dstID] = (
+                        dstStation, route, trade, dest.via, dest.distLy, score
+                    )
+            
         if connections == 0:
             raise NoHopsError(
                 "No destinations could be reached within the constraints."

tradedangerous/transfers.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
-from collections import deque
 from pathlib import Path
+from urllib.parse import urlparse, unquote
+
 from .tradeexcept import TradeException
 from .misc import progress as pbar
 from . import fs
@@ -16,7 +17,7 @@ import requests
 if typing.TYPE_CHECKING:
     import os  # for PathLike
     from .tradeenv import TradeEnv
-    from typing import Optional, Union
+    from typing import Callable, Optional, Union  # noqa
 
 
 ######################################################################
@@ -38,15 +39,21 @@ def makeUnit(value):
         unitSize /= 1024
     return None
 
+
+def get_filename_from_url(url: str) -> str:
+    """ extracts just the filename from a url. """
+    return Path(unquote(urlparse(url).path)).name
+
+
 def download(
             tdenv:      TradeEnv,
             url:        str,
             localFile:  os.PathLike,
             headers:    Optional[dict] = None,
             backup:     bool = False,
-            shebang:    Optional[str] = None,
+            shebang:    Optional[Callable] = None,
             chunkSize:  int = 4096,
-            timeout:    int = 90,
+            timeout:    int = 30,
             *,
             length:     Optional[Union[int, str]] = None,
             session:    Optional[requests.Session] = None,
@@ -55,20 +62,11 @@ def download(
     Fetch data from a URL and save the output
     to a local file. Returns the response headers.
     
-    tdenv:
-        TradeEnv we're working under
-    
-    url:
-        URL we're fetching (http, https or ftp)
-    
-    localFile:
-        Name of the local file to open.
-    
-    headers:
-        dict() of additional HTTP headers to send
-    
-    shebang:
-        function to call on the first line
+    :param tdenv:       TradeEnv we're working under
+    :param url:         URL we're fetching (http, https or ftp)
+    :param localFile:   Name of the local file to open.
+    :param headers:     dict() of additional HTTP headers to send
+    :param shebang:     function to call on the first line
     """
     tdenv.NOTE("Requesting {}".format(url))
 
@@ -108,24 +106,14 @@ def download(
             tdenv.NOTE("Downloading {} {}ed data", transfer, encoding)
     tdenv.DEBUG0(str(req.headers).replace("{", "{{").replace("}", "}}"))
     
-    # Figure out how much data we have
-    if length and not tdenv.quiet:
-        progBar = pbar.Progress(length, 20)
-    else:
-        progBar = None
-    
     actPath = Path(localFile)
     fs.ensurefolder(tdenv.tmpDir)
     tmpPath = Path(tdenv.tmpDir, "{}.dl".format(actPath.name))
     
-    histogram = deque()
-    
     fetched = 0
-    lastTime = started = time.time()
-    spinner, spinners = 0, [
-        '.    ', '..   ', '...  ', ' ... ', '  ...', '   ..', '    .'
-    ]
-    with tmpPath.open("wb") as fh:
+    started = time.time()
+    filename = get_filename_from_url(url)
+    with pbar.Progress(max_value=length, width=25, prefix=filename, style=pbar.CountingBar, show=not tdenv.quiet) as prog, tmpPath.open("wb") as fh:
         for data in req.iter_content(chunk_size=chunkSize):
             fh.write(data)
             fetched += len(data)
@@ -134,29 +122,11 @@ def download(
                 tdenv.DEBUG0("Checking shebang of {}", bangLine)
                 shebang(bangLine)
                 shebang = None
-            if progBar:
-                now = time.time()
-                deltaT = max(now - lastTime, 0.001)
-                lastTime = now
-                if len(histogram) >= 15:
-                    histogram.popleft()
-                histogram.append(len(data) / deltaT)
-                progBar.increment(
-                    len(data),
-                    postfix=lambda value, goal: \
-                            " {:>7s} [{:>7s}/s] {:>3.0f}% {:1s}".format(
-                            makeUnit(value),
-                            makeUnit(sum(histogram) / len(histogram)),
-                            (fetched * 100. / length),
-                            spinners[spinner]
-                        )
-                )
-                if deltaT > 0.200:
-                    spinner = (spinner + 1) % len(spinners)
+            if prog:
+                prog.increment(len(data))
         tdenv.DEBUG0("End of data")
+
     if not tdenv.quiet:
-        if progBar:
-            progBar.clear()
         elapsed = (time.time() - started) or 1
         tdenv.NOTE(
             "Downloaded {} of {}ed data {}/s",
@@ -197,17 +167,13 @@ def get_json_data(url, *, timeout: int = 90):
         jsData = req.content
     else:
         totalLength = int(totalLength)
-        progBar = pbar.Progress(totalLength, 25)
+        filename = get_filename_from_url(url)
+        progBar = pbar.Progress(totalLength, 25, prefix=filename)
+
         jsData = bytes()
         for data in req.iter_content():
             jsData += data
-            progBar.increment(
-                len(data),
-                postfix=lambda value, goal: \
-                " {}/{}".format(
-                    makeUnit(value),
-                    makeUnit(goal),
-            ))
+            progBar.increment(len(data))
         progBar.clear()
     
     return json.loads(jsData.decode())

tradedangerous/version.py

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

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

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

@@ -1,27 +1,27 @@
 trade.py,sha256=Skqy0bC47g1KujuYrVwa3T8AfJ9NoLLOZcVjjxJ2daQ,1769
 tradegui.py,sha256=q2HdIdoyeLUpeF2X0hVIGn7sU6T4zOzq1HN0zGvZdyE,788
 tradedangerous/__init__.py,sha256=bwsbE_GyCNsuyGDKnfXAg0RD-ewsWHliySJ5QfCK7h8,1166
-tradedangerous/cache.py,sha256=N7z1e2fov003wIh_aHkw1pdByKDPt3FkDZiH_EEPdMc,36080
+tradedangerous/cache.py,sha256=0Pyvh5XYrNzC7Pj7KzDIioI-Xhydx7JGUXZGcrO1org,37225
 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=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/edscupdate.py,sha256=To7hL2FuR4A7A4gJfvow_jGl6mlD7aP-Drv1rEkwy-I,17310
+tradedangerous/edsmupdate.py,sha256=9IANIASA8ZKnZsLPBRAh7IArDRsa0jriL2UwjqKJ1fI,14928
+tradedangerous/formatting.py,sha256=R8GX2Zya1xazLOOBIWlLqUEjIESZJO41UlvhZDbyY4Q,6908
+tradedangerous/fs.py,sha256=41yUdriBSv-rinGEmxjBTKyKH4-RA2bIO4sKCMIwvUA,3861
 tradedangerous/gui.py,sha256=DFsF5zATr-lyJShL6t5kPKvcLLJYkICurzBz0WBa-oQ,43676
 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=xL7fwdbVrb05-zWNH-9nyYBDtV4bfUfP7OBx3NMBc34,11749
 tradedangerous/tools.py,sha256=pp-4WtA12SVaaQHFJFOMTF7EDFRCU2mQeOhC4xoXmEk,1331
-tradedangerous/tradecalc.py,sha256=A7peEMiaCjlwFvReSq3E7_Ar0shUoFedQi83ZmOc7uY,42075
+tradedangerous/tradecalc.py,sha256=GlJZ9UwkoQUoayqUGVwlefhQvs-1SxYB5Y6Vkr31nSg,42753
 tradedangerous/tradedb.py,sha256=mitKkS4MczivDK_K7A-IC94hkObUmGWFhwIrh_ts9qw,72282
 tradedangerous/tradeenv.py,sha256=o956HN7-7uzIcNi9vI4zh-L1z5jwBioVARyhhiAlsRQ,11885
 tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk,368
-tradedangerous/transfers.py,sha256=NdPNzrpa5YuZeo2wBK6X8sy1VyFUaAXb0EtASyVXsuQ,6885
+tradedangerous/transfers.py,sha256=s0fRWDZCsL-VYm5E4ceTMKcUelcvzcOUelsfg6TjYI8,6000
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=CIRQudWzY9CP4niZ5hY2VqrxXsnZnG_3vA77k9Otwo8,646
+tradedangerous/version.py,sha256=Lf6tzJrBdghRB7hsnuyfhzDziiCbZ8EhcNAAsCHjmVs,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
@@ -34,7 +34,7 @@ tradedangerous/commands/local_cmd.py,sha256=tf7YMGX-vaVGNO2lvQF9EvQEN3Wj7DE9-NTS
 tradedangerous/commands/market_cmd.py,sha256=Ig16zDuksywiiF3Exps6UuM-ZhqgbXqkW6Lu2s9xQf0,5411
 tradedangerous/commands/nav_cmd.py,sha256=v245L1MxiUliITUgvWeeB4cL4UdkNO8n0CiP6ztrV54,8460
 tradedangerous/commands/olddata_cmd.py,sha256=6rpPRRs4kLhV9c0sogmctVAjta7v0L0Deu999spXY2s,7888
-tradedangerous/commands/parsing.py,sha256=RUnCnML59IOXYI6jEljE5lrE_WKcDmFFqKF1JVJg9A0,6725
+tradedangerous/commands/parsing.py,sha256=_AoC41kXFWlHMHADZY8QqVmeyRNT6_VapoFhj7sSflY,6595
 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
@@ -58,11 +58,11 @@ tradedangerous/misc/edsc.py,sha256=SN_da9qZ7H8ozibyhoFVB8nAvwBDPF3Z_PMlt70J2Ro,1
 tradedangerous/misc/edsm.py,sha256=equDwO1SY3QTsoJIb3LjiHes4C8Dejaap_TMpYlCm8o,2910
 tradedangerous/misc/importeddbstats.py,sha256=iLAcrFzdwiMm_MnUuaHcT_xGgZF8pfEEd1qljhhWJTU,1787
 tradedangerous/misc/prices-json-exp.py,sha256=Fpm62ugP35ZBqnRs6ekYfS3GoDFYmvLD3b3SFJfaMOI,4944
-tradedangerous/misc/progress.py,sha256=NKvKP1OSCTpItc1CNxDuEH2A1oGJ6aWSyCdPSAjsG9E,2120
+tradedangerous/misc/progress.py,sha256=pWBHPA8Xc5uzjufAwCn7mkTrz7UbwSpY46o2BgEi7HU,7058
 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=EOqUAwbIpQztbhLstFkgOdIgVFCyquSGYmtRr_6PYDY,21931
+tradedangerous/plugins/eddblink_plug.py,sha256=V58hRCfjeZ7t3aAIgdzbS5VdO5l39A-9_QKbY7KNJ48,21209
 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
@@ -70,10 +70,10 @@ tradedangerous/plugins/spansh_plug.py,sha256=FiIS9cN2_8VKDrAj8yvkdy1NIni2kEc0ECq
 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=VlQK7QGtEi2brGtWaIZDvKmbJ_vLocD4CJ8h_6kKptU,7808
-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,,
+tradedangerous/templates/TradeDangerous.sql,sha256=S9TH1bp0dfJLv90T6lTQ-TD8w8YGEZRMyUn8J1W4G3k,9330
+tradedangerous-11.3.0.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-11.3.0.dist-info/METADATA,sha256=ctub0LqxjEV1nSRKjKmOwkDrXNnEmGtfae8X8vx87Jk,4435
+tradedangerous-11.3.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-11.3.0.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
+tradedangerous-11.3.0.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
+tradedangerous-11.3.0.dist-info/RECORD,,