celediel/gt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 2 Wiki Activity

properly handle filtered files being empty

Browse source
This commit is contained in:
Lilian Jónsdóttir 2024-07-30 18:48:49 -07:00
parent ed2def9c2f
commit 1403f2e62f
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
internal/interactive/interactive.go
View file

@ -34,6 +34,7 @@ const (
modifiedColumn string = "modified" modifiedColumn string = "modified"
trashedColumn string = "trashed" trashedColumn string = "trashed"
sizeColumn string = "size" sizeColumn string = "size"
bar string = "───"
// TODO: figure these out dynamically based on longest of each // TODO: figure these out dynamically based on longest of each
filenameColumnW float64 = 0.46 filenameColumnW float64 = 0.46
@ -359,7 +360,7 @@ func (m model) header() string {
} }
right += fmt.Sprintf(" %s %s", dot, strings.Join(selectKeys, wideDot)) right += fmt.Sprintf(" %s %s", dot, strings.Join(selectKeys, wideDot))
left = fmt.Sprintf("%d/%d %s %s", len(m.selected), len(m.table.Rows()), dot, humanize.Bytes(uint64(m.selectsize))) left = fmt.Sprintf("%d/%d %s %s", len(m.selected), len(m.fltrfiles), dot, humanize.Bytes(uint64(m.selectsize)))
if m.mode == modes.Listing { if m.mode == modes.Listing {
title := "Showing" title := "Showing"
@ -483,7 +484,7 @@ func (m *model) updateRows(selected bool) {
} }
func (m *model) toggleItem(index int) (selected bool) { func (m *model) toggleItem(index int) (selected bool) {
if m.readonly { if m.readonly || len(m.fltrfiles) == 0 {
return false return false
} }
@ -509,7 +510,7 @@ func (m *model) toggleItem(index int) (selected bool) {
} }
func (m *model) selectAll() { func (m *model) selectAll() {
if m.readonly { if m.readonly || len(m.fltrfiles) == 0 {
return return
} }
@ -533,7 +534,7 @@ func (m *model) unselectAll() {
} }
func (m *model) invertSelection() { func (m *model) invertSelection() {
if m.readonly { if m.readonly || len(m.fltrfiles) == 0 {
return return
} }
@ -584,6 +585,9 @@ func (m *model) applyFilter() {
rows = append(rows, r) rows = append(rows, r)
} }
if len(rows) == 0 {
rows = append(rows, table.Row{"no files matched filter!", bar, bar, bar, uncheck})
}
m.table.SetRows(rows) m.table.SetRows(rows)
m.updateTableHeight() m.updateTableHeight()
} }
@ -624,18 +628,18 @@ func Select(fls files.Files, width, height int, readonly, once bool, workdir str
} }
func newRow(file files.File, workdir string) table.Row { func newRow(file files.File, workdir string) table.Row {
var time, bar string var time, size string
time = humanize.Time(file.Date()) time = humanize.Time(file.Date())
if file.IsDir() { if file.IsDir() {
bar = strings.Repeat("─", poffset+1) size = bar
} else { } else {
bar = humanize.Bytes(uint64(file.Filesize())) size = humanize.Bytes(uint64(file.Filesize()))
} }
return table.Row{ return table.Row{
dirs.UnEscape(file.Name()), dirs.UnEscape(file.Name()),
dirs.UnExpand(filepath.Dir(file.Path()), workdir), dirs.UnExpand(filepath.Dir(file.Path()), workdir),
time, time,
bar, size,
} }
} }