fix 1G => 1.9G format output

Author: inv2004

src/ttop/format.nim

@@ -44,10 +44,8 @@ proc formatS*(a, b: int, delim = " / "): string =
   else:
     if a < 1024 and b < 1024:
       fmt "{n1.int} {s1}{delim}{n2.int} {s2}"
-    elif a < 1024:
-      fmt "{n1.int} {s1}{delim}{n2:.1f} {s2}"
     else:
-      fmt "{n1:.1f} {s1}{delim}{n2.int} {s2}"
+      fmt "{n1:.1f} {s1}{delim}{n2:.1f} {s2}"
 
 proc formatSI*(a, b: int, delim = "/"): string =
   let (n1, s1) = formatSPair(a)

src/ttop/procfs.nim

@@ -618,18 +618,14 @@ proc group*(pidsInfo: PidsTable, kernel: bool): PidsTable =
     inc i
 
 when isMainModule:
-  template t(body: untyped): untyped =
-    try:
-      body
-    except CatchableError, Defect:
-      raise getCurrentException()
-
-  proc f(): int =
-    t:
-      100
-
-  echo f()
-  # let pi = group(fi.pidsInfo)
-  # fi.pidsInfo.clear()
-  # for o, pi in pi:
-    # echo o, ": ", pi.name
+  import format
+  let t = parseSize("2009312 kB")
+  let f = parseSize("1147380 kB")
+  let a = parseSize("1607008 kB")
+  let b = parseSize("21344 kB")
+  let c = parseSize("625488 kB")
+  echo formatD(a, t)
+  echo formatD(f, t)
+  echo formatD(f + b , t)
+  echo formatD(f + c , t)
+  echo formatD(f + b + c , t)

ttop.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version = "1.5.6"
+version = "1.5.7"
 author = "inv2004"
 description = "Monitoring tool with historical snapshots and alerts"
 license = "MIT"