Move format switching to format package.

format/root.go

@@ -4,11 +4,31 @@ import (
   "regexp"
   "github.com/fatih/color"
   "github.com/drn/nerd-ls/node"
+  "github.com/drn/nerd-ls/list"
+  "github.com/drn/nerd-ls/options"
 )
 
 var errorRegex = regexp.MustCompile(`.*\.orig$`)
 var ignoreRegex = regexp.MustCompile(`^.DS_Store$`)
 
+// Display - Runs display logic based on input address and options
+func Display(address string, opts options.Options) {
+  nodes := list.Fetch(
+    address,
+    map[string]bool{
+      "all": opts.All,
+      "long": opts.Long,
+    },
+  )
+
+  formatOptions := map[string]bool{"icon": opts.Icon}
+  if opts.Long {
+    Long(nodes, formatOptions)
+  } else {
+    Compact(nodes, formatOptions)
+  }
+}
+
 func nodeColor(node node.Node) *color.Color {
   if node.Symlink != "" { return color.New(color.FgMagenta) }
   if node.IsDir { return color.New(color.FgCyan, color.Bold) }

main.go

@@ -5,15 +5,11 @@ import (
   "fmt"
   "github.com/fatih/color"
   "github.com/jessevdk/go-flags"
-  "github.com/drn/nerd-ls/list"
+  "github.com/drn/nerd-ls/options"
   "github.com/drn/nerd-ls/format"
 )
 
-var opts struct {
-  All bool `short:"a" long:"all" description:"Include directory entries whose names begin with a dot (.)"`
-  Long bool `short:"l" long:"long" description:"List in long format"`
-  Icon bool `short:"i" long:"icon" description:"Display nerd-font icons"`
-}
+var opts options.Options
 
 func main() {
   args, err := flags.ParseArgs(&opts, os.Args)
@@ -40,19 +36,6 @@ func main() {
       )
     }
 
-    nodes := list.Fetch(
-      dir,
-      map[string]bool{
-        "all": opts.All,
-        "long": opts.Long,
-      },
-    )
-
-    formatOptions := map[string]bool{"icon": opts.Icon}
-    if opts.Long {
-      format.Long(nodes, formatOptions)
-    } else {
-      format.Compact(nodes, formatOptions)
-    }
+    format.Display(dir, opts)
   }
 }

options/root.go

@@ -0,0 +1,8 @@
+package options
+
+// Options - Parsed input flags schema
+type Options struct {
+  All bool `short:"a" long:"all" description:"Include directory entries whose names begin with a dot (.)"`
+  Long bool `short:"l" long:"long" description:"List in long format"`
+  Icon bool `short:"i" long:"icon" description:"Display nerd-font icons"`
+}