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

Add basic support for stripping out HISTTIMEFORMAT prefixes

Browse Source
This commit is contained in:
David Dworken
2022-06-12 21:28:19 -07:00
parent 3f32891469
commit e8f001c78b
4 changed files with 119 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/lib/lib.go
View File

@ -121,7 +121,7 @@ func BuildHistoryEntry(args []string) (*data.HistoryEntry, error) {
// Don't save commands that start with a space
return nil, nil
}
entry.Command = cmd
entry.Command = maybeSkipBashHistTimePrefix(cmd)
} else if shell == "zsh" {
cmd := strings.TrimSuffix(strings.TrimSuffix(args[4], "\n"), " ")
if strings.HasPrefix(cmd, " ") {
@ -150,6 +150,23 @@ func BuildHistoryEntry(args []string) (*data.HistoryEntry, error) {
return &entry, nil
}
func maybeSkipBashHistTimePrefix(cmdLine string) string {
format := os.Getenv("HISTTIMEFORMAT")
if format == "" {
return cmdLine
}
if !strings.HasSuffix(format, " ") {
GetLogger().Printf("bash has HISTTIMEFORMAT set, but it doesn't end in a space so we can't strip the timestamp")
return cmdLine
}
// TODO: could we handle things like `export HISTTIMEFORMAT='%c:'`?
numSpaces := strings.Count(format, " ")
numC := strings.Count(format, "%c")
numSpaces += (4 * numC)
split := strings.SplitN(cmdLine, " ", numSpaces+1)
return split[len(split)-1]
}
func parseCrossPlatformInt(data string) (int64, error) {
data = strings.TrimSuffix(data, "N")
return strconv.ParseInt(data, 10, 64)