crtxcr/hs9001
1
0
Fork 0
mirror of https://github.com/quitesimpleorg/hs9001.git synced 2025-01-18 22:01:26 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: crtxcr:216e59747cd1a99b173cf7fbff5b0dc0d0acfc1a
Branches Tags
crtxcr:master
crtxcr:WIP/sane_timestamp
crtxcr:WIP/liner
crtxcr:v0.5
crtxcr:v0.4
crtxcr:v0.3
crtxcr:v0.2
crtxcr:v0.1
...
compare: crtxcr:b9e3a3629b48085c01d38b408b6d854f82409e71
Branches Tags
crtxcr:master
crtxcr:WIP/sane_timestamp
crtxcr:WIP/liner
crtxcr:v0.5
crtxcr:v0.4
crtxcr:v0.3
crtxcr:v0.2
crtxcr:v0.1

4 Commits
216e59747c ... b9e3a3629b

Author SHA1 Message Date
lawl
b9e3a3629b Fix bug in cwd search and fix go-staticcheck regexp complaint 2021-06-05 15:05:18 +02:00
lawl
16752411e1 Add 'nolog' subcommand 
The nolog subcommand instructs the user on how to disable logging
for the current shell. This is not (easily) doable automatically
since we can't affect a parent's environment without insane hacks.

Fixes #4
 2021-06-05 14:49:25 +02:00
lawl
c480519fca Resolve CWD arguments as absolute path 
Previously when calling e.g 'hs9001 search -cwd .' we would search
for a litteral '.' in the database. Now we resolve that argument
relative to the CWD.
 2021-06-05 14:28:02 +02:00
lawl
70e66f47ba CLI: Rename -workdir to -cwd so we have to type less 2021-06-05 14:27:25 +02:00
1 changed files with 12 additions and 3 deletions
Show Stats Expand all files Collapse all files

15
main.go
View File

@ -234,7 +234,7 @@ func exists(path string) (bool, error) {
}
func printUsage() {
fmt.Fprintf(os.Stderr, "Usage: ./hs9001 <add/search/import>\n")
fmt.Fprintf(os.Stderr, "Usage: ./hs9001 <add/search/import/nolog>\n")
}
func main() {
@ -266,6 +266,8 @@ func main() {
migrateDatabase(conn, fetchDBVersion(conn))
switch cmd {
case "nolog":
fmt.Printf("Run this command to disable logging for the current shell:\n\tunset PROMPT_COMMAND\n")
case "add":
var ret int
addCmd.IntVar(&ret, "ret", 0, "Return value of the command to add")
@ -280,7 +282,7 @@ func main() {
}
historycmd := args[0]
var rgx = regexp.MustCompile("\\s+\\d+\\s+(.*)")
var rgx = regexp.MustCompile(`\s+\d+\s+(.*)`)
rs := rgx.FindStringSubmatch(historycmd)
if len(rs) == 2 {
add(conn, NewHistoryEntry(rs[1], ret))
@ -293,7 +295,7 @@ func main() {
var endTime string
var distinct bool = true
var retVal int
searchCmd.StringVar(&workDir, "workdir", "%", "Search only within this workdir")
searchCmd.StringVar(&workDir, "cwd", "%", "Search only within this workdir")
searchCmd.StringVar(&beginTime, "begin", "50 years ago", "Start searching from this timeframe")
searchCmd.StringVar(&endTime, "end", "now", "End searching from this timeframe")
searchCmd.BoolVar(&distinct, "distinct", true, "Remove consecutive duplicate commands from output")
@ -314,6 +316,13 @@ func main() {
}
q := strings.Join(args, " ")
if workDir != "%" {
workDir, err = filepath.Abs(workDir)
if err != nil {
fmt.Fprintf(os.Stderr, "Failed parse working directory path: %s\n", err.Error())
}
}
results := search(conn, "%"+q+"%", workDir, beginTimestamp, endTimeStamp, retVal)
previousCmd := ""