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

Jump to bottom

Fixed filter when skip-lines is specified #593

Merged
merged 1 commit into from
Jul 9, 2024
Merged

Fixed filter when skip-lines is specified #593

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
16 changes: 8 additions & 8 deletions oviewer/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,14 @@ func (root *Root) filterDocument(ctx context.Context, searcher Searcher) {
}

// Copy the header
if render.Header > 0 {
for ln := render.SkipLines; ln < render.Header; ln++ {
line, err := m.Line(ln)
if err != nil {
break
}
render.lineNumMap.Store(ln, ln)
writeLine(w, line)
for ln := 0; ln < render.firstLine(); ln++ {
line, err := m.Line(ln)
if err != nil {
log.Println(err)
break
}
render.lineNumMap.Store(ln, ln)
writeLine(w, line)
}
go m.filterWriter(ctx, searcher, m.firstLine(), filterDoc)
root.setMessagef(msg)
Expand All @@ -93,6 +92,7 @@ func (m *Document) filterWriter(ctx context.Context, searcher Searcher, startLN
line, err := m.Line(lineNum)
if err != nil {
// deleted?
log.Println(err)
break
}
filterDoc.lineNumMap.Store(renderLN, lineNum)
Expand Down
28 changes: 22 additions & 6 deletions oviewer/filter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func TestRoot_Filter(t *testing.T) {
}
}

func TestRoot_filter(t *testing.T) {
func TestRoot_filter2(t *testing.T) {
tcellNewScreen = fakeScreen
defer func() {
tcellNewScreen = tcell.NewScreen
Expand Down Expand Up @@ -118,6 +118,7 @@ func TestRoot_filterDocument(t *testing.T) {
}()
type fields struct {
fileNames []string
skipLines int
header int
}
type args struct {
Expand All @@ -130,31 +131,46 @@ func TestRoot_filterDocument(t *testing.T) {
want string
}{
{
name: "test.txt",
name: "test3.txtMatch",
fields: fields{
fileNames: []string{filepath.Join(testdata, "test.txt")},
fileNames: []string{filepath.Join(testdata, "test3.txt")},
skipLines: 0,
header: 0,
},
args: args{
searcher: NewSearcher("test", nil, false, false),
searcher: NewSearcher("3", nil, false, false),
},
want: "test",
want: "3",
},
{
name: "test3.txt",
name: "test3.txtHeader",
fields: fields{
fileNames: []string{filepath.Join(testdata, "test3.txt")},
skipLines: 0,
header: 1,
},
args: args{
searcher: NewSearcher("2", nil, false, false),
},
want: "1",
},
{
name: "test3.txtSkipLines",
fields: fields{
fileNames: []string{filepath.Join(testdata, "test3.txt")},
skipLines: 1,
header: 1,
},
args: args{
searcher: NewSearcher("4", nil, false, false),
},
want: "1",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
root := rootFileReadHelper(t, tt.fields.fileNames...)
root.Doc.SkipLines = tt.fields.skipLines
root.Doc.Header = tt.fields.header
root.filterDocument(context.Background(), tt.args.searcher)
filterDoc := root.DocList[len(root.DocList)-1]
Expand Down