add file content render
This commit is contained in:
+3
-2
@@ -57,9 +57,10 @@ func TestWalkFileSystemAndBuildTree(t *testing.T) {
|
|||||||
t.Errorf("child %q parent pointer incorrect", child.FileName())
|
t.Errorf("child %q parent pointer incorrect", child.FileName())
|
||||||
}
|
}
|
||||||
|
|
||||||
if child.nodeType == FileNode {
|
switch child.nodeType {
|
||||||
|
case FileNode:
|
||||||
fileCount++
|
fileCount++
|
||||||
} else if child.nodeType == FolderNode {
|
case FolderNode:
|
||||||
folderCount++
|
folderCount++
|
||||||
if child.FileName() == "folder1" {
|
if child.FileName() == "folder1" {
|
||||||
folder1 = child
|
folder1 = child
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"mend/styles"
|
"mend/styles"
|
||||||
"mend/utils"
|
"mend/utils"
|
||||||
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@@ -195,6 +196,22 @@ func (t *FsTree) ToggleSelectedExpand() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (t *FsTree) GetSelectedContent() (string, error) {
|
||||||
|
if t.selected == nil {
|
||||||
|
return "", errors.New("no node is currently selected")
|
||||||
|
}
|
||||||
|
|
||||||
|
if t.selected.nodeType != FileNode {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
contentBytes, err := os.ReadFile(t.selected.path)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return string(contentBytes), nil
|
||||||
|
}
|
||||||
|
|
||||||
func (t *FsTree) Render() string {
|
func (t *FsTree) Render() string {
|
||||||
builder := &strings.Builder{}
|
builder := &strings.Builder{}
|
||||||
t.renderNode(t.root, 0, builder)
|
t.renderNode(t.root, 0, builder)
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import (
|
|||||||
fs "mend/fstree"
|
fs "mend/fstree"
|
||||||
|
|
||||||
"github.com/charmbracelet/bubbles/spinner"
|
"github.com/charmbracelet/bubbles/spinner"
|
||||||
|
"github.com/charmbracelet/bubbles/viewport"
|
||||||
tea "github.com/charmbracelet/bubbletea"
|
tea "github.com/charmbracelet/bubbletea"
|
||||||
"github.com/charmbracelet/lipgloss"
|
"github.com/charmbracelet/lipgloss"
|
||||||
)
|
)
|
||||||
@@ -43,8 +44,9 @@ type model struct {
|
|||||||
tree *fs.FsTree
|
tree *fs.FsTree
|
||||||
// spinner needs to be state as I need to update the spinner on
|
// spinner needs to be state as I need to update the spinner on
|
||||||
// each tick in update func
|
// each tick in update func
|
||||||
spinner spinner.Model
|
spinner spinner.Model
|
||||||
loading bool
|
loading bool
|
||||||
|
viewport viewport.Model
|
||||||
}
|
}
|
||||||
|
|
||||||
// initial model state
|
// initial model state
|
||||||
@@ -60,6 +62,7 @@ func createModel() model {
|
|||||||
tree: nil,
|
tree: nil,
|
||||||
spinner: s,
|
spinner: s,
|
||||||
loading: true,
|
loading: true,
|
||||||
|
viewport: viewport.New(0, 0),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,6 +93,8 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|||||||
case tea.WindowSizeMsg:
|
case tea.WindowSizeMsg:
|
||||||
m.terminalWidth = msg.Width
|
m.terminalWidth = msg.Width
|
||||||
m.terminalHeight = msg.Height
|
m.terminalHeight = msg.Height
|
||||||
|
m.viewport.Width = msg.Width - m.width - 1
|
||||||
|
m.viewport.Height = msg.Height
|
||||||
return m, nil
|
return m, nil
|
||||||
case treeLoadedMsg:
|
case treeLoadedMsg:
|
||||||
m.tree = msg.tree
|
m.tree = msg.tree
|
||||||
@@ -115,6 +120,13 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|||||||
if err := m.tree.ToggleSelectedExpand(); err != nil {
|
if err := m.tree.ToggleSelectedExpand(); err != nil {
|
||||||
fmt.Println("Error toggling expand:", err)
|
fmt.Println("Error toggling expand:", err)
|
||||||
}
|
}
|
||||||
|
case "l", "L":
|
||||||
|
content, err := m.tree.GetSelectedContent()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println("Error getting selected content:", err)
|
||||||
|
} else {
|
||||||
|
m.viewport.SetContent(content)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return m, nil
|
return m, nil
|
||||||
@@ -130,7 +142,9 @@ func (m model) View() string {
|
|||||||
Render(m.tree.Render())
|
Render(m.tree.Render())
|
||||||
|
|
||||||
right := lipgloss.NewStyle().
|
right := lipgloss.NewStyle().
|
||||||
Render("section2")
|
Width(m.terminalWidth - m.width - 1).
|
||||||
|
Height(m.terminalHeight).
|
||||||
|
Render(m.viewport.View())
|
||||||
|
|
||||||
divider := lipgloss.NewStyle().
|
divider := lipgloss.NewStyle().
|
||||||
Width(1).
|
Width(1).
|
||||||
@@ -144,7 +158,10 @@ func (m model) View() string {
|
|||||||
// =================== bubbletea ui fns ===================
|
// =================== bubbletea ui fns ===================
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
p := tea.NewProgram(createModel(), tea.WithAltScreen() /* <- full screen tui */)
|
p := tea.NewProgram(
|
||||||
|
createModel(),
|
||||||
|
tea.WithAltScreen(), // full screen tui
|
||||||
|
)
|
||||||
if _, err := p.Run(); err != nil {
|
if _, err := p.Run(); err != nil {
|
||||||
fmt.Printf("Error: %v", err)
|
fmt.Printf("Error: %v", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
|
|||||||
Reference in New Issue
Block a user