8000 Avoid redundantly loading previews for search/find by neeshy · Pull Request #569 · gokcehan/lf · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Avoid redundantly loading previews for search/find #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 29, 2021
Merged

Avoid redundantly loading previews for search/find #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c00e91
Avoid redundantly loading previews for find
neeshy Jan 22, 2021
51532e7
Avoid redundantly loading previews for search
neeshy Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 55 additions & 40 deletions eval.go
View file
Open in desktop
app.ui.loadFile(app.nav, true)
Original file line number Diff line number Diff line change
Expand Up @@ -393,30 +393,30 @@ func update(app *app) {
app.nav.search = string(app.ui.cmdAccLeft) + string(app.ui.cmdAccRight)

dir := app.nav.currDir()
old := dir.ind
dir.ind = app.nav.searchInd
dir.pos = app.nav.searchPos

if err := app.nav.searchNext(); err != nil {
if _, err := app.nav.searchNext(); err != nil {
app.ui.echoerrf("search: %s: %s", err, app.nav.search)
return
} else if old != dir.ind {
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}

app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case gOpts.incsearch && app.ui.cmdPrefix == "?":
app.nav.search = string(app.ui.cmdAccLeft) + string(app.ui.cmdAccRight)

dir := app.nav.currDir()
old := dir.ind
dir.ind = app.nav.searchInd
dir.pos = app.nav.searchPos

if err := app.nav.searchPrev(); err != nil {
if _, err := app.nav.searchPrev(); err != nil {
app.ui.echoerrf("search: %s: %s", err, app.nav.search)
return
} else if old != dir.ind {
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}

app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
}

Expand Down Expand Up @@ -455,9 +455,9 @@ func insert(app *app, arg string) {
return
}

if !app.nav.findNext() {
if moved, found := app.nav.findNext(); !found {
app.ui.echoerrf("find: pattern not found: %s", app.nav.find)
} else {
} else if moved {
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
Expand All @@ -484,9 +484,9 @@ func insert(app *app, arg string) {
return
}

if !app.nav.findPrev() {
if moved, found := app.nav.findPrev(); !found {
app.ui.echoerrf("find-back: pattern not found: %s", app.nav.find)
} else {
} else if moved {
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
Expand Down Expand Up @@ -854,25 +854,33 @@ func (e *callExpr) eval(app *app, args []string) {
app.nav.findBack = true
app.ui.loadFileInfo(app.nav)
case "find-next":
dir := app.nav.currDir()
old := dir.ind
for i := 0; i < e.count; i++ {
if app.nav.findBack {
app.nav.findPrev()
} else {
app.nav.findNext()
}
}
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
if old != dir.ind {
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
case "find-prev":
dir := app.nav.currDir()
old := dir.ind
for i := 0; i < e.count; i++ {
if app.nav.findBack {
app.nav.findNext()
} else {
app.nav.findPrev()
}
}
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
if old != dir.ind {
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
case "search":
app.ui.cmdPrefix = "/"
dir := app.nav.currDir()
Expand All @@ -890,35 +898,39 @@ func (e *callExpr) eval(app *app, args []string) {
case "search-next":
for i := 0; i < e.count; i++ {
if app.nav.searchBack {
if err := app.nav.searchPrev(); err != nil {
if moved, err := app.nav.searchPrev(); err != nil {
app.ui.echoerrf("search-back: %s: %s", err, app.nav.search)
return
} else if moved {
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
} else {
if err := app.nav.searchNext(); err != nil {
if moved, err := app.nav.searchNext(); err != nil {
app.ui.echoerrf("search: %s: %s", err, app.nav.search)
return
} else if moved {
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
}
}
app.ui.loadFileInfo(app.nav)
case "search-prev":
for i := 0; i < e.count; i++ {
if app.nav.searchBack {
if err := app.nav.searchNext(); err != nil {
if moved, err := app.nav.searchNext(); err != nil {
app.ui.echoerrf("search-back: %s: %s", err, app.nav.search)
return
} else if moved {
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
} else {
if err := app.nav.searchPrev(); err != nil {
if moved, err := app.nav.searchPrev(); err != nil {
app.ui.echoerrf("search: %s: %s", err, app.nav.search)
return
} else if moved {
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
}
}
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "mark-save":
app.ui.cmdPrefix = "mark-save: "
case "mark-load":
Expand Down Expand Up @@ -1067,11 +1079,12 @@ func (e *callExpr) eval(app *app, args []string) {
}
if gOpts.incsearch && (app.ui.cmdPrefix == "/" || app.ui.cmdPrefix == "?") {
dir := app.nav.currDir()
dir.ind = app.nav.searchInd
dir.pos = app.nav.searchPos

app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
if dir.ind != app.nav.searchInd {
dir.ind = app.nav.searchInd
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
}
normal(app)
case "cmd-complete":
Expand Down Expand Up @@ -1235,32 +1248,34 @@ func (e *callExpr) eval(app *app, args []string) {
app.cmdHistory = append(app.cmdHistory, cmdItem{"&", s})
app.runShell(s, nil, "&")
case "/":
dir := app.nav.currDir()
old := dir.ind
if gOpts.incsearch {
dir := app.nav.currDir()
dir.ind = app.nav.searchInd
dir.pos = app.nav.searchPos
}
log.Printf("search: %s", s)
app.ui.cmdPrefix = ""
app.nav.search = s
if err := app.nav.searchNext(); err != nil {
if _, err := app.nav.searchNext(); err != nil {
app.ui.echoerrf("search: %s: %s", err, app.nav.search)
} else {
} else if old != dir.ind {
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
case "?":
dir := app.nav.currDir()
old := dir.ind
if gOpts.incsearch {
dir := app.nav.currDir()
dir.ind = app.nav.searchInd
dir.pos = app.nav.searchPos
}
log.Printf("search-back: %s", s)
app.ui.cmdPrefix = ""
app.nav.search = s
if err := app.nav.searchPrev(); err != nil {
if _, err := app.nav.searchPrev(); err != nil {
app.ui.echoerrf("search-back: %s: %s", err, app.nav.search)
} else {
} else if old != dir.ind {
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
Expand Down
72 changes: 28 additions & 44 deletions nav.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,42 +1123,38 @@ func (nav *nav) findSingle() int {
return count
}

func (nav *nav) findNext() bool {
func (nav *nav) findNext() (bool, bool) {
dir := nav.currDir()
for i := dir.ind + 1; i < len(dir.files); i++ {
if findMatch(dir.files[i].Name(), nav.find) {
nav.down(i - dir.ind)
return true
return nav.down(i - dir.ind), true
}
}
if gOpts.wrapscan {
for i := 0; i < dir.ind; i++ {
if findMatch(dir.files[i].Name(), nav.find) {
nav.up(dir.ind - i)
return true
return nav.up(dir.ind - i), true
}
}
}
return false
return false, false
}

func (nav *nav) findPrev() bool {
func (nav *nav) findPrev() (bool, bool) {
dir := nav.currDir()
for i := dir.ind - 1; i >= 0; i-- {
if findMatch(dir.files[i].Name(), nav.find) {
nav.up(dir.ind - i)
return true
return nav.up(dir.ind - i), true
}
}
if gOpts.wrapscan {
for i := len(dir.files) - 1; i > dir.ind; i-- {
if findMatch(dir.files[i].Name(), nav.find) {
nav.down(i - dir.ind)
return true
return nav.down(i - dir.ind), true
}
}
}
return false
return false, false
}

func searchMatch(name, pattern string) (matched bool, err error) {
Expand All @@ -1182,58 +1178,46 @@ func searchMatch(name, pattern string) (matched bool, err error) {
return strings.Contains(name, pattern), nil
}

func (nav *nav) searchNext() error {
func (nav *nav) searchNext() (bool, error) {
dir := nav.currDir()
for i := dir.ind + 1; i < len(dir.files); i++ {
matched, err := searchMatch(dir.files[i].Name(), nav.search)
if err != nil {
return err
}
if matched {
nav.down(i - dir.ind)
return nil
if matched, err := searchMatch(dir.files[i].Name(), nav.search); err != nil {
return false, err
} else if matched {
return nav.down(i - dir.ind), nil
}
}
if gOpts.wrapscan {
for i := 0; i < dir.ind; i++ {
matched, err := searchMatch(dir.files[i].Name(), nav.search)
if err != nil {
return err
}
if matched {
nav.up(dir.ind - i)
return nil
if matched, err := searchMatch(dir.files[i].Name(), nav.search); err != nil {
return false, err
} else if matched {
return nav.up(dir.ind - i), nil
}
}
}
return nil
return false, nil
}

func (nav *nav) searchPrev() error {
func (nav *nav) searchPrev() (bool, error) {
dir := nav.currDir()
for i := dir.ind - 1; i >= 0; i-- {
matched, err := searchMatch(dir.files[i].Name(), nav.search)
if err != nil {
return err
}
if matched {
nav.up(dir.ind - i)
return nil
if matched, err := searchMatch(dir.files[i].Name(), nav.search); err != nil {
return false, err
} else if matched {
return nav.up(dir.ind - i), nil
}
}
if gOpts.wrapscan {
for i := len(dir.files) - 1; i > dir.ind; i-- {
matched, err := searchMatch(dir.files[i].Name(), nav.search)
if err != nil {
return err
}
if matched {
nav.down(i - dir.ind)
return nil
if matched, err := searchMatch(dir.files[i].Name(), nav.search); err != nil {
return false, err
} else if matched {
return nav.down(i - dir.ind), nil
}
}
}
return nil
return false, nil
}

func (nav *nav) removeMark(mark string) error {
Expand Down
0