Adjust format options to map[string]int.

Author: drn

format/compact.go

@@ -8,7 +8,7 @@ import (
 )
 
 // Compact - Format listing in compact format.
-func Compact(nodes []node.Node, options map[string]bool) {
+func Compact(nodes []node.Node, options map[string]int) {
   width := util.TerminalWidth()
 
   if width == 0 {
@@ -24,7 +24,7 @@ func pipedDisplay(nodes []node.Node) {
   }
 }
 
-func compactDisplay(nodes []node.Node, width int, options map[string]bool) {
+func compactDisplay(nodes []node.Node, width int, options map[string]int) {
   // determine max node length
   maxLength := 0
   for _, node := range nodes {
@@ -33,15 +33,15 @@ func compactDisplay(nodes []node.Node, width int, options map[string]bool) {
   }
 
   lengthPerNode := maxLength + 2 // name + 2 spaces
-  if options["icon"] { lengthPerNode += 3 } // icon + 2 spaces
+  if options["icon"] == 1 { lengthPerNode += 3 } // icon + 2 spaces
   nodesPerRow := width / lengthPerNode
   nodesLength := len(nodes)
 
   for i := 0; i < nodesLength; i ++ {
     node := nodes[i]
 
     // print node
-    if !options["icon"] {
+    if options["icon"] == 0 {
       fmt.Print(nodeColor(node).Sprint(node.Name))
     } else {
       fmt.Printf(

format/long.go

@@ -13,7 +13,7 @@ import (
 )
 
 // Long - Format listing in long format.
-func Long(nodes []node.Node, options map[string]bool) {
+func Long(nodes []node.Node, options map[string]int) {
   displaySummary(nodes)
 
   // populate values
@@ -76,8 +76,8 @@ func displaySummary(nodes []node.Node) {
   )
 }
 
-func extractValues(node node.Node, options map[string]bool) []string {
-  if options["icon"] {
+func extractValues(node node.Node, options map[string]int) []string {
+  if options["icon"] == 1 {
     return []string{
       formatMode(node.Mode),
       strconv.Itoa(node.LinkCount),

format/root.go

@@ -21,11 +21,17 @@ func Display(address string, opts options.Options) {
     },
   )
 
-  formatOptions := map[string]bool{"icon": opts.Icon}
   if opts.Long {
-    Long(nodes, formatOptions)
+    Long(nodes, formatOptions(opts))
   } else {
-    Compact(nodes, formatOptions)
+    Compact(nodes, formatOptions(opts))
+  }
+}
+
+func formatOptions(opts options.Options) map[string]int {
+  icon := 0; if opts.Icon { icon = 1 }
+  return map[string]int{
+    "icon": icon,
   }
 }