From fcaea05f7092429dd1b9ce32c45896d81ffe2d5f Mon Sep 17 00:00:00 2001 From: Daniel Milde Date: Fri, 31 May 2024 19:51:07 +0200 Subject: [PATCH] refactor: move showFile to separate file --- tui/actions.go | 89 ++------------------------------------------ tui/show_file.go | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 86 deletions(-) create mode 100644 tui/show_file.go diff --git a/tui/actions.go b/tui/actions.go index 04e931b87..16df0d0d9 100644 --- a/tui/actions.go +++ b/tui/actions.go @@ -1,7 +1,6 @@ package tui import ( - "bufio" "bytes" "fmt" "io" @@ -13,13 +12,14 @@ import ( "strings" "time" + "github.com/gdamore/tcell/v2" + "github.com/rivo/tview" + "github.com/dundee/gdu/v5/build" "github.com/dundee/gdu/v5/pkg/analyze" "github.com/dundee/gdu/v5/pkg/device" "github.com/dundee/gdu/v5/pkg/fs" "github.com/dundee/gdu/v5/report" - "github.com/gdamore/tcell/v2" - "github.com/rivo/tview" ) const ( @@ -246,89 +246,6 @@ func (ui *UI) deleteSelected(shouldEmpty bool) { }() } -func (ui *UI) showFile() *tview.TextView { - if ui.currentDir == nil { - return nil - } - - row, column := ui.table.GetSelection() - selectedFile := ui.table.GetCell(row, column).GetReference().(fs.Item) - if selectedFile.IsDir() { - return nil - } - - f, err := os.Open(selectedFile.GetPath()) - if err != nil { - ui.showErr("Error opening file", err) - return nil - } - - totalLines := 0 - scanner := bufio.NewScanner(f) - - file := tview.NewTextView() - ui.currentDirLabel.SetText("[::b] --- " + - strings.TrimPrefix(selectedFile.GetPath(), build.RootPathPrefix) + - " ---").SetDynamicColors(true) - - readNextPart := func(linesCount int) int { - var err error - readLines := 0 - for scanner.Scan() && readLines <= linesCount { - _, err = file.Write(scanner.Bytes()) - if err != nil { - ui.showErr("Error reading file", err) - return 0 - } - _, err = file.Write([]byte("\n")) - if err != nil { - ui.showErr("Error reading file", err) - return 0 - } - readLines++ - } - return readLines - } - totalLines += readNextPart(defaultLinesCount) - - file.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey { - if event.Rune() == 'q' || event.Key() == tcell.KeyESC { - err = f.Close() - if err != nil { - ui.showErr("Error closing file", err) - return event - } - ui.currentDirLabel.SetText("[::b] --- " + - strings.TrimPrefix(ui.currentDirPath, build.RootPathPrefix) + - " ---").SetDynamicColors(true) - ui.pages.RemovePage("file") - ui.app.SetFocus(ui.table) - return event - } - - if event.Rune() == 'j' || event.Rune() == 'G' || - event.Key() == tcell.KeyDown || event.Key() == tcell.KeyPgDn { - _, _, _, height := file.GetInnerRect() - row, _ := file.GetScrollOffset() - if height+row > totalLines-linesTreshold { - totalLines += readNextPart(defaultLinesCount) - } - } - return event - }) - - grid := tview.NewGrid().SetRows(1, 1, 0, 1).SetColumns(0) - grid.AddItem(ui.header, 0, 0, 1, 1, 0, 0, false). - AddItem(ui.currentDirLabel, 1, 0, 1, 1, 0, 0, false). - AddItem(file, 2, 0, 1, 1, 0, 0, true). - AddItem(ui.footerLabel, 3, 0, 1, 1, 0, 0, false) - - ui.pages.HidePage("background") - ui.pages.AddPage("file", grid, true, true) - - return file -} - func (ui *UI) showInfo() { if ui.currentDir == nil { return diff --git a/tui/show_file.go b/tui/show_file.go new file mode 100644 index 000000000..e5f15949d --- /dev/null +++ b/tui/show_file.go @@ -0,0 +1,96 @@ +package tui + +import ( + "bufio" + "os" + "strings" + + "github.com/gdamore/tcell/v2" + "github.com/rivo/tview" + + "github.com/dundee/gdu/v5/build" + "github.com/dundee/gdu/v5/pkg/fs" +) + +func (ui *UI) showFile() *tview.TextView { + if ui.currentDir == nil { + return nil + } + + row, column := ui.table.GetSelection() + selectedFile := ui.table.GetCell(row, column).GetReference().(fs.Item) + if selectedFile.IsDir() { + return nil + } + + f, err := os.Open(selectedFile.GetPath()) + if err != nil { + ui.showErr("Error opening file", err) + return nil + } + + totalLines := 0 + scanner := bufio.NewScanner(f) + + file := tview.NewTextView() + ui.currentDirLabel.SetText("[::b] --- " + + strings.TrimPrefix(selectedFile.GetPath(), build.RootPathPrefix) + + " ---").SetDynamicColors(true) + + readNextPart := func(linesCount int) int { + var err error + readLines := 0 + for scanner.Scan() && readLines <= linesCount { + _, err = file.Write(scanner.Bytes()) + if err != nil { + ui.showErr("Error reading file", err) + return 0 + } + _, err = file.Write([]byte("\n")) + if err != nil { + ui.showErr("Error reading file", err) + return 0 + } + readLines++ + } + return readLines + } + totalLines += readNextPart(defaultLinesCount) + + file.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey { + if event.Rune() == 'q' || event.Key() == tcell.KeyESC { + err = f.Close() + if err != nil { + ui.showErr("Error closing file", err) + return event + } + ui.currentDirLabel.SetText("[::b] --- " + + strings.TrimPrefix(ui.currentDirPath, build.RootPathPrefix) + + " ---").SetDynamicColors(true) + ui.pages.RemovePage("file") + ui.app.SetFocus(ui.table) + return event + } + + if event.Rune() == 'j' || event.Rune() == 'G' || + event.Key() == tcell.KeyDown || event.Key() == tcell.KeyPgDn { + _, _, _, height := file.GetInnerRect() + row, _ := file.GetScrollOffset() + if height+row > totalLines-linesTreshold { + totalLines += readNextPart(defaultLinesCount) + } + } + return event + }) + + grid := tview.NewGrid().SetRows(1, 1, 0, 1).SetColumns(0) + grid.AddItem(ui.header, 0, 0, 1, 1, 0, 0, false). + AddItem(ui.currentDirLabel, 1, 0, 1, 1, 0, 0, false). + AddItem(file, 2, 0, 1, 1, 0, 0, true). + AddItem(ui.footerLabel, 3, 0, 1, 1, 0, 0, false) + + ui.pages.HidePage("background") + ui.pages.AddPage("file", grid, true, true) + + return file +}