chore: cleanup

code/code.go

@@ -59,8 +59,8 @@ func readFileContentCmd(fileName, syntaxTheme string) tea.Cmd {
 }
 
 // NewStatusMessage sets a new status message, which will show for a limited
-// amount of time. Note that this also returns a command.
-func (m *Model) NewStatusMessage(s string) tea.Cmd {
+// amount of time.
+func (m *Model) NewStatusMessageCmd(s string) tea.Cmd {
 	m.StatusMessage = s
 	if m.statusMessageTimer != nil {
 		m.statusMessageTimer.Stop()
@@ -75,6 +75,13 @@ func (m *Model) NewStatusMessage(s string) tea.Cmd {
 	}
 }
 
+// SetFileName sets current file to highlight.
+func (m *Model) SetFileNameCmd(filename string) tea.Cmd {
+	m.Filename = filename
+
+	return readFileContentCmd(filename, m.SyntaxTheme)
+}
+
 // New creates a new instance of code.
 func New() Model {
 	viewPort := viewport.New(0, 0)
@@ -92,13 +99,6 @@ func (m Model) Init() tea.Cmd {
 	return nil
 }
 
-// SetFileName sets current file to highlight.
-func (m *Model) SetFileName(filename string) tea.Cmd {
-	m.Filename = filename
-
-	return readFileContentCmd(filename, m.SyntaxTheme)
-}
-
 // SetSyntaxTheme sets the syntax theme of the rendered code.
 func (m *Model) SetSyntaxTheme(theme string) {
 	m.SyntaxTheme = theme
@@ -141,7 +141,12 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 		m.StatusMessage = ""
 	case errorMsg:
 		m.Filename = ""
-		cmds = append(cmds, m.NewStatusMessage(lipgloss.NewStyle().Foreground(lipgloss.Color("#cc241d")).Bold(true).Render(string(msg))))
+		cmds = append(cmds, m.NewStatusMessageCmd(
+			lipgloss.NewStyle().
+				Foreground(lipgloss.Color("#cc241d")).
+				Bold(true).
+				Render(string(msg)),
+		))
 	}
 
 	if !m.ViewportDisabled {

filesystem/filesystem.go

@@ -189,6 +189,7 @@ func Zip(name string) error {
 	fileExtension := filepath.Ext(name)
 	splitFileName := strings.Split(name, "/")
 	fileName := splitFileName[len(splitFileName)-1]
+
 	switch {
 	case strings.HasPrefix(fileName, ".") && fileExtension != "" && fileExtension == fileName:
 		output = fmt.Sprintf("%s_%d.zip", fileName, time.Now().Unix())
@@ -233,6 +234,7 @@ func Zip(name string) error {
 
 			relPath := strings.TrimPrefix(filePath, name)
 			zipFile, err := zipWriter.Create(relPath)
+
 			if err != nil {
 				return errors.Unwrap(err)
 			}
@@ -393,6 +395,7 @@ func CopyFile(name string) error {
 	fileExtension := filepath.Ext(name)
 	splitFileName := strings.Split(name, "/")
 	fileName := splitFileName[len(splitFileName)-1]
+
 	switch {
 	case strings.HasPrefix(fileName, ".") && fileExtension != "" && fileExtension == fileName:
 		output = fmt.Sprintf("%s_%d", fileName, time.Now().Unix())
@@ -452,6 +455,8 @@ func CopyDirectory(name string) error {
 
 // GetDirectoryItemSize calculates the size of a directory or file.
 func GetDirectoryItemSize(path string) (int64, error) {
+	var size int64
+
 	curFile, err := os.Stat(path)
 	if err != nil {
 		return 0, errors.Unwrap(err)
@@ -461,7 +466,6 @@ func GetDirectoryItemSize(path string) (int64, error) {
 		return curFile.Size(), nil
 	}
 
-	var size int64
 	err = filepath.WalkDir(path, func(path string, entry os.DirEntry, err error) error {
 		if err != nil {
 			return errors.Unwrap(err)

filetree/commands.go

@@ -206,8 +206,8 @@ func writeSelectionPathCmd(selectionPath, filePath string) tea.Cmd {
 }
 
 // NewStatusMessage sets a new status message, which will show for a limited
-// amount of time. Note that this also returns a command.
-func (m *Model) NewStatusMessage(s string) tea.Cmd {
+// amount of time.
+func (m *Model) NewStatusMessageCmd(s string) tea.Cmd {
 	m.StatusMessage = s
 
 	if m.statusMessageTimer != nil {
@@ -229,6 +229,7 @@ func openEditorCmd(file string) tea.Cmd {
 	}
 
 	c := exec.Command(editor, file)
+
 	return tea.ExecProcess(c, func(err error) tea.Msg {
 		return editorFinishedMsg{err}
 	})

filetree/update.go

@@ -26,15 +26,15 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 			return m, tea.Quit
 		}
 	case errorMsg:
-		cmds = append(cmds, m.NewStatusMessage(
+		cmds = append(cmds, m.NewStatusMessageCmd(
 			lipgloss.NewStyle().
 				Foreground(lipgloss.Color("#cc241d")).
 				Bold(true).
 				Render(string(msg))))
 	case statusMessageTimeoutMsg:
 		m.StatusMessage = ""
 	case copyToClipboardMsg:
-		cmds = append(cmds, m.NewStatusMessage(
+		cmds = append(cmds, m.NewStatusMessageCmd(
 			lipgloss.NewStyle().
 				Bold(true).
 				Render(string(msg))))
@@ -120,9 +120,11 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 			}
 
 			m.Cursor += m.height
+
 			if m.Cursor >= len(m.files) {
 				m.Cursor = len(m.files) - 1
 			}
+
 			m.min += m.height
 			m.max += m.height
 

help/help.go

@@ -92,7 +92,15 @@ func (m *Model) SetSize(w, h int) {
 	m.Viewport.Width = w
 	m.Viewport.Height = h
 
-	m.Viewport.SetContent(generateHelpScreen(m.Title, m.TitleColor, m.Entries, m.Viewport.Width, m.Viewport.Height))
+	m.Viewport.SetContent(
+		generateHelpScreen(
+			m.Title,
+			m.TitleColor,
+			m.Entries,
+			m.Viewport.Width,
+			m.Viewport.Height,
+		),
+	)
 }
 
 // SetViewportDisabled toggles the state of the viewport.
@@ -109,7 +117,15 @@ func (m *Model) GotoTop() {
 func (m *Model) SetTitleColor(color TitleColor) {
 	m.TitleColor = color
 
-	m.Viewport.SetContent(generateHelpScreen(m.Title, m.TitleColor, m.Entries, m.Viewport.Width, m.Viewport.Height))
+	m.Viewport.SetContent(
+		generateHelpScreen(
+			m.Title,
+			m.TitleColor,
+			m.Entries,
+			m.Viewport.Width,
+			m.Viewport.Height,
+		),
+	)
 }
 
 // Update handles UI interactions with the help bubble.

icons/icons.go

@@ -117,7 +117,9 @@ func replaceTilde(s string) string {
 // trimmed. Empty lines are skipped.
 func readPairs(r io.Reader) ([][]string, error) {
 	var pairs [][]string
+
 	s := bufio.NewScanner(r)
+
 	for s.Scan() {
 		line := s.Text()
 
@@ -162,12 +164,15 @@ func readPairs(r io.Reader) ([][]string, error) {
 					squote = !squote
 					continue
 				}
+
 				if r == '"' && !squote {
 					dquote = !dquote
 					continue
 				}
+
 				buf = append(buf, r)
 			}
+
 			pair[i] = string(buf)
 		}
 

image/image.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/charmbracelet/bubbles/viewport"
 	tea "github.com/charmbracelet/bubbletea"
@@ -16,7 +17,19 @@ import (
 )
 
 type convertImageToStringMsg string
-type errorMsg error
+type errorMsg string
+type statusMessageTimeoutMsg struct{}
+
+// Model represents the properties of a image bubble.
+type Model struct {
+	Viewport              viewport.Model
+	ViewportDisabled      bool
+	FileName              string
+	ImageString           string
+	StatusMessage         string
+	StatusMessageLifetime time.Duration
+	statusMessageTimer    *time.Timer
+}
 
 // ToString converts an image to a string representation of an image.
 func ToString(width int, img image.Image) string {
@@ -46,16 +59,33 @@ func ToString(width int, img image.Image) string {
 	return str.String()
 }
 
+// NewStatusMessage sets a new status message, which will show for a limited
+// amount of time.
+func (m *Model) NewStatusMessageCmd(s string) tea.Cmd {
+	m.StatusMessage = s
+
+	if m.statusMessageTimer != nil {
+		m.statusMessageTimer.Stop()
+	}
+
+	m.statusMessageTimer = time.NewTimer(m.StatusMessageLifetime)
+
+	return func() tea.Msg {
+		<-m.statusMessageTimer.C
+		return statusMessageTimeoutMsg{}
+	}
+}
+
 func convertImageToStringCmd(width int, filename string) tea.Cmd {
 	return func() tea.Msg {
 		imageContent, err := os.Open(filepath.Clean(filename))
 		if err != nil {
-			return errorMsg(err)
+			return errorMsg(err.Error())
 		}
 
 		img, _, err := image.Decode(imageContent)
 		if err != nil {
-			return errorMsg(err)
+			return errorMsg(err.Error())
 		}
 
 		imageString := ToString(width, img)
@@ -64,38 +94,15 @@ func convertImageToStringCmd(width int, filename string) tea.Cmd {
 	}
 }
 
-// Model represents the properties of a image bubble.
-type Model struct {
-	Viewport         viewport.Model
-	ViewportDisabled bool
-	FileName         string
-	ImageString      string
-}
-
-// New creates a new instance of an image.
-func New() Model {
-	viewPort := viewport.New(0, 0)
-
-	return Model{
-		Viewport:         viewPort,
-		ViewportDisabled: false,
-	}
-}
-
-// Init initializes the image bubble.
-func (m Model) Init() tea.Cmd {
-	return nil
-}
-
-// SetFileName sets the image file and convers it to a string.
-func (m *Model) SetFileName(filename string) tea.Cmd {
+// SetFileName sets the image file and converts it to a string.
+func (m *Model) SetFileNameCmd(filename string) tea.Cmd {
 	m.FileName = filename
 
 	return convertImageToStringCmd(m.Viewport.Width, filename)
 }
 
 // SetSize sets the size of the bubble.
-func (m *Model) SetSize(w, h int) tea.Cmd {
+func (m *Model) SetSizeCmd(w, h int) tea.Cmd {
 	m.Viewport.Width = w
 	m.Viewport.Height = h
 
@@ -106,6 +113,22 @@ func (m *Model) SetSize(w, h int) tea.Cmd {
 	return nil
 }
 
+// New creates a new instance of an image.
+func New() Model {
+	viewPort := viewport.New(0, 0)
+
+	return Model{
+		Viewport:              viewPort,
+		ViewportDisabled:      false,
+		StatusMessageLifetime: time.Second,
+	}
+}
+
+// Init initializes the image bubble.
+func (m Model) Init() tea.Cmd {
+	return nil
+}
+
 // SetViewportDisabled toggles the state of the viewport.
 func (m *Model) SetViewportDisabled(disabled bool) {
 	m.ViewportDisabled = disabled
@@ -134,15 +157,12 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 
 		return m, nil
 	case errorMsg:
-		m.FileName = ""
-		m.ImageString = lipgloss.NewStyle().
-			Width(m.Viewport.Width).
-			Height(m.Viewport.Height).
-			Render("Error: " + msg.Error())
-
-		m.Viewport.SetContent(m.ImageString)
-
-		return m, nil
+		cmds = append(cmds, m.NewStatusMessageCmd(
+			lipgloss.NewStyle().
+				Foreground(lipgloss.Color("#cc241d")).
+				Bold(true).
+				Render(string(msg)),
+		))
 	}
 
 	if !m.ViewportDisabled {