Update for console_progress version, extract CLI constants.

src/main/nim/cliconstants.nim

@@ -0,0 +1,63 @@
+const VERSION* = "1.4.6"
+
+const USAGE* = """
+Usage:
+  treediff <left> [<right>] [options]
+  treediff (-h | --help)
+  treediff (-V | --version)
+
+  <left> and <right> represent paths to directory roots to be compared. If one
+  of these paths points to a file instead of a directory, treediff assumes that
+  the file represents a saved directory analysis to be loaded in place of a
+  directory to compare. For example:
+
+      treediff /path/to/dir /path/to/output.json
+
+  will analyze the directory tree at '/path/to/dir' to create the left-side
+  analysis and load a pre-existing analysis from '/path/to/output.json' as the
+  right-side analysis.
+
+Options:
+  -h --help       Show this usage information.
+  -V --version    Show the program version.
+  -v --verbose    Enable verbose output.
+  -q --quiet      Suppress all output and error messages except for the
+                  progress indicator.
+  -Q --very-quiet Suppress all output and error messages includeing the
+                  progress indicator.
+
+  -1 --save-left <left_out>   Save the left analysis to <left_out> (will be
+                              formatted as JSON)
+  -2 --save-right <right_out> Save the right analysis to <right_out> (will be
+                              formatted as JSON)
+
+  -s --same
+  -S --exclude-same
+
+      Show or hide information about files which are the same in both trees.
+
+  -c --content-mismatch
+  -C --exclude-content-mismatch
+
+      Show or hide information about files whose relative paths are the same
+      in both trees but whose contents differ.
+
+  -p --path-mismatch
+  -P --exclude-path-mismatch
+
+      Show or hide information about files whose contents are the same in both
+      trees but whose relative paths differ.
+
+  -l --left-only
+  -L --exclude-left-only
+
+      Show or hide information about files which are found only in the left
+      tree.
+
+  -r --right-only
+  -R --exclude-right-only
+
+      Show or hide information about files which are found only in the right
+      tree.
+
+"""

src/main/nim/incremental_md5.nim

@@ -1,36 +1,32 @@
-import md5
+import md5, streams
 import os
 
 proc fileToMD5*(filename: string) : string =
 
-  const blockSize: int = 8192
+  const blockSize: int = 8192 # read files in 8KB chunnks
   var
     c: MD5Context
     d: MD5Digest
-    f: File
+    fs: FileStream
-    bytesRead: int = 0
+    buffer: string
-    buffer: array[blockSize, char]
-    byteTotal: int = 0
 
   #read chunk of file, calling update until all bytes have been read
   try:
-    f = open(filename)
+    fs = filename.open.newFileStream
 
     md5Init(c)
-    bytesRead = f.readBuffer(buffer.addr, blockSize)
+    buffer = fs.readStr(blockSize)
 
-    while bytesRead > 0:
+    while buffer.len > 0:
-      byteTotal += bytesRead
+      md5Update(c, buffer.cstring, buffer.len)
-      md5Update(c, buffer, bytesRead)
+      buffer = fs.readStr(blockSize)
-      bytesRead = f.readBuffer(buffer.addr, blockSize)
 
     md5Final(c, d)
 
-  except IOError:
+  except IOError: echo("File not found.")
-    echo("File not found.")
   finally:
-    if f != nil:
+    if fs != nil:
-      close(f)
+      close(fs)
 
   result = $d
 

src/main/nim/treediff.nim

@@ -6,6 +6,7 @@
 import os, tables, streams, sequtils, strutils, docopt, marshal
 import incremental_md5, console_progress
 
+import ./cliconstants
 
 
 type
@@ -20,7 +21,7 @@ type
 proc newProgressWrapper*(outFile = stdout, verbosity = normal): ProgressWrapper =
   ## Create a new ProgressWrapper for the given verbosity.
   if verbosity > very_quiet:
-    result = (impl: newProgress(outFile, 0), verbosity: verbosity)
+    result = (impl: newProgress(0, outFile), verbosity: verbosity)
   else: result = (impl: nil, verbosity: verbosity)
 
 proc init(p: ProgressWrapper, root: string, fileCount: int): void =
@@ -30,7 +31,7 @@ proc init(p: ProgressWrapper, root: string, fileCount: int): void =
 
 proc update(p: ProgressWrapper, count: int, file: string): void =
   if p.verbosity > very_quiet:
-    p.impl.updateProgress(count, file[(file.high - 15)..file.high])
+    p.impl.updateProgress(count, file[max(file.high - 15, 0)..file.high])
 
 proc finish(p: ProgressWrapper): void =
   if p.verbosity > very_quiet:
@@ -170,69 +171,7 @@ when isMainModule:
     stderr.writeLine("treediff: " & error)
     quit(QuitFailure)
 
-  let doc = """
+  let args = docopt(USAGE, version = "treediff " & VERSION)
-Usage:
-  treediff <left> [<right>] [options]
-  treediff (-h | --help)
-  treediff (-V | --version)
-
-  <left> and <right> represent paths to directory roots to be compared. If one
-  of these paths points to a file instead of a directory, treediff assumes that
-  the file represents a saved directory analysis to be loaded in place of a
-  directory to compare. For example:
-
-      treediff /path/to/dir /path/to/output.json
-
-  will analyze the directory tree at '/path/to/dir' to create the left-side
-  analysis and load a pre-existing analysis from '/path/to/output.json' as the
-  right-side analysis.
-  
-Options:
-  -h --help       Show this usage information.
-  -V --version    Show the program version.
-  -v --verbose    Enable verbose output.
-  -q --quiet      Suppress all output and error messages except for the
-                  progress indicator.
-  -Q --very-quiet Suppress all output and error messages includeing the
-                  progress indicator.
-
-  -1 --save-left <left_out>   Save the left analysis to <left_out> (will be
-                              formatted as JSON)
-  -2 --save-right <right_out> Save the right analysis to <right_out> (will be
-                              formatted as JSON)
-
-  -s --same
-  -S --exclude-same
-
-      Show or hide information about files which are the same in both trees.
-
-  -c --content-mismatch   
-  -C --exclude-content-mismatch
-
-      Show or hide information about files whose relative paths are the same
-      in both trees but whose contents differ.
-
-  -p --path-mismatch
-  -P --exclude-path-mismatch
-
-      Show or hide information about files whose contents are the same in both
-      trees but whose relative paths differ.
-
-  -l --left-only
-  -L --exclude-left-only
-
-      Show or hide information about files which are found only in the left
-      tree.
-
-  -r --right-only
-  -R --exclude-right-only
-
-      Show or hide information about files which are found only in the right
-      tree.
-
-"""
-
-  let args = docopt(doc, version = "treediff v1.4.3")
 
   var verbosity = normal
   if args["--quiet"]: verbosity = quiet
@@ -320,4 +259,3 @@ Options:
     if displayOptions.right:
       let rightOnly = rightAnalysis - leftAnalysis
       for fe in rightOnly: echo "right only: ", fe.relPath
-

treediff.nimble

@@ -1,5 +1,5 @@
 # Package
-version       = "1.4.3"
+version       = "1.4.6"
 author        = "Jonathan Bernard (jdb@jdb-labs.com)"
 description   = "Utility to generate diffs of full directory trees."
 license       = "BSD"
@@ -7,4 +7,11 @@ bin           = @["treediff"]
 srcDir        = "src/main/nim"
 
 # Dependencies
-requires: @["nim >= 0.13.0", "docopt >= 0.1.0", "console_progress >= 1.2.1"]
+requires: @["nim >= 1.0.4", "docopt >= 0.6.8"]
+
+# Dependencies from git.jdb-software.com/jdb/nim-packages
+requires: @["console_progress >= 1.2.2"]
+requires "https://git.jdb-software.com/jdb/update-nim-package-version.git"
+
+task updateVersion, "Update the version of this package.":
+  exec "update_nim_package_version treediff 'src/main/nim/cliconstants.nim'"