michael/lf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make select work properly with loading directories

Browse Source 
Related #370
This commit is contained in:
Gokcehan 2020-07-17 02:12:10 +03:00
parent 707d927788
commit ffdcb71897
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nav.go
View File

@ -311,15 +311,16 @@ func (nav *nav) checkDir(dir *dir) {
switch { switch {
case s.ModTime().After(dir.loadTime): case s.ModTime().After(dir.loadTime):
dir.loading = true
dir.loadTime = time.Now()
go func() { go func() {
dir.loadTime = time.Now()
nd := newDir(dir.path) nd := newDir(dir.path)
nd.sort() nd.sort()
nav.dirChan <- nd nav.dirChan <- nd
}() }()
case dir.sortType != gOpts.sortType: case dir.sortType != gOpts.sortType:
dir.loading = true
go func() { go func() {
dir.loading = true
dir.sort() dir.sort()
dir.loading = false dir.loading = false
nav.dirChan <- dir nav.dirChan <- dir
@ -868,7 +869,11 @@ func (nav *nav) rename() error {
} }
dir := nav.loadDir(filepath.Dir(newPath)) dir := nav.loadDir(filepath.Dir(newPath))
dir.files = append(dir.files, &file{FileInfo: lstat})
if dir.loading {
dir.files = append(dir.files, &file{FileInfo: lstat})
}
dir.sel(lstat.Name(), nav.height) dir.sel(lstat.Name(), nav.height)
return nil return nil
@ -923,12 +928,13 @@ func (nav *nav) sel(path string) error {
base := filepath.Base(path) base := filepath.Base(path)
last := nav.dirs[len(nav.dirs)-1] last := nav.dirs[len(nav.dirs)-1]
if last.loading { if last.loading {
last.files = append(last.files, &file{FileInfo: lstat}) last.files = append(last.files, &file{FileInfo: lstat})
} else {
last.sel(base, nav.height)
} }
last.sel(base, nav.height)
return nil return nil
} }