Skip to content
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

Don't redraw volatile previews on ticker period #546

Merged
merged 1 commit into from
Jan 4, 2021
Merged

Don't redraw volatile previews on ticker period #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ func (app *app) loop() {
curr, err := app.nav.currFile()
if err == nil {
if d.path == app.nav.currDir().path {
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
}
if d.path == curr.path {
app.ui.dirPrev = d
Expand Down Expand Up @@ -352,7 +352,7 @@ func (app *app) loop() {
app.ui.draw(app.nav)
case <-app.ticker.C:
app.nav.renew()
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, false)
app.ui.draw(app.nav)
}
}
Expand Down Expand Up @@ -438,7 +438,7 @@ func (app *app) runShell(s string, args []string, prefix string) {
}
}

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

switch prefix {
case "%":
Expand Down
82 changes: 41 additions & 41 deletions eval.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@ func (e *setExpr) eval(app *app, args []string) {
app.nav.sort()
app.nav.position()
app.ui.sort()
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
case "nohidden":
gOpts.sortType.option &= ^hiddenSort
app.nav.sort()
app.nav.position()
app.ui.sort()
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
case "hidden!":
gOpts.sortType.option ^= hiddenSort
app.nav.sort()
app.nav.position()
app.ui.sort()
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
case "icons":
gOpts.icons = true
case "noicons":
Expand Down Expand Up @@ -243,7 +243,7 @@ func (e *setExpr) eval(app *app, args []string) {
app.nav.sort()
app.nav.position()
app.ui.sort()
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
case "ifs":
gOpts.ifs = e.val
case "info":
Expand Down Expand Up @@ -288,7 +288,7 @@ func (e *setExpr) eval(app *app, args []string) {
}
gOpts.ratios = rats
app.ui.wins = getWins(app.ui.screen)
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
case "shell":
gOpts.shell = e.val
case "shellopts":
Expand Down Expand Up @@ -401,7 +401,7 @@ func update(app *app) {
return
}

app.ui.loadFile(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)
Expand All @@ -415,7 +415,7 @@ func update(app *app) {
return
}

app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
}
Expand Down Expand Up @@ -443,7 +443,7 @@ func insert(app *app, arg string) {
case 0:
app.ui.echoerrf("find: pattern not found: %s", app.nav.find)
case 1:
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
default:
app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(arg)...)
Expand All @@ -458,7 +458,7 @@ func insert(app *app, arg string) {
if !app.nav.findNext() {
app.ui.echoerrf("find: pattern not found: %s", app.nav.find)
} else {
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
}
Expand All @@ -472,7 +472,7 @@ func insert(app *app, arg string) {
case 0:
app.ui.echoerrf("find-back: pattern not found: %s", app.nav.find)
case 1:
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
default:
app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(arg)...)
Expand All @@ -487,7 +487,7 @@ func insert(app *app, arg string) {
if !app.nav.findPrev() {
app.ui.echoerrf("find-back: pattern not found: %s", app.nav.find)
} else {
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
}
Expand All @@ -506,7 +506,7 @@ func insert(app *app, arg string) {
app.ui.echoerrf("delete: %s", err)
return
}
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
case strings.HasPrefix(app.ui.cmdPrefix, "replace"):
Expand All @@ -521,7 +521,7 @@ func insert(app *app, arg string) {
app.ui.echoerrf("rename: %s", err)
return
}
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
case strings.HasPrefix(app.ui.cmdPrefix, "create"):
Expand All @@ -540,7 +540,7 @@ func insert(app *app, arg string) {
app.ui.echoerrf("rename: %s", err)
return
}
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
case app.ui.cmdPrefix == "mark-save: ":
Expand Down Expand Up @@ -575,7 +575,7 @@ func insert(app *app, arg string) {
app.ui.echoerrf("%s", err)
return
}
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)

if wd != path {
Expand Down Expand Up @@ -607,42 +607,42 @@ func (e *callExpr) eval(app *app, args []string) {
normal(app)
}
app.nav.up(e.count)
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "half-up":
if app.ui.cmdPrefix != "" && app.ui.cmdPrefix != ">" {
normal(app)
}
app.nav.up(e.count * app.nav.height / 2)
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "page-up":
if app.ui.cmdPrefix != "" && app.ui.cmdPrefix != ">" {
normal(app)
}
app.nav.up(e.count * app.nav.height)
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "down":
if app.ui.cmdPrefix != "" && app.ui.cmdPrefix != ">" {
normal(app)
}
app.nav.down(e.count)
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "half-down":
if app.ui.cmdPrefix != "" && app.ui.cmdPrefix != ">" {
normal(app)
}
app.nav.down(e.count * app.nav.height / 2)
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "page-down":
if app.ui.cmdPrefix != "" && app.ui.cmdPrefix != ">" {
normal(app)
}
app.nav.down(e.count * app.nav.height)
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "updir":
if app.ui.cmdPrefix != "" && app.ui.cmdPrefix != ">" {
Expand All @@ -654,7 +654,7 @@ func (e *callExpr) eval(app *app, args []string) {
return
}
}
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
onChdir(app)
case "open":
Expand All @@ -673,7 +673,7 @@ func (e *callExpr) eval(app *app, args []string) {
app.ui.echoerrf("opening directory: %s", err)
return
}
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
onChdir(app)
return
Expand Down Expand Up @@ -711,11 +711,11 @@ func (e *callExpr) eval(app *app, args []string) {
app.quitChan <- struct{}{}
case "top":
app.nav.top()
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "bottom":
app.nav.bottom()
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "toggle":
if len(e.args) == 0 {
Expand Down Expand Up @@ -766,7 +766,7 @@ func (e *callExpr) eval(app *app, args []string) {
app.ui.echoerrf("paste: %s", err)
return
}
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "delete":
if cmd, ok := gOpts.cmds["delete"]; ok {
Expand All @@ -789,7 +789,7 @@ func (e *callExpr) eval(app *app, args []string) {
app.ui.cmdPrefix = "delete " + strconv.Itoa(len(list)) + " items? [y/N] "
}
}
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "clear":
if err := saveFiles(nil, false); err != nil {
Expand All @@ -806,15 +806,15 @@ func (e *callExpr) eval(app *app, args []string) {
app.ui.renew()
app.ui.screen.Sync()
app.nav.height = app.ui.wins[0].h
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
case "load":
app.nav.renew()
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
case "reload":
if err := app.nav.reload(); err != nil {
app.ui.echoerrf("reload: %s", err)
}
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "read":
app.ui.cmdPrefix = ":"
Expand Down Expand Up @@ -847,7 +847,7 @@ func (e *callExpr) eval(app *app, args []string) {
app.nav.findNext()
}
}
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "find-prev":
for i := 0; i < e.count; i++ {
Expand All @@ -857,7 +857,7 @@ func (e *callExpr) eval(app *app, args []string) {
app.nav.findPrev()
}
}
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "search":
app.ui.cmdPrefix = "/"
Expand Down Expand Up @@ -887,7 +887,7 @@ func (e *callExpr) eval(app *app, args []string) {
}
}
}
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "search-prev":
for i := 0; i < e.count; i++ {
Expand All @@ -903,7 +903,7 @@ func (e *callExpr) eval(app *app, args []string) {
}
}
}
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "mark-save":
app.ui.cmdPrefix = "mark-save: "
Expand All @@ -929,7 +929,7 @@ func (e *callExpr) eval(app *app, args []string) {
app.ui.cmdPrefix = "rename: "
app.ui.cmdAccLeft = append(app.ui.cmdAccLeft, []rune(curr.Name())...)
}
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
case "sync":
if err := app.nav.sync(); err != nil {
Expand Down Expand Up @@ -957,7 +957,7 @@ func (e *callExpr) eval(app *app, args []string) {
return
}

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

if !filepath.IsAbs(path) {
Expand Down Expand Up @@ -986,7 +986,7 @@ func (e *callExpr) eval(app *app, args []string) {
return
}

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

path := filepath.Dir(e.args[0])
Expand Down Expand Up @@ -1056,7 +1056,7 @@ func (e *callExpr) eval(app *app, args []string) {
dir.ind = app.nav.searchInd
dir.pos = app.nav.searchPos

app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
normal(app)
Expand Down Expand Up @@ -1232,7 +1232,7 @@ func (e *callExpr) eval(app *app, args []string) {
if err := app.nav.searchNext(); err != nil {
app.ui.echoerrf("search: %s: %s", err, app.nav.search)
} else {
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
case "?":
Expand All @@ -1247,7 +1247,7 @@ func (e *callExpr) eval(app *app, args []string) {
if err := app.nav.searchPrev(); err != nil {
app.ui.echoerrf("search-back: %s: %s", err, app.nav.search)
} else {
app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
case "rename: ":
Expand Down Expand Up @@ -1302,7 +1302,7 @@ func (e *callExpr) eval(app *app, args []string) {
return
}

app.ui.loadFile(app.nav)
app.ui.loadFile(app.nav, true)
app.ui.loadFileInfo(app.nav)
}
default:
Expand Down
4 changes: 2 additions & 2 deletions nav.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,9 +548,9 @@ func (nav *nav) preview(path string, win *win) {
}
}

func (nav *nav) loadReg(path string) *reg {
func (nav *nav) loadReg(path string, volatile bool) *reg {
r, ok := nav.regCache[path]
if !ok || r.volatile {
if !ok || (volatile && r.volatile) {
r := &reg{loading: true, loadTime: time.Now(), path: path, volatile: true}
nav.regCache[path] = r
nav.previewChan <- path
Expand Down
Loading