use cfg

gohost/service.go

@@ -10,6 +10,7 @@ import (
 var (
 	service     *Service
 	serviceOnce sync.Once
+	cfg         = config.Instance()
 )
 
 func GetService() *Service {
@@ -84,7 +85,7 @@ func (s *Service) ChildNodes(nodeID string) []*TreeNode {
 // ApplyHost TODO apply host to system
 func (s *Service) ApplyHost(hosts []byte) {
 	// open system host file
-	sysHostFile, err := os.Create(config.Instance().SysHostFile)
+	sysHostFile, err := os.Create(cfg.SysHostFile)
 	if err != nil {
 		panic(err)
 	}

gohost/sys_host.go

@@ -1,7 +1,6 @@
 package gohost
 
 import (
-	"gohost/config"
 	"os"
 	"sync"
 )
@@ -16,7 +15,7 @@ func SysHost() Host {
 	sysHostOnce.Do(func() {
 		sysHostInstance = &sysHost{
 			name: "System Host",
-			desc: config.Instance().SysHostFile,
+			desc: cfg.SysHostFile,
 		}
 	})
 	return sysHostInstance
@@ -56,7 +55,7 @@ func (s *sysHost) GetName() string {
 }
 
 func (s *sysHost) GetContent() []byte {
-	hosts, err := os.ReadFile(config.Instance().SysHostFile)
+	hosts, err := os.ReadFile(cfg.SysHostFile)
 	if err != nil {
 		return []byte("Can not open system hosts file: \n" + err.Error())
 	}

tui/help_view.go

@@ -4,6 +4,7 @@ import (
 	"github.com/charmbracelet/bubbles/help"
 	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
+	"strings"
 )
 
 type HelpView struct {
@@ -37,12 +38,14 @@ func (h *HelpView) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (h *HelpView) View() string {
-	var helper string
-	helper += h.view.View(keys)
+	var b strings.Builder
+	b.WriteString(h.view.View(keys))
 	if h.enableDebug {
-		helper += "\nDebug: " + h.debug
+		b.WriteString(cfg.LineBreak)
+		b.WriteString("Debug: ")
+		b.WriteString(h.debug)
 	}
-	return helper
+	return b.String()
 }
 
 func (h *HelpView) Width() int {

tui/model.go

@@ -4,8 +4,10 @@ import (
 	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	"gohost/config"
 	"gohost/tui/styles"
 	"strconv"
+	"strings"
 )
 
 type sessionState int
@@ -17,6 +19,8 @@ const (
 	lastState
 )
 
+var cfg = config.Instance()
+
 type Model struct {
 	state          sessionState
 	helpView       *HelpView
@@ -66,24 +70,24 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m *Model) View() string {
-	var str string
+	var b strings.Builder
 	switch m.state {
 	case treeViewState:
-		str = lipgloss.JoinHorizontal(lipgloss.Top,
+		b.WriteString(lipgloss.JoinHorizontal(lipgloss.Top,
 			styles.FocusedView.Render(m.groupView.View()),
-			styles.DefaultView.Render(m.editorView.View()))
+			styles.DefaultView.Render(m.editorView.View())))
 	case editorViewState:
-		str = lipgloss.JoinHorizontal(lipgloss.Top,
+		b.WriteString(lipgloss.JoinHorizontal(lipgloss.Top,
 			styles.DefaultView.Render(m.groupView.View()),
-			styles.FocusedView.Render(m.editorView.View()))
+			styles.FocusedView.Render(m.editorView.View())))
 	case nodeViewState:
-		str = lipgloss.JoinHorizontal(lipgloss.Top,
+		b.WriteString(lipgloss.JoinHorizontal(lipgloss.Top,
 			styles.DefaultView.Render(m.groupView.View()),
-			styles.FocusedView.Render(m.nodeView.View()),
-		)
+			styles.FocusedView.Render(m.nodeView.View())))
 	}
-	str = lipgloss.JoinVertical(lipgloss.Left, str, m.helpView.View())
-	return str
+
+	v := lipgloss.JoinVertical(lipgloss.Left, b.String(), m.helpView.View())
+	return v
 }
 
 func (m *Model) updateView(msg tea.Msg, cmds *[]tea.Cmd, view tea.Model) {

tui/node_view.go

@@ -3,7 +3,6 @@ package tui
 import (
 	"github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
-	"gohost/config"
 	"gohost/tui/styles"
 	"strings"
 )
@@ -51,7 +50,7 @@ func (v *NodeView) View() string {
 	for i := range v.inputs {
 		b.WriteString(v.inputs[i].View())
 		if i < len(v.inputs)-1 {
-			b.WriteString(config.Instance().LineBreak)
+			b.WriteString(cfg.LineBreak)
 		}
 	}
 	return b.String()