extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-02-02 11:39:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to display columns that map to a custom column

Browse Source
This commit is contained in:
David Dworken 2022-10-26 00:35:36 -07:00
parent f8c822bab5
commit 890ddfd99c
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/lib/lib.go
View File

@ -397,6 +397,15 @@ func AddToDbIfNew(db *gorm.DB, entry data.HistoryEntry) {
} }
} }
func getCustomColumnValue(header string, entry *data.HistoryEntry) (string, error) {
for _, c := range entry.CustomColumns {
if strings.EqualFold(c.Name, header) {
return c.Val, nil
}
}
return "", fmt.Errorf("failed to find a column matching the column name %#v (is there a typo?)", header)
}
func DisplayResults(ctx *context.Context, results []*data.HistoryEntry) error { func DisplayResults(ctx *context.Context, results []*data.HistoryEntry) error {
config := hctx.GetConf(ctx) config := hctx.GetConf(ctx)
headerFmt := color.New(color.FgGreen, color.Underline).SprintfFunc() headerFmt := color.New(color.FgGreen, color.Underline).SprintfFunc()
@ -425,7 +434,11 @@ func DisplayResults(ctx *context.Context, results []*data.HistoryEntry) error {
case "Command": case "Command":
row = append(row, result.Command) row = append(row, result.Command)
default: default:
return fmt.Errorf("failed to map column %#v to a value", header) customColumnValue, err := getCustomColumnValue(header, result)
if err != nil {
return err
}
row = append(row, customColumnValue)
} }
} }
tbl.AddRow(row...) tbl.AddRow(row...)