tradedangerous 12.0.6__tar.gz → 12.0.8__tar.gz

{tradedangerous-12.0.6/tradedangerous.egg-info → tradedangerous-12.0.8}/PKG-INFO

@@ -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 → tradedangerous-12.0.8}/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-12.0.6 → tradedangerous-12.0.8}/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-12.0.6 → tradedangerous-12.0.8}/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-12.0.6 → tradedangerous-12.0.8}/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 → tradedangerous-12.0.8/tradedangerous.egg-info}/PKG-INFO

@@ -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