Restore thread joining, various style fixes

Author: ZoomRmc

src/file_size_distribution.nim

@@ -1,7 +1,8 @@
 import os, strutils, math, terminal, fusion/btreetables
 
-const HistogramBlocks = ["█","▉","▊","▋","▌","▍","▎","▏"]
-const ProgressChars = ["▀", "▜", "▐", "▟", "▄", "▙", "▌", "▛"]
+const 
+  HistogramBlocks = ["█","▉","▊","▋","▌","▍","▎","▏"]
+  ProgressChars = ["▀", "▜", "▐", "▟", "▄", "▙", "▌", "▛"]
 
 type
   Stat = object
@@ -10,7 +11,6 @@ type
     maxSize: BiggestInt
     minSize: BiggestInt
 
-type
   FsStat = object
     stat: Stat
     table: CountTable[BiggestInt]
@@ -29,7 +29,7 @@ func initFsStat(): FsStat =
     table: initCountTable[BiggestInt](1024)
   )
 
-template incStatsTmpl(s: Stat; size: BiggestInt) =
+proc addFile(s: var Stat; size: BiggestInt) =
   s.minSize = min(s.minSize, size)
   s.maxSize = max(s.maxSize, size)
   s.totalSize += size
@@ -49,13 +49,15 @@ func getLog2Stats(fs: FsStat): seq[Stat] =
           0
         else:
           toInt(floor(log2(toBiggestFloat(size)) / 2)) + 1    
-      incStatsTmpl(result[bin], size)
+      addFile(result[bin], size)
 
 func drawBar(num, maxNum: Natural; width: Natural): string =
-  let f = toFloat(num) / toFloat(maxNum) * toFloat(width)
-  let full = toInt(floor(f))
-  let tail = f - trunc(f)
-  var partial = toInt(round(7.0*tail))
+  let 
+    f = toFloat(num) / toFloat(maxNum) * toFloat(width)
+    full = toInt(floor(f))
+    tail = f - trunc(f)
+  var 
+    partial = toInt(round(7.0*tail))
   if partial == 0 and full == 0 and num > 0:
     partial = 1
   for _ in 1..full:
@@ -71,23 +73,25 @@ proc progressUpdate(mainThreadBusy: ptr bool) {.thread.} =
       sleep(250)
 
 proc walkFs(path: string): FsStat =
-  var fs = initFsStat()
-  var check = 0
-  var thProgress: Thread[ptr bool]
-  var mainThreadBusy = true
+  result = initFsStat()
+  var 
+    check = 0
+    thProgress: Thread[ptr bool]
+    mainThreadBusy = true
   createThread(thProgress, progressUpdate, addr mainThreadBusy)
   for file in walkDirRec(path, {pcFile}, {pcDir}):
-    let fInfo = getFileInfo(file, false)
-    let fSize = fInfo.size
-    fs.stat.filesSeen.inc()
+    let 
+      fInfo = getFileInfo(file, false)
+      fSize = fInfo.size
+    result.stat.filesSeen.inc()
     check.inc()
-    fs.stat.totalSize += fSize
-    fs.stat.maxSize = max(fs.stat.maxSize,fSize)
-    fs.stat.minSize = min(fs.stat.minSize,fSize)
-    fs.table.inc(fSize)
+    result.stat.totalSize += fSize
+    result.stat.maxSize = max(result.stat.maxSize,fSize)
+    result.stat.minSize = min(result.stat.minSize,fSize)
+    result.table.inc(fSize)
   mainThreadBusy = false
+  joinThread(thProgress)
   stdout.write("\r")
-  result = move(fs)
 
 when isMainModule:
   var startPath = if paramCount() > 0:
@@ -96,18 +100,19 @@ when isMainModule:
       getCurrentDir()
   let startInfo = getFileInfo(startPath)
   if startInfo.kind != pcDir and not startInfo.permissions.contains(fpUserRead):
-    echo("Error reading directory ", startPath)
-    quit()
+    quit("Error reading directory " & startPath)
   let fs = walkFs(startPath)
   echo("Files scanned: ", fs.stat.filesSeen, ", total: ", formatSize(fs.stat.totalSize))
   var stats = fs.getLog2Stats()
   echo("Stats for files by size strata; Bars: file count.")
-  var statStrSeq: seq[(string,BiggestInt)]
-  var maxNum:BiggestInt = 0
-  var maxLineLen = 0
+  var 
+    statStrSeq: seq[(string,BiggestInt)]
+    maxNum:BiggestInt = 0
+    maxLineLen = 0
   for bin, s in stats.pairs:
-    let maxSize = if s.filesSeen == 0: BiggestInt(0) else: s.maxSize
-    let line = if bin == 0:
+    let
+      maxSize = if s.filesSeen == 0: BiggestInt(0) else: s.maxSize
+      line = if bin == 0:
         format("$1: Max: $2; $3 files", [
           align(formatSize(0), 16),
           align(formatSize(maxSize), 11),