Merge pull request #728 from cit/improve-snapshot-output

Add box-drawing character to the snapshots command
This commit is contained in:
Alexander Neumann 2017-01-29 11:00:13 +01:00
commit 1f9db97d33
1 changed files with 16 additions and 5 deletions

View File

@ -57,8 +57,8 @@ func runSnapshots(opts SnapshotOptions, gopts GlobalOptions, args []string) erro
} }
tab := NewTable() tab := NewTable()
tab.Header = fmt.Sprintf("%-8s %-19s %-10s %-10s %s", "ID", "Date", "Host", "Tags", "Directory") tab.Header = fmt.Sprintf("%-8s %-19s %-10s %-10s %-3s %s", "ID", "Date", "Host", "Tags", "", "Directory")
tab.RowFormat = "%-8s %-19s %-10s %-10s %s" tab.RowFormat = "%-8s %-19s %-10s %-10s %-3s %s"
done := make(chan struct{}) done := make(chan struct{})
defer close(done) defer close(done)
@ -97,9 +97,15 @@ func runSnapshots(opts SnapshotOptions, gopts GlobalOptions, args []string) erro
firstTag = sn.Tags[0] firstTag = sn.Tags[0]
} }
tab.Rows = append(tab.Rows, []interface{}{sn.ID().Str(), sn.Time.Format(TimeFormat), sn.Hostname, firstTag, sn.Paths[0]})
rows := len(sn.Paths) rows := len(sn.Paths)
treeElement := " "
if rows != 1 {
treeElement = "┌──"
}
tab.Rows = append(tab.Rows, []interface{}{sn.ID().Str(), sn.Time.Format(TimeFormat), sn.Hostname, firstTag, treeElement, sn.Paths[0]})
if len(sn.Tags) > rows { if len(sn.Tags) > rows {
rows = len(sn.Tags) rows = len(sn.Tags)
} }
@ -115,7 +121,12 @@ func runSnapshots(opts SnapshotOptions, gopts GlobalOptions, args []string) erro
tag = sn.Tags[i] tag = sn.Tags[i]
} }
tab.Rows = append(tab.Rows, []interface{}{"", "", "", tag, path}) treeElement := "│"
if i == (rows - 1) {
treeElement = "└──"
}
tab.Rows = append(tab.Rows, []interface{}{"", "", "", tag, treeElement, path})
} }
} }