Added the display after EOF

cmd/root.go

@@ -43,6 +43,9 @@ It supports various compressed files(gzip, bzip2, zstd, lz4, and xz).
 			return nil
 		}
 
+		if config.Debug {
+			fmt.Println("Using config file:", viper.ConfigFileUsed())
+		}
 		oviewer.Debug = config.Debug
 		root := oviewer.New()
 		m := root.Model
@@ -111,9 +114,7 @@ func initConfig() {
 	viper.AutomaticEnv() // read in environment variables that match
 
 	// If a config file is found, read it in.
-	if err := viper.ReadInConfig(); err == nil {
-		//fmt.Println("Using config file:", viper.ConfigFileUsed())
-	}
+	viper.ReadInConfig()
 
 	if err := viper.Unmarshal(&config); err != nil {
 		fmt.Println(err)

draw.go

@@ -2,6 +2,7 @@ package oviewer
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/gdamore/tcell"
 	"github.com/mattn/go-runewidth"
@@ -40,6 +41,7 @@ func (root *root) Draw() {
 		searchWord = root.input
 	}
 
+	// Header
 	lY := 0
 	lX := 0
 	hy := 0
@@ -60,10 +62,17 @@ func (root *root) Draw() {
 		hy++
 	}
 
+	// Body
 	lX = m.yy * m.vWidth
 	for y := root.HeaderLen(); y < m.vHight; y++ {
 		contents := m.getContents(m.lineNum + lY)
+		if contents == nil {
+			// EOF
+			contents = strToContents("~", 0)
+			contents[0].style = contents[0].style.Foreground(tcell.ColorGray)
+		}
 		if len(contents) == 0 {
+			// blank line
 			lY++
 			continue
 		}
@@ -127,6 +136,30 @@ func (root *root) noWrapContents(y int, lX int, lY int, contents []content) (rX
 	return lX, lY
 }
 
+func doReverse(cp *[]content, searchWord string) {
+	contents := *cp
+	for n := range contents {
+		contents[n].style = contents[n].style.Normal()
+	}
+	if searchWord == "" {
+		return
+	}
+	s, cIndex := contentsToStr(contents)
+	for i := strings.Index(s, searchWord); i >= 0; {
+		start := cIndex[i]
+		end := cIndex[i+len(searchWord)]
+		for ci := start; ci < end; ci++ {
+			contents[ci].style = contents[ci].style.Reverse(true)
+		}
+		j := strings.Index(s[i+1:], searchWord)
+		if j >= 0 {
+			i += j + 1
+		} else {
+			break
+		}
+	}
+}
+
 func (root *root) statusDraw() {
 	screen := root.Screen
 	style := tcell.StyleDefault

oviewer.go

@@ -6,7 +6,6 @@ import (
 	"io"
 	"os"
 	"os/signal"
-	"strings"
 	"syscall"
 
 	"github.com/dgraph-io/ristretto"
@@ -97,30 +96,6 @@ func contentsToStr(contents []content) (string, map[int]int) {
 	return s, cIndex
 }
 
-func doReverse(cp *[]content, searchWord string) {
-	contents := *cp
-	for n := range contents {
-		contents[n].style = contents[n].style.Reverse(false)
-	}
-	if searchWord == "" {
-		return
-	}
-	s, cIndex := contentsToStr(contents)
-	for i := strings.Index(s, searchWord); i >= 0; {
-		start := cIndex[i]
-		end := cIndex[i+len(searchWord)]
-		for ci := start; ci < end; ci++ {
-			contents[ci].style = contents[ci].style.Reverse(true)
-		}
-		j := strings.Index(s[i+1:], searchWord)
-		if j >= 0 {
-			i += j + 1
-		} else {
-			break
-		}
-	}
-}
-
 func (root *root) setContentString(vx int, vy int, contents []content, style tcell.Style) {
 	screen := root.Screen
 	for x, content := range contents {