Mirror
/
resh
mirror of https://github.com/curusarn/resh
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reorganize search app code, minor fixes

Browse Source
pull/143/head v2.7.5
Simon Let 6 years ago
parent c001500450
commit fe878c57e8
7 changed files with 220 additions and 175 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 110
      cmd/cli/main.go
  2. 8
      pkg/searchapp/highlight.go
  3. 231
      pkg/searchapp/item.go
  4. 13
      pkg/searchapp/query.go
  5. 23
      pkg/searchapp/test.go
  6. 2
      pkg/searchapp/time.go
  7. 2
      scripts/reshctl.sh

110
cmd/cli/main.go
Unescape View File

@ -18,6 +18,7 @@ import (
"github.com/curusarn/resh/pkg/cfg" "github.com/curusarn/resh/pkg/cfg"
"github.com/curusarn/resh/pkg/msg" "github.com/curusarn/resh/pkg/msg"
"github.com/curusarn/resh/pkg/records" "github.com/curusarn/resh/pkg/records"
"github.com/curusarn/resh/pkg/searchapp"
"os/user" "os/user"
"path/filepath" "path/filepath"
@ -70,6 +71,8 @@ func runReshCli() (string, int) {
pwd := flag.String("pwd", "", "present working directory") pwd := flag.String("pwd", "", "present working directory")
gitOriginRemote := flag.String("gitOriginRemote", "DEFAULT", "git origin remote") gitOriginRemote := flag.String("gitOriginRemote", "DEFAULT", "git origin remote")
query := flag.String("query", "", "search query") query := flag.String("query", "", "search query")
testHistory := flag.String("test-history", "", "load history from a file instead from the daemon (for testing purposes only!)")
testHistoryLines := flag.Int("test-lines", 0, "the number of lines to load from a file passed with --test-history (for testing purposes only!)")
flag.Parse() flag.Parse()
if *sessionID == "" { if *sessionID == "" {
@ -96,11 +99,16 @@ func runReshCli() (string, int) {
// g.SelBgColor = gocui.ColorGreen // g.SelBgColor = gocui.ColorGreen
g.Highlight = true g.Highlight = true
var resp msg.CliResponse
if *testHistory == "" {
mess := msg.CliMsg{ mess := msg.CliMsg{
SessionID: *sessionID, SessionID: *sessionID,
PWD: *pwd, PWD: *pwd,
} }
resp := SendCliMsg(mess, strconv.Itoa(config.Port)) resp = SendCliMsg(mess, strconv.Itoa(config.Port))
} else {
resp = searchapp.LoadHistoryFromFile(*testHistory, *testHistoryLines)
}
st := state{ st := state{
// lock sync.Mutex // lock sync.Mutex
@ -166,8 +174,8 @@ func runReshCli() (string, int) {
type state struct { type state struct {
lock sync.Mutex lock sync.Mutex
cliRecords []records.CliRecord cliRecords []records.CliRecord
data []item data []searchapp.Item
rawData []rawItem rawData []searchapp.RawItem
highlightedItem int highlightedItem int
displayedItemsCount int displayedItemsCount int
@ -193,7 +201,7 @@ func (m manager) SelectExecute(g *gocui.Gui, v *gocui.View) error {
m.s.lock.Lock() m.s.lock.Lock()
defer m.s.lock.Unlock() defer m.s.lock.Unlock()
if m.s.highlightedItem < len(m.s.data) { if m.s.highlightedItem < len(m.s.data) {
m.s.output = m.s.data[m.s.highlightedItem].cmdLine m.s.output = m.s.data[m.s.highlightedItem].CmdLine
m.s.exitCode = exitCodeExecute m.s.exitCode = exitCodeExecute
return gocui.ErrQuit return gocui.ErrQuit
} }
@ -204,7 +212,7 @@ func (m manager) SelectPaste(g *gocui.Gui, v *gocui.View) error {
m.s.lock.Lock() m.s.lock.Lock()
defer m.s.lock.Unlock() defer m.s.lock.Unlock()
if m.s.highlightedItem < len(m.s.data) { if m.s.highlightedItem < len(m.s.data) {
m.s.output = m.s.data[m.s.highlightedItem].cmdLine m.s.output = m.s.data[m.s.highlightedItem].CmdLine
m.s.exitCode = 0 // success m.s.exitCode = 0 // success
return gocui.ErrQuit return gocui.ErrQuit
} }
@ -233,21 +241,21 @@ func (m manager) UpdateData(input string) {
log.Println("len(fullRecords) =", len(m.s.cliRecords)) log.Println("len(fullRecords) =", len(m.s.cliRecords))
log.Println("len(data) =", len(m.s.data)) log.Println("len(data) =", len(m.s.data))
} }
query := newQueryFromString(input, m.host, m.pwd, m.gitOriginRemote) query := searchapp.NewQueryFromString(input, m.host, m.pwd, m.gitOriginRemote, m.config.Debug)
var data []item var data []searchapp.Item
itemSet := make(map[string]int) itemSet := make(map[string]int)
m.s.lock.Lock() m.s.lock.Lock()
defer m.s.lock.Unlock() defer m.s.lock.Unlock()
for _, rec := range m.s.cliRecords { for _, rec := range m.s.cliRecords {
itm, err := newItemFromRecordForQuery(rec, query, m.config.Debug) itm, err := searchapp.NewItemFromRecordForQuery(rec, query, m.config.Debug)
if err != nil { if err != nil {
// records didn't match the query // records didn't match the query
// log.Println(" * continue (no match)", rec.Pwd) // log.Println(" * continue (no match)", rec.Pwd)
continue continue
} }
if idx, ok := itemSet[itm.key]; ok { if idx, ok := itemSet[itm.Key]; ok {
// duplicate found // duplicate found
if data[idx].score >= itm.score { if data[idx].Score >= itm.Score {
// skip duplicate item // skip duplicate item
continue continue
} }
@ -256,14 +264,14 @@ func (m manager) UpdateData(input string) {
continue continue
} }
// add new item // add new item
itemSet[itm.key] = len(data) itemSet[itm.Key] = len(data)
data = append(data, itm) data = append(data, itm)
} }
if debug { if debug {
log.Println("len(tmpdata) =", len(data)) log.Println("len(tmpdata) =", len(data))
} }
sort.SliceStable(data, func(p, q int) bool { sort.SliceStable(data, func(p, q int) bool {
return data[p].score > data[q].score return data[p].Score > data[q].Score
}) })
m.s.data = nil m.s.data = nil
for _, itm := range data { for _, itm := range data {
@ -281,28 +289,28 @@ func (m manager) UpdateData(input string) {
} }
func (m manager) UpdateRawData(input string) { func (m manager) UpdateRawData(input string) {
if debug { if m.config.Debug {
log.Println("EDIT start") log.Println("EDIT start")
log.Println("len(fullRecords) =", len(m.s.cliRecords)) log.Println("len(fullRecords) =", len(m.s.cliRecords))
log.Println("len(data) =", len(m.s.data)) log.Println("len(data) =", len(m.s.data))
} }
query := getRawTermsFromString(input) query := searchapp.GetRawTermsFromString(input, m.config.Debug)
var data []rawItem var data []searchapp.RawItem
itemSet := make(map[string]bool) itemSet := make(map[string]bool)
m.s.lock.Lock() m.s.lock.Lock()
defer m.s.lock.Unlock() defer m.s.lock.Unlock()
for _, rec := range m.s.cliRecords { for _, rec := range m.s.cliRecords {
itm, err := newRawItemFromRecordForQuery(rec, query, m.config.Debug) itm, err := searchapp.NewRawItemFromRecordForQuery(rec, query, m.config.Debug)
if err != nil { if err != nil {
// records didn't match the query // records didn't match the query
// log.Println(" * continue (no match)", rec.Pwd) // log.Println(" * continue (no match)", rec.Pwd)
continue continue
} }
if itemSet[itm.key] { if itemSet[itm.Key] {
// log.Println(" * continue (already present)", itm.key(), itm.pwd) // log.Println(" * continue (already present)", itm.key(), itm.pwd)
continue continue
} }
itemSet[itm.key] = true itemSet[itm.Key] = true
data = append(data, itm) data = append(data, itm)
// log.Println("DATA =", itm.display) // log.Println("DATA =", itm.display)
} }
@ -310,7 +318,7 @@ func (m manager) UpdateRawData(input string) {
log.Println("len(tmpdata) =", len(data)) log.Println("len(tmpdata) =", len(data))
} }
sort.SliceStable(data, func(p, q int) bool { sort.SliceStable(data, func(p, q int) bool {
return data[p].hits > data[q].hits return data[p].Score > data[q].Score
}) })
m.s.rawData = nil m.s.rawData = nil
for _, itm := range data { for _, itm := range data {
@ -412,31 +420,6 @@ func quit(g *gocui.Gui, v *gocui.View) error {
return gocui.ErrQuit return gocui.ErrQuit
} }
func getHeader(compactRendering bool) itemColumns {
date := "TIME "
host := "HOST:"
dir := "DIRECTORY"
if compactRendering {
dir = "DIR"
}
flags := " FLAGS"
cmdLine := "COMMAND-LINE"
return itemColumns{
date: date,
dateWithColor: date,
host: host,
hostWithColor: host,
pwdTilde: dir,
samePwd: false,
flags: flags,
flagsWithColor: flags,
cmdLine: cmdLine,
cmdLineWithColor: cmdLine,
// score: i.score,
key: "_HEADERS_",
}
}
const smallTerminalTresholdWidth = 110 const smallTerminalTresholdWidth = 110
func (m manager) normalMode(g *gocui.Gui, v *gocui.View) error { func (m manager) normalMode(g *gocui.Gui, v *gocui.View) error {
@ -447,31 +430,31 @@ func (m manager) normalMode(g *gocui.Gui, v *gocui.View) error {
compactRenderingMode = true compactRenderingMode = true
} }
data := []itemColumns{} data := []searchapp.ItemColumns{}
header := getHeader(compactRenderingMode) header := searchapp.GetHeader(compactRenderingMode)
longestDateLen := len(header.date) longestDateLen := len(header.Date)
longestLocationLen := len(header.host) + len(header.pwdTilde) longestLocationLen := len(header.Host) + len(header.PwdTilde)
longestFlagsLen := 2 longestFlagsLen := 2
maxPossibleMainViewHeight := maxY - 3 - 1 - 1 - 1 // - top box - header - status - help maxPossibleMainViewHeight := maxY - 3 - 1 - 1 - 1 // - top box - header - status - help
for i, itm := range m.s.data { for i, itm := range m.s.data {
if i == maxY { if i == maxY {
break break
} }
ic := itm.drawItemColumns(compactRenderingMode) ic := itm.DrawItemColumns(compactRenderingMode, debug)
data = append(data, ic) data = append(data, ic)
if i > maxPossibleMainViewHeight { if i > maxPossibleMainViewHeight {
// do not stretch columns because of results that will end up outside of the page // do not stretch columns because of results that will end up outside of the page
continue continue
} }
if len(ic.date) > longestDateLen { if len(ic.Date) > longestDateLen {
longestDateLen = len(ic.date) longestDateLen = len(ic.Date)
} }
if len(ic.host)+len(ic.pwdTilde) > longestLocationLen { if len(ic.Host)+len(ic.PwdTilde) > longestLocationLen {
longestLocationLen = len(ic.host) + len(ic.pwdTilde) longestLocationLen = len(ic.Host) + len(ic.PwdTilde)
} }
if len(ic.flags) > longestFlagsLen { if len(ic.Flags) > longestFlagsLen {
longestFlagsLen = len(ic.flags) longestFlagsLen = len(ic.Flags)
} }
} }
maxLocationLen := maxX/7 + 8 maxLocationLen := maxX/7 + 8
@ -487,7 +470,10 @@ func (m manager) normalMode(g *gocui.Gui, v *gocui.View) error {
topBoxHeight++ // headers topBoxHeight++ // headers
realLineLength := maxX - 2 realLineLength := maxX - 2
printedLineLength := maxX - 4 printedLineLength := maxX - 4
statusLine := m.s.data[m.s.highlightedItem].drawStatusLine(compactRenderingMode, printedLineLength, realLineLength) statusLine := searchapp.GetEmptyStatusLine(printedLineLength, realLineLength)
if m.s.highlightedItem != -1 && m.s.highlightedItem < len(m.s.data) {
statusLine = m.s.data[m.s.highlightedItem].DrawStatusLine(compactRenderingMode, printedLineLength, realLineLength)
}
var statusLineHeight int = len(statusLine) var statusLineHeight int = len(statusLine)
helpLineHeight := 1 helpLineHeight := 1
@ -500,8 +486,8 @@ func (m manager) normalMode(g *gocui.Gui, v *gocui.View) error {
// header // header
// header := getHeader() // header := getHeader()
dispStr, _ := header.produceLine(longestDateLen, longestLocationLen, longestFlagsLen, true, true) dispStr, _ := header.ProduceLine(longestDateLen, longestLocationLen, longestFlagsLen, true, true)
dispStr = doHighlightHeader(dispStr, maxX*2) dispStr = searchapp.DoHighlightHeader(dispStr, maxX*2)
v.WriteString(dispStr + "\n") v.WriteString(dispStr + "\n")
var index int var index int
@ -512,10 +498,10 @@ func (m manager) normalMode(g *gocui.Gui, v *gocui.View) error {
break break
} }
displayStr, _ := itm.produceLine(longestDateLen, longestLocationLen, longestFlagsLen, false, true) displayStr, _ := itm.ProduceLine(longestDateLen, longestLocationLen, longestFlagsLen, false, true)
if m.s.highlightedItem == index { if m.s.highlightedItem == index {
// maxX * 2 because there are escape sequences that make it hard to tell the real string lenght // maxX * 2 because there are escape sequences that make it hard to tell the real string lenght
displayStr = doHighlightString(displayStr, maxX*3) displayStr = searchapp.DoHighlightString(displayStr, maxX*3)
if debug { if debug {
log.Println("### HightlightedItem string :", displayStr) log.Println("### HightlightedItem string :", displayStr)
} }
@ -560,10 +546,10 @@ func (m manager) rawMode(g *gocui.Gui, v *gocui.View) error {
} }
break break
} }
displayStr := itm.cmdLineWithColor displayStr := itm.CmdLineWithColor
if m.s.highlightedItem == i { if m.s.highlightedItem == i {
// use actual min requried length instead of 420 constant // use actual min requried length instead of 420 constant
displayStr = doHighlightString(displayStr, maxX*2) displayStr = searchapp.DoHighlightString(displayStr, maxX*2)
if debug { if debug {
log.Println("### HightlightedItem string :", displayStr) log.Println("### HightlightedItem string :", displayStr)
} }

8
cmd/cli/highlight.go → pkg/searchapp/highlight.go
Unescape View File

@ -1,4 +1,4 @@
package main package searchapp
import ( import (
"strconv" "strconv"
@ -91,14 +91,16 @@ func highlightGit(str string) string {
return greenBold + cleanHighlight(str) + end return greenBold + cleanHighlight(str) + end
} }
func doHighlightHeader(str string, minLength int) string { // DoHighlightHeader .
func DoHighlightHeader(str string, minLength int) string {
if len(str) < minLength { if len(str) < minLength {
str = str + strings.Repeat(" ", minLength-len(str)) str = str + strings.Repeat(" ", minLength-len(str))
} }
return highlightHeader(str) return highlightHeader(str)
} }
func doHighlightString(str string, minLength int) string { // DoHighlightString .
func DoHighlightString(str string, minLength int) string {
if len(str) < minLength { if len(str) < minLength {
str = str + strings.Repeat(" ", minLength-len(str)) str = str + strings.Repeat(" ", minLength-len(str))
} }

231
cmd/cli/item.go → pkg/searchapp/item.go
Unescape View File

@ -1,7 +1,6 @@
package main package searchapp
import ( import (
"errors"
"fmt" "fmt"
"log" "log"
"strconv" "strconv"
@ -13,7 +12,8 @@ import (
const itemLocationLenght = 30 const itemLocationLenght = 30
type item struct { // Item holds item info for normal mode
type Item struct {
isRaw bool isRaw bool
realtimeBefore float64 realtimeBefore float64
@ -29,43 +29,44 @@ type item struct {
sameGitRepo bool sameGitRepo bool
exitCode int exitCode int
cmdLineWithColor string CmdLineWithColor string
cmdLine string CmdLine string
score float64 Score float64
key string Key string
// cmdLineRaw string // cmdLineRaw string
} }
type itemColumns struct { // ItemColumns holds rendered columns
dateWithColor string type ItemColumns struct {
date string DateWithColor string
Date string
// [host:]pwd // [host:]pwd
hostWithColor string HostWithColor string
host string Host string
pwdTilde string PwdTilde string
samePwd bool samePwd bool
//locationWithColor string //locationWithColor string
//location string //location string
// [G] [E#] // [G] [E#]
flagsWithColor string FlagsWithColor string
flags string Flags string
cmdLineWithColor string CmdLineWithColor string
cmdLine string CmdLine string
// score float64 // score float64
key string Key string
// cmdLineRaw string // cmdLineRaw string
} }
func (i item) less(i2 item) bool { func (i Item) less(i2 Item) bool {
// reversed order // reversed order
return i.score > i2.score return i.Score > i2.Score
} }
func splitStatusLineToLines(statusLine string, printedLineLength, realLineLength int) []string { func splitStatusLineToLines(statusLine string, printedLineLength, realLineLength int) []string {
@ -97,9 +98,10 @@ func splitStatusLineToLines(statusLine string, printedLineLength, realLineLength
return statusLineSlice return statusLineSlice
} }
func (i item) drawStatusLine(compactRendering bool, printedLineLength, realLineLength int) []string { // DrawStatusLine ...
func (i Item) DrawStatusLine(compactRendering bool, printedLineLength, realLineLength int) []string {
if i.isRaw { if i.isRaw {
return splitStatusLineToLines(i.cmdLine, printedLineLength, realLineLength) return splitStatusLineToLines(i.CmdLine, printedLineLength, realLineLength)
} }
secs := int64(i.realtimeBefore) secs := int64(i.realtimeBefore)
nsecs := int64((i.realtimeBefore - float64(secs)) * 1e9) nsecs := int64((i.realtimeBefore - float64(secs)) * 1e9)
@ -110,24 +112,30 @@ func (i item) drawStatusLine(compactRendering bool, printedLineLength, realLineL
pwdTilde := strings.Replace(i.pwd, i.home, "~", 1) pwdTilde := strings.Replace(i.pwd, i.home, "~", 1)
separator := " " separator := " "
stLine := timeString + separator + i.host + ":" + pwdTilde + separator + i.cmdLine stLine := timeString + separator + i.host + ":" + pwdTilde + separator + i.CmdLine
return splitStatusLineToLines(stLine, printedLineLength, realLineLength) return splitStatusLineToLines(stLine, printedLineLength, realLineLength)
} }
func (i item) drawItemColumns(compactRendering bool) itemColumns { // GetEmptyStatusLine .
func GetEmptyStatusLine(printedLineLength, realLineLength int) []string {
return splitStatusLineToLines("- no result selected -", printedLineLength, realLineLength)
}
// DrawItemColumns ...
func (i Item) DrawItemColumns(compactRendering bool, debug bool) ItemColumns {
if i.isRaw { if i.isRaw {
notAvailable := "n/a" notAvailable := "n/a"
return itemColumns{ return ItemColumns{
date: notAvailable + " ", Date: notAvailable + " ",
dateWithColor: notAvailable + " ", DateWithColor: notAvailable + " ",
// dateWithColor: highlightDate(notAvailable) + " ", // dateWithColor: highlightDate(notAvailable) + " ",
host: "", Host: "",
hostWithColor: "", HostWithColor: "",
pwdTilde: notAvailable, PwdTilde: notAvailable,
cmdLine: i.cmdLine, CmdLine: i.CmdLine,
cmdLineWithColor: i.cmdLineWithColor, CmdLineWithColor: i.CmdLineWithColor,
// score: i.score, // score: i.score,
key: i.key, Key: i.Key,
} }
} }
@ -159,7 +167,7 @@ func (i item) drawItemColumns(compactRendering bool) itemColumns {
flags := "" flags := ""
flagsWithColor := "" flagsWithColor := ""
if debug { if debug {
hitsStr := fmt.Sprintf("%.1f", i.score) hitsStr := fmt.Sprintf("%.1f", i.Score)
flags += " S" + hitsStr flags += " S" + hitsStr
flagsWithColor += " S" + hitsStr flagsWithColor += " S" + hitsStr
} }
@ -174,46 +182,47 @@ func (i item) drawItemColumns(compactRendering bool) itemColumns {
// NOTE: you can debug arbitrary metadata like this // NOTE: you can debug arbitrary metadata like this
// flags += " <" + record.GitOriginRemote + ">" // flags += " <" + record.GitOriginRemote + ">"
// flagsWithColor += " <" + record.GitOriginRemote + ">" // flagsWithColor += " <" + record.GitOriginRemote + ">"
return itemColumns{ return ItemColumns{
date: date, Date: date,
dateWithColor: dateWithColor, DateWithColor: dateWithColor,
host: host, Host: host,
hostWithColor: hostWithColor, HostWithColor: hostWithColor,
pwdTilde: pwdTilde, PwdTilde: pwdTilde,
samePwd: i.samePwd, samePwd: i.samePwd,
flags: flags, Flags: flags,
flagsWithColor: flagsWithColor, FlagsWithColor: flagsWithColor,
cmdLine: i.cmdLine, CmdLine: i.CmdLine,
cmdLineWithColor: i.cmdLineWithColor, CmdLineWithColor: i.CmdLineWithColor,
// score: i.score, // score: i.score,
key: i.key, Key: i.Key,
} }
} }
func (ic itemColumns) produceLine(dateLength int, locationLength int, flagLength int, header bool, showDate bool) (string, int) { // ProduceLine ...
func (ic ItemColumns) ProduceLine(dateLength int, locationLength int, flagLength int, header bool, showDate bool) (string, int) {
line := "" line := ""
if showDate { if showDate {
date := ic.date date := ic.Date
for len(date) < dateLength { for len(date) < dateLength {
line += " " line += " "
date += " " date += " "
} }
// TODO: use strings.Repeat // TODO: use strings.Repeat
line += ic.dateWithColor line += ic.DateWithColor
} }
// LOCATION // LOCATION
locationWithColor := ic.hostWithColor locationWithColor := ic.HostWithColor
pwdLength := locationLength - len(ic.host) pwdLength := locationLength - len(ic.Host)
if ic.samePwd { if ic.samePwd {
locationWithColor += highlightPwd(leftCutPadString(ic.pwdTilde, pwdLength)) locationWithColor += highlightPwd(leftCutPadString(ic.PwdTilde, pwdLength))
} else { } else {
locationWithColor += leftCutPadString(ic.pwdTilde, pwdLength) locationWithColor += leftCutPadString(ic.PwdTilde, pwdLength)
} }
line += locationWithColor line += locationWithColor
line += ic.flagsWithColor line += ic.FlagsWithColor
flags := ic.flags flags := ic.Flags
if flagLength < len(ic.flags) { if flagLength < len(ic.Flags) {
log.Printf("produceLine can't specify line w/ flags shorter than the actual size. - len(flags) %v, requested %v\n", len(ic.flags), flagLength) log.Printf("produceLine can't specify line w/ flags shorter than the actual size. - len(flags) %v, requested %v\n", len(ic.Flags), flagLength)
} }
for len(flags) < flagLength { for len(flags) < flagLength {
line += " " line += " "
@ -225,9 +234,9 @@ func (ic itemColumns) produceLine(dateLength int, locationLength int, flagLength
// because there is likely a long flag like E130 in the view // because there is likely a long flag like E130 in the view
spacer = " " spacer = " "
} }
line += spacer + ic.cmdLineWithColor line += spacer + ic.CmdLineWithColor
length := dateLength + locationLength + flagLength + len(spacer) + len(ic.cmdLine) length := dateLength + locationLength + flagLength + len(spacer) + len(ic.CmdLine)
return line, length return line, length
} }
@ -262,9 +271,9 @@ func properMatch(str, term, padChar string) bool {
return false return false
} }
// newItemFromRecordForQuery creates new item from record based on given query // NewItemFromRecordForQuery creates new item from record based on given query
// returns error if the query doesn't match the record // returns error if the query doesn't match the record
func newItemFromRecordForQuery(record records.CliRecord, query query, debug bool) (item, error) { func NewItemFromRecordForQuery(record records.CliRecord, query Query, debug bool) (Item, error) {
// Use numbers that won't add up to same score for any number of query words // Use numbers that won't add up to same score for any number of query words
// query score weigth 1.51 // query score weigth 1.51
const hitScore = 1.517 // 1 * 1.51 const hitScore = 1.517 // 1 * 1.51
@ -319,13 +328,13 @@ func newItemFromRecordForQuery(record records.CliRecord, query query, debug bool
record.GitOriginRemote + unlikelySeparator + record.Host record.GitOriginRemote + unlikelySeparator + record.Host
*/ */
if record.IsRaw { if record.IsRaw {
return item{ return Item{
isRaw: true, isRaw: true,
cmdLine: cmdLine, CmdLine: cmdLine,
cmdLineWithColor: cmdLineWithColor, CmdLineWithColor: cmdLineWithColor,
score: score, Score: score,
key: key, Key: key,
}, nil }, nil
} }
// actual pwd matches // actual pwd matches
@ -357,12 +366,13 @@ func newItemFromRecordForQuery(record records.CliRecord, query query, debug bool
// errorExitStatus = true // errorExitStatus = true
score -= nonZeroExitCodeScorePenalty score -= nonZeroExitCodeScorePenalty
} }
if score <= 0 && !anyHit { _ = anyHit
return item{}, errors.New("no match for given record and query") // if score <= 0 && !anyHit {
} // return Item{}, errors.New("no match for given record and query")
// }
score += record.RealtimeBefore * timeScoreCoef score += record.RealtimeBefore * timeScoreCoef
it := item{ it := Item{
realtimeBefore: record.RealtimeBefore, realtimeBefore: record.RealtimeBefore,
differentHost: differentHost, differentHost: differentHost,
@ -373,52 +383,73 @@ func newItemFromRecordForQuery(record records.CliRecord, query query, debug bool
sameGitRepo: sameGitRepo, sameGitRepo: sameGitRepo,
exitCode: record.ExitCode, exitCode: record.ExitCode,
cmdLine: cmdLine, CmdLine: cmdLine,
cmdLineWithColor: cmdLineWithColor, CmdLineWithColor: cmdLineWithColor,
score: score, Score: score,
key: key, Key: key,
} }
return it, nil return it, nil
} }
type rawItem struct { // GetHeader returns header columns
cmdLineWithColor string func GetHeader(compactRendering bool) ItemColumns {
cmdLine string date := "TIME "
host := "HOST:"
dir := "DIRECTORY"
if compactRendering {
dir = "DIR"
}
flags := " FLAGS"
cmdLine := "COMMAND-LINE"
return ItemColumns{
Date: date,
DateWithColor: date,
Host: host,
HostWithColor: host,
PwdTilde: dir,
samePwd: false,
Flags: flags,
FlagsWithColor: flags,
CmdLine: cmdLine,
CmdLineWithColor: cmdLine,
// score: i.score,
Key: "_HEADERS_",
}
}
// RawItem is item for raw mode
type RawItem struct {
CmdLineWithColor string
CmdLine string
hits float64 Score float64
key string Key string
// cmdLineRaw string // cmdLineRaw string
} }
// newRawItemFromRecordForQuery creates new item from record based on given query // NewRawItemFromRecordForQuery creates new item from record based on given query
// returns error if the query doesn't match the record // returns error if the query doesn't match the record
func newRawItemFromRecordForQuery(record records.CliRecord, terms []string, debug bool) (rawItem, error) { func NewRawItemFromRecordForQuery(record records.CliRecord, terms []string, debug bool) (RawItem, error) {
const hitScore = 1.0 const hitScore = 1.0
const hitScoreConsecutive = 0.1 const hitScoreConsecutive = 0.01
const properMatchScore = 0.3 const properMatchScore = 0.3
hits := 0.0 const timeScoreCoef = 1e-13
anyHit := false
score := 0.0
cmd := record.CmdLine cmd := record.CmdLine
for _, term := range terms { for _, term := range terms {
termHit := false c := strings.Count(record.CmdLine, term)
if strings.Contains(record.CmdLine, term) { if c > 0 {
anyHit = true score += hitScore + hitScoreConsecutive*float64(c)
if termHit == false {
hits += hitScore
} else {
hits += hitScoreConsecutive
}
termHit = true
if properMatch(cmd, term, " ") { if properMatch(cmd, term, " ") {
hits += properMatchScore score += properMatchScore
} }
cmd = strings.ReplaceAll(cmd, term, highlightMatch(term)) cmd = strings.ReplaceAll(cmd, term, highlightMatch(term))
// NO continue
} }
} }
_ = anyHit score += record.RealtimeBefore * timeScoreCoef
// KEY for deduplication // KEY for deduplication
key := record.CmdLine key := record.CmdLine
@ -428,11 +459,11 @@ func newRawItemFromRecordForQuery(record records.CliRecord, terms []string, debu
cmdLine := strings.ReplaceAll(record.CmdLine, "\n", ";") cmdLine := strings.ReplaceAll(record.CmdLine, "\n", ";")
cmdLineWithColor := strings.ReplaceAll(cmd, "\n", ";") cmdLineWithColor := strings.ReplaceAll(cmd, "\n", ";")
it := rawItem{ it := RawItem{
cmdLine: cmdLine, CmdLine: cmdLine,
cmdLineWithColor: cmdLineWithColor, CmdLineWithColor: cmdLineWithColor,
hits: hits, Score: score,
key: key, Key: key,
} }
return it, nil return it, nil
} }

13
cmd/cli/query.go → pkg/searchapp/query.go
Unescape View File

@ -1,4 +1,4 @@
package main package searchapp
import ( import (
"log" "log"
@ -6,7 +6,8 @@ import (
"strings" "strings"
) )
type query struct { // Query holds information that is used for result scoring
type Query struct {
terms []string terms []string
host string host string
pwd string pwd string
@ -34,7 +35,8 @@ func filterTerms(terms []string) []string {
return newTerms return newTerms
} }
func newQueryFromString(queryInput string, host string, pwd string, gitOriginRemote string) query { // NewQueryFromString .
func NewQueryFromString(queryInput string, host string, pwd string, gitOriginRemote string, debug bool) Query {
if debug { if debug {
log.Println("QUERY input = <" + queryInput + ">") log.Println("QUERY input = <" + queryInput + ">")
} }
@ -56,7 +58,7 @@ func newQueryFromString(queryInput string, host string, pwd string, gitOriginRem
log.Println("QUERY pwd =" + pwd) log.Println("QUERY pwd =" + pwd)
} }
sort.SliceStable(terms, func(i, j int) bool { return len(terms[i]) < len(terms[j]) }) sort.SliceStable(terms, func(i, j int) bool { return len(terms[i]) < len(terms[j]) })
return query{ return Query{
terms: terms, terms: terms,
host: host, host: host,
pwd: pwd, pwd: pwd,
@ -64,7 +66,8 @@ func newQueryFromString(queryInput string, host string, pwd string, gitOriginRem
} }
} }
func getRawTermsFromString(queryInput string) []string { // GetRawTermsFromString .
func GetRawTermsFromString(queryInput string, debug bool) []string {
if debug { if debug {
log.Println("QUERY input = <" + queryInput + ">") log.Println("QUERY input = <" + queryInput + ">")
} }

23
pkg/searchapp/test.go
Unescape View File

@ -0,0 +1,23 @@
package searchapp
import (
"math"
"github.com/curusarn/resh/pkg/histcli"
"github.com/curusarn/resh/pkg/msg"
"github.com/curusarn/resh/pkg/records"
)
// LoadHistoryFromFile ...
func LoadHistoryFromFile(historyPath string, numLines int) msg.CliResponse {
recs := records.LoadFromFile(historyPath, math.MaxInt32)
if numLines != 0 && numLines < len(recs) {
recs = recs[:numLines]
}
cliRecords := histcli.New()
for i := len(recs) - 1; i >= 0; i-- {
rec := recs[i]
cliRecords.AddRecord(rec)
}
return msg.CliResponse{CliRecords: cliRecords.List}
}

2
cmd/cli/time.go → pkg/searchapp/time.go
Unescape View File

@ -1,4 +1,4 @@
package main package searchapp
import ( import (
"strconv" "strconv"

2
scripts/reshctl.sh
Unescape View File

@ -109,7 +109,7 @@ __resh_unbind_all() {
resh() { resh() {
local buffer local buffer
local git_remote; git_remote="$(git remote get-url origin 2>/dev/null)" local git_remote; git_remote="$(git remote get-url origin 2>/dev/null)"
buffer=$(resh-cli --sessionID "$__RESH_SESSION_ID" --host "$__RESH_HOST" --pwd "$PWD" --gitOriginRemote "$git_remote") buffer=$(resh-cli --sessionID "$__RESH_SESSION_ID" --host "$__RESH_HOST" --pwd "$PWD" --gitOriginRemote "$git_remote" $@)
status_code=$? status_code=$?
if [ $status_code = 111 ]; then if [ $status_code = 111 ]; then
# execute # execute

Write Preview
Loading…
Cancel
Save