Fix bugs in boot_screen

SoftGeekRO · May 19, 2021 · fa74b1f · fa74b1f
1 parent 32fa719
commit fa74b1f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Screens.py b/Screens.py
@@ -452,7 +452,7 @@ def psutil_boot_time(self):
         boot_time_delta = datetime.datetime.now() - datetime_boot_time
 
         l1 = "Boot since".format()
-        l2 = '{}'.format(human_time(second=int(boot_time_delta.seconds)))
+        l2 = '{}'.format(human_time(seconds=int(boot_time_delta.seconds)))
         return (l1, 0), (l2, 1)
 
 

diff --git a/tools.py b/tools.py
@@ -128,7 +128,7 @@ def make_nice(value: float, unit: str = 's'):
 
 def human_time(*args, **kwargs):
     secs = float(datetime.timedelta(*args, **kwargs).total_seconds())
-    units = [("D", 86400), ("H", 3600), ("min.e", 60), ("sec.", 1)]
+    units = [("D", 86400), ("H", 3600), ("min", 60), ("", 1)]
     parts = []
     for unit, mul in units:
         if secs / mul >= 1 or mul == 1:
@@ -137,7 +137,7 @@ def human_time(*args, **kwargs):
                 secs -= n * mul
             else:
                 n = secs if secs != int(secs) else int(secs)
-            parts.append("%s %s%s" % (n, unit, "" if n == 1 else "s"))
+            parts.append("%s%s%s" % (n, unit, "" if n == 1 else "s"))
     return ",".join(parts)