Merge pull request #6 from fox0430/devel

v0.3.2

README.md

@@ -6,9 +6,9 @@ nyat is cat clone. Written in nim. (=^・・^=)
 
 -n    Display line number
 
--b    number nonempty output lines
+-b    Number nonempty output lines
 
--s    suppress repeated empty output lines
+-s    Suppress repeated empty output lines
 
 ## Installation
 ```sh

src/nyat.nim

@@ -1,4 +1,4 @@
-import os, unicode, sequtils, posix
+import os, unicode, sequtils, posix, strutils
 
 type
   FileNameAndOption = tuple[fileNameList: seq[string], options: seq[char]]
@@ -69,32 +69,37 @@ proc setBufferList(fileNameList: seq[string]): seq[seq[string]] =
   for i in 0 ..< fileNameList.len:
     result.add(openFile(fileNameList[i]))
 
+proc setLineNumber(digit, currentNumber: int): string =
+  return " ".repeat(2) & $currentNumber & " ".repeat(digit - ($(currentNumber)).len + 1)
+
 proc displayBuffer(buffer: seq[string], option: OptionList) =
     var
       lineNumber = 1
       writeLine = ""
       ignoreLine = false
 
+    let lineNumberDigit = ($buffer.len).len
+
     for i in 0 ..< buffer.len:
       if i < buffer.high and option.squeezeBlank:
         if buffer[i] == "" and buffer[i + 1] == "":
           ignoreLine = true
 
       if option.numberNoBlank:
         if buffer[i] != "":
-          writeLine = "  " & $lineNumber & "  "
+          writeLine = setLineNumber(lineNumberDigit, lineNumber)
           lineNumber.inc
         else:
           writeLine = ""
-
-      if option.setLineNumber:
-          writeLine = "  " & $lineNumber & "  "
+      elif option.setLineNumber:
+          writeLine = setLineNumber(lineNumberDigit, lineNumber)
           lineNumber.inc
 
       if ignoreLine == false:
-        echo writeLine & buffer[i]
+        echo $writeLine & buffer[i]
 
       ignoreLine = false
+      writeLine = ""
 
 when isMainModule:
   if commandLineParams().len == 0: