Share logic between compact and long formatting.

Author: drn

format/compact.go

@@ -3,7 +3,6 @@ package format
 import (
   "fmt"
   "strings"
-  "github.com/fatih/color"
   "github.com/drn/nerd-ls/node"
   "github.com/drn/nerd-ls/util"
 )
@@ -64,8 +63,3 @@ func compactDisplay(nodes []node.Node, width int) {
     fmt.Println()
   }
 }
-
-func nodeColor(node node.Node) *color.Color {
-  if !node.IsDir { return color.New(color.FgWhite) }
-  return color.New(color.FgCyan, color.Bold)
-}

format/long.go

@@ -143,12 +143,7 @@ func colorize(mode rune, color *color.Color) string {
 }
 
 func formatName(node node.Node) string {
-  var baseColor *color.Color
-  if !node.IsDir {
-    baseColor = color.New(color.FgWhite)
-  } else {
-    baseColor = color.New(color.FgCyan, color.Bold)
-  }
+  baseColor := nodeColor(node)
 
   if node.Symlink == "" { return baseColor.Sprintf(" %s", node.Name) }
 

format/root.go

@@ -0,0 +1,11 @@
+package format
+
+import (
+  "github.com/fatih/color"
+  "github.com/drn/nerd-ls/node"
+)
+
+func nodeColor(node node.Node) *color.Color {
+  if !node.IsDir { return color.New(color.FgWhite) }
+  return color.New(color.FgCyan, color.Bold)
+}