Show or hide specific columns with --output

Author: muesli

README.md

@@ -60,6 +60,13 @@ Sort the output:
 Valid keys are: `mountpoint`, `size`, `used`, `avail`, `usage`, `inodes`,
 `inodes_used`, `inodes_avail`, `inodes_usage`, `type`, `filesystem`.
 
+Show or hide specific columns:
+
+    duf --output mountpoint,size,usage
+
+Valid keys are: `mountpoint`, `size`, `used`, `avail`, `usage`, `inodes`,
+`inodes_used`, `inodes_avail`, `inodes_usage`, `type`, `filesystem`.
+
 If you prefer your output as JSON:
 
     duf --json

main.go

@@ -22,14 +22,15 @@ var (
 	hideLoops   = flag.Bool("hide-loops", true, "hide loop devices")
 	hideBinds   = flag.Bool("hide-binds", true, "hide bind mounts")
 
-	sortBy = flag.String("sort", "mountpoint", "sort output by: mountpoint, size, used, avail, usage, type, filesystem")
+	output = flag.String("output", "", "output fields: "+strings.Join(columnIDs(), ", "))
+	sortBy = flag.String("sort", "mountpoint", "sort output by: "+strings.Join(columnIDs(), ", "))
 	width  = flag.Uint("width", 0, "max output width")
 
 	inodes     = flag.Bool("inodes", false, "list inode information instead of block usage")
 	jsonOutput = flag.Bool("json", false, "output all devices in JSON format")
 )
 
-func renderTables(m []Mount, sortCol int) {
+func renderTables(m []Mount, sortCol int) error {
 	var local, network, fuse, special []Mount
 
 	// sort/filter devices
@@ -71,19 +72,33 @@ func renderTables(m []Mount, sortCol int) {
 		local = append(local, v)
 	}
 
+	columns, err := parseColumns(*output)
+	if err != nil {
+		return err
+	}
+	if len(columns) == 0 {
+		// no columns supplied, use defaults
+		if *inodes {
+			columns = []int{1, 6, 7, 8, 9, 10, 11}
+		} else {
+			columns = []int{1, 2, 3, 4, 5, 10, 11}
+		}
+	}
+
 	// print tables
 	if !*hideLocal || *all {
-		printTable("local", local, sortCol, *inodes)
+		printTable("local", local, sortCol, columns)
 	}
 	if !*hideNetwork || *all {
-		printTable("network", network, sortCol, *inodes)
+		printTable("network", network, sortCol, columns)
 	}
 	if !*hideFuse || *all {
-		printTable("FUSE", fuse, sortCol, *inodes)
+		printTable("FUSE", fuse, sortCol, columns)
 	}
 	if !*hideSpecial || *all {
-		printTable("special", special, sortCol, *inodes)
+		printTable("special", special, sortCol, columns)
 	}
+	return nil
 }
 
 func renderJSON(m []Mount) error {
@@ -96,12 +111,33 @@ func renderJSON(m []Mount) error {
 	return nil
 }
 
+func parseColumns(cols string) ([]int, error) {
+	var i []int
+
+	s := strings.Split(cols, ",")
+	for _, v := range s {
+		v = strings.TrimSpace(v)
+		if len(v) == 0 {
+			continue
+		}
+
+		col, err := stringToColumn(v)
+		if err != nil {
+			return nil, err
+		}
+
+		i = append(i, col)
+	}
+
+	return i, nil
+}
+
 func main() {
 	flag.Parse()
 
-	sortCol, err := stringToColumn(*sortBy)
+	sortCol, err := stringToSortIndex(*sortBy)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, "unknown sort key, valid values: mountpoint, size, used, avail, usage, type, filesystem")
+		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
 
@@ -137,5 +173,8 @@ func main() {
 		return
 	}
 
-	renderTables(m, sortCol)
+	err = renderTables(m, sortCol)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, err)
+	}
 }

mounts.go

@@ -9,19 +9,19 @@ import (
 )
 
 type Mount struct {
-	Device      string        `json:"device"`
-	DeviceType  string        `json:"device_type"`
-	Mountpoint  string        `json:"mount_point"`
-	Fstype      string        `json:"fs_type"`
-	Type        string        `json:"type"`
-	Opts        string        `json:"opts"`
-	Total       uint64        `json:"total"`
-	Free        uint64        `json:"free"`
-	Used        uint64        `json:"used"`
-	InodesTotal uint64        `json:"inodes_total"`
-	InodesFree  uint64        `json:"inodes_free"`
-	InodesUsed  uint64        `json:"inodes_used"`
-	Stat        unix.Statfs_t `json:"-"`
+	Device     string        `json:"device"`
+	DeviceType string        `json:"device_type"`
+	Mountpoint string        `json:"mount_point"`
+	Fstype     string        `json:"fs_type"`
+	Type       string        `json:"type"`
+	Opts       string        `json:"opts"`
+	Total      uint64        `json:"total"`
+	Free       uint64        `json:"free"`
+	Used       uint64        `json:"used"`
+	Inodes     uint64        `json:"inodes"`
+	InodesFree uint64        `json:"inodes_free"`
+	InodesUsed uint64        `json:"inodes_used"`
+	Stat       unix.Statfs_t `json:"-"`
 }
 
 func readLines(filename string) ([]string, error) {

mounts_darwin.go

@@ -67,18 +67,18 @@ func mounts() ([]Mount, []string, error) {
 		}
 
 		d := Mount{
-			Device:      device,
-			Mountpoint:  mountPoint,
-			Fstype:      fsType,
-			Type:        fsType,
-			Opts:        opts,
-			Stat:        stat,
-			Total:       (uint64(stat.Blocks) * uint64(stat.Bsize)),
-			Free:        (uint64(stat.Bavail) * uint64(stat.Bsize)),
-			Used:        (uint64(stat.Blocks) - uint64(stat.Bfree)) * uint64(stat.Bsize),
-			InodesTotal: stat.Files,
-			InodesFree:  stat.Ffree,
-			InodesUsed:  stat.Files - stat.Ffree,
+			Device:     device,
+			Mountpoint: mountPoint,
+			Fstype:     fsType,
+			Type:       fsType,
+			Opts:       opts,
+			Stat:       stat,
+			Total:      (uint64(stat.Blocks) * uint64(stat.Bsize)),
+			Free:       (uint64(stat.Bavail) * uint64(stat.Bsize)),
+			Used:       (uint64(stat.Blocks) - uint64(stat.Bfree)) * uint64(stat.Bsize),
+			Inodes:     stat.Files,
+			InodesFree: stat.Ffree,
+			InodesUsed: stat.Files - stat.Ffree,
 		}
 		d.DeviceType = deviceType(d)
 

mounts_linux.go

@@ -54,18 +54,18 @@ func mounts() ([]Mount, []string, error) {
 		}
 
 		d := Mount{
-			Device:      device,
-			Mountpoint:  mountPoint,
-			Fstype:      fstype,
-			Type:        fsTypeMap[int64(stat.Type)],
-			Opts:        mountOpts,
-			Stat:        stat,
-			Total:       (uint64(stat.Blocks) * uint64(stat.Bsize)),
-			Free:        (uint64(stat.Bavail) * uint64(stat.Bsize)),
-			Used:        (uint64(stat.Blocks) - uint64(stat.Bfree)) * uint64(stat.Bsize),
-			InodesTotal: stat.Files,
-			InodesFree:  stat.Ffree,
-			InodesUsed:  stat.Files - stat.Ffree,
+			Device:     device,
+			Mountpoint: mountPoint,
+			Fstype:     fstype,
+			Type:       fsTypeMap[int64(stat.Type)],
+			Opts:       mountOpts,
+			Stat:       stat,
+			Total:      (uint64(stat.Blocks) * uint64(stat.Bsize)),
+			Free:       (uint64(stat.Bavail) * uint64(stat.Bsize)),
+			Used:       (uint64(stat.Blocks) - uint64(stat.Bfree)) * uint64(stat.Bsize),
+			Inodes:     stat.Files,
+			InodesFree: stat.Ffree,
+			InodesUsed: stat.Files - stat.Ffree,
 		}
 		d.DeviceType = deviceType(d)