Introduce list package.

Author: drn

list/root.go

@@ -0,0 +1,64 @@
+package list
+
+import (
+  "os"
+  "log"
+  "io/ioutil"
+  "github.com/drn/nerd-ls/node"
+)
+
+// List - Contains all info necessary to render list of nodes
+type List struct {
+  Nodes []node.Node
+  MaxLength int
+  MaxSize int
+}
+
+// Fetch - Fetch List representing current directory
+func Fetch(options map[string]bool) List {
+  files, err := ioutil.ReadDir(".")
+  if err != nil { log.Fatal(err) }
+
+  nodes := make([]node.Node, len(files)+2)
+
+  index := 0
+  if options["all"] {
+    file, _ := os.Stat(".")
+    nodes[0] = node.New(file)
+    file, _ = os.Stat("..")
+    nodes[1] = node.New(file)
+    index += 2
+  }
+
+  for i:=0; i<len(files); i++ {
+    if !options["all"] && []rune(files[i].Name())[0] == '.' { continue }
+    nodes[index] = node.New(files[i])
+    index++
+  }
+
+  nodes = nodes[:index]
+
+  return List{
+    nodes,
+    maxLength(nodes),
+    maxSize(nodes),
+  }
+}
+
+func maxLength(nodes []node.Node) int {
+  maxLength := 0
+  for _, node := range nodes {
+    length := node.Length
+    if maxLength < length { maxLength = length }
+  }
+  return maxLength
+}
+
+func maxSize(nodes []node.Node) int {
+  maxSize := 0
+  for _, node := range nodes {
+    size := node.Size
+    if maxSize < size { maxSize = size }
+  }
+  return maxSize
+}

main.go

@@ -5,7 +5,7 @@ import (
   "fmt"
   "flag"
   "strings"
-  "github.com/drn/nerd-ls/node"
+  "github.com/drn/nerd-ls/list"
   "golang.org/x/crypto/ssh/terminal"
 )
 
@@ -26,7 +26,7 @@ var long = flag.Bool(
 func main() {
   flag.Parse()
 
-  nodes := node.Fetch(
+  nodes := list.Fetch(
     map[string]bool{
       "all": *all,
       "long": *long,
@@ -40,43 +40,33 @@ func main() {
   }
 }
 
-func displayLong(nodes []node.Node) {
-  for _, node := range nodes {
+func displayLong(list list.List) {
+  for _, node := range list.Nodes {
     fmt.Printf("%s  %d %s\n", node.Mode, node.Size, node.Name)
   }
 }
 
-func displayCompact(nodes []node.Node) {
+func displayCompact(list list.List) {
   width := width()
   count := 0
-  maxLength := maxLength(nodes)
 
   padding := 0
-  for _, node := range nodes {
+  for _, node := range list.Nodes {
     if padding > 0 { fmt.Print(strings.Repeat(" ", padding)) }
 
-    count += maxLength
+    count += list.MaxLength
     if count >= width {
       fmt.Println()
-      count = maxLength
+      count = list.MaxLength
     }
 
-    padding = maxLength - node.Length
+    padding = list.MaxLength - node.Length
 
     fmt.Print(node.Name)
   }
   fmt.Println()
 }
 
-func maxLength(nodes []node.Node) int {
-  maxLength := 0
-  for _, node := range nodes {
-    size := node.Length
-    if maxLength < size { maxLength = size }
-  }
-  return maxLength
-}
-
 func width() int {
   width, _, err := terminal.GetSize(int(os.Stdout.Fd()))
   if err != nil {

node/root.go

@@ -2,9 +2,7 @@ package node
 
 import (
   "os"
-  "log"
   "fmt"
-  "io/ioutil"
   "github.com/fatih/color"
   "github.com/drn/nerd-ls/icon"
 )
@@ -17,32 +15,8 @@ type Node struct {
   Size int
 }
 
-// Fetch - Fetch nodes in currently directory
-func Fetch(options map[string]bool) []Node {
-  files, err := ioutil.ReadDir(".")
-  if err != nil { log.Fatal(err) }
-
-  nodes := make([]Node, len(files)+2)
-
-  index := 0
-  if options["all"] {
-    file, _ := os.Stat(".")
-    nodes[0] = new(file)
-    file, _ = os.Stat("..")
-    nodes[1] = new(file)
-    index += 2
-  }
-
-  for i:=0; i<len(files); i++ {
-    if !options["all"] && []rune(files[i].Name())[0] == '.' { continue }
-    nodes[index] = new(files[i])
-    index++
-  }
-
-  return nodes[:index]
-}
-
-func new(file os.FileInfo) Node {
+// New - Initializes Node with os.FileInfo
+func New(file os.FileInfo) Node {
   name := rawName(file)
   length := len([]rune(name))
   name = colorize(file, name)