tradedangerous 12.0.6__py3-none-any.whl → 12.0.8__py3-none-any.whl

tradedangerous/plugins/eddblink_plug.py

@@ -129,7 +129,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         self.pricesPath = Path("listings.prices")
     
     def now(self):
-        return datetime.datetime.now()
+        return datetime.datetime.now().strftime('%H:%M:%S')
     
     def downloadFile(self, path):
         """
@@ -216,7 +216,7 @@ class ImportPlugin(plugins.ImportPluginBase):
             return
         
         self.tdenv.NOTE(
-            "Processing market data from {}: Start time = {}. Live = {}",
+            "Processing market data from {}: Start time = {}, Live = {}",
             listings_file, self.now(), from_live
         )
         

tradedangerous/plugins/spansh_plug.py

@@ -2025,7 +2025,7 @@ class ImportPlugin(plugins.ImportPluginBase):
                         commodity_csv = files.get("commodity")
                     if commodity_csv and Path(commodity_csv).exists():
                         with open(commodity_csv, "r", encoding="utf-8", newline="") as fh2:
-                            rd2 = _csv.DictReader(fh2)
+                            rd2 = csv.DictReader(fh2)
                             k2_name = _kwant(rd2.fieldnames, "name","commodity","commodityname","product")
                             k2_cat  = _kwant(rd2.fieldnames, "category","categoryname")
                             if k2_name and k2_cat:

tradedangerous/transfers.py

@@ -26,18 +26,29 @@ if typing.TYPE_CHECKING:
 class HTTP404(TradeException):
     pass
 
-def makeUnit(value):
+
+def makeUnit(value: float) -> str:
+    num, unit = split_unit(value)
+    return f"{num}{unit}"
+
+
+def split_unit(value: float) -> tuple[str, str]:
     """
-    Convert a value in bytes into a Kb, Mb, Gb etc.
+    Split a byte size into a (number_str, unit_str) tuple.
+    Used when you need to colour or format the numeric part separately.
+
+    Example:
+        >>> split_unit(30200000)
+        ('28.8', 'MB')
     """
-    
-    units = [ 'B ', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ]
-    unitSize = int(value)
-    for unit in units:
-        if unitSize <= 640:
-            return "{:>5.01f}{}".format(unitSize, unit)
-        unitSize /= 1024
-    return None
+    units = ["B", "KB", "MB", "GB", "TB"]
+    n = float(value)
+    i = 0
+    while n >= 1024.0 and i < len(units) - 1:
+        n /= 1024.0
+        i += 1
+    num_str = f"{n:.1f}" if i > 0 else f"{int(n)}"
+    return num_str, units[i]
 
 
 def get_filename_from_url(url: str) -> str:
@@ -128,11 +139,13 @@ def download(
     
     if not tdenv.quiet:
         elapsed = (time.time() - started) or 1
+        num1, unit1 = split_unit(fetched)
+        num2, unit2 = split_unit(fetched / elapsed)
         tdenv.NOTE(
-            "Downloaded {} of {}ed data {}/s",
-            makeUnit(fetched), encoding,
-            makeUnit(fetched / elapsed)
+            f"Downloaded [cyan]{num1}[/]{unit1} of {encoding}ed data "
+            f"[cyan]{num2}[/]{unit2}/s"
         )
+
     
     fs.ensurefolder(actPath.parent)
     

tradedangerous/version.py

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

{tradedangerous-12.0.6.dist-info → tradedangerous-12.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tradedangerous
-Version: 12.0.6
+Version: 12.0.8
 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-12.0.6.dist-info → tradedangerous-12.0.8.dist-info}/RECORD

@@ -18,9 +18,9 @@ tradedangerous/tradecalc.py,sha256=LA37VAaVS8lSRW1Ydmo28R9FmFwhjoieOMG6KxVtn9A,4
 tradedangerous/tradedb.py,sha256=s1ZFK1ZmJz1_EBdIBdW0IBeWNoT-UP0j1JhBxIFQvws,79215
 tradedangerous/tradeenv.py,sha256=FrKAqFQQO5N0jrld9Ie1Tw23PoXxVBpA85n9RyEw2xg,12338
 tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk,368
-tradedangerous/transfers.py,sha256=t_0Sjr4FI9lhIPwyPOXdR8d97bE611ujbKK4ioWShm0,6024
+tradedangerous/transfers.py,sha256=mx5bidC8g67ShP3G-1IoWcXjDgMOHH35Kw6qUROcP4Y,6363
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=uaEwTQs47OHeZkPtDIDpCZwaImnOqfXNJn3Xwx4Wkto,646
+tradedangerous/version.py,sha256=2TUHZgKzIdGYfEB7HvkeIqcgKAxuuDubL1n-Ekw5WD4,646
 tradedangerous/commands/TEMPLATE.py,sha256=seMXDN_Nf_Rvj_5BivI-0yhVT6W9iRDihr5yo8kr5qw,2069
 tradedangerous/commands/__init__.py,sha256=UvcWgcr_PVScbJ6R83iaUb2_4Ttmft85HYexTFo7FwU,9171
 tradedangerous/commands/buildcache_cmd.py,sha256=WwDRLcVGCWZSM9x2jKpXXj2QRt5RLkvrcHzmZ8UCI_s,3346
@@ -68,16 +68,16 @@ tradedangerous/misc/prices-json-exp.py,sha256=Fpm62ugP35ZBqnRs6ekYfS3GoDFYmvLD3b
 tradedangerous/misc/progress.py,sha256=QwWgbbhAuMB7LG0o-jy7WxN1uhLHtN0FwKkV314ulrA,7170
 tradedangerous/plugins/__init__.py,sha256=TL-OIptlqNENKhoFqkFeBJn_vSw8L0pVaDJgjhaTj7A,7860
 tradedangerous/plugins/edcd_plug.py,sha256=JuDtuEM_mN9Sz2H09-qYizM-9N3cuNjgvQy7Y-wHwKw,14412
-tradedangerous/plugins/eddblink_plug.py,sha256=FsLcn6T4kmIXDKnJ1qFIyMBpOagCF2mSDC72E9GyBQI,20381
+tradedangerous/plugins/eddblink_plug.py,sha256=oHQi0TUK6mdGFNCEIh6YVXy2tielwsSslT0AGvDrWVA,20402
 tradedangerous/plugins/edmc_batch_plug.py,sha256=rrP_lFFxWsba8DPEo0WF2EdCiMoRC7tCT8z62MIvtIo,4173
-tradedangerous/plugins/spansh_plug.py,sha256=t1NiKtgrLkZmjy8CzCqIWWWcT5eqN2Mkx-fNzGfaU8Y,110834
+tradedangerous/plugins/spansh_plug.py,sha256=IROvg7A3s9pYgr0Dcx0NaVVAkejaij0wqWPH3xNeeEQ,110833
 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=pCw2Js8GQniqAWC6N3SL-ujyqlLYCeR2-SI-qhk6VsI,9336
-tradedangerous-12.0.6.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-12.0.6.dist-info/METADATA,sha256=9-s3CmTSf2q4Gk41J8aimrAw4NxOFjzOX8cprjaOgLk,4873
-tradedangerous-12.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tradedangerous-12.0.6.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
-tradedangerous-12.0.6.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
-tradedangerous-12.0.6.dist-info/RECORD,,
+tradedangerous-12.0.8.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-12.0.8.dist-info/METADATA,sha256=WDIeVtAbL5OGPRuUFJXabQ6DG-bkOO6JLk-kgS_dCIc,4873
+tradedangerous-12.0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tradedangerous-12.0.8.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
+tradedangerous-12.0.8.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
+tradedangerous-12.0.8.dist-info/RECORD,,