refactor: move sortFiles to utils

Author: dlvhdr

pkg/ui/mainModel.go

@@ -2,8 +2,6 @@ package ui
 
 import (
 	"fmt"
-	"path/filepath"
-	"slices"
 	"strings"
 
 	"github.com/bluekeyes/go-gitdiff/gitdiff"
@@ -257,6 +255,10 @@ func (m mainModel) View() string {
 	)
 }
 
+type fileTreeMsg struct {
+	files []*gitdiff.File
+}
+
 func (m mainModel) fetchFileTree() tea.Msg {
 	// TODO: handle error
 	files, _, err := gitdiff.Parse(strings.NewReader(m.input + "\n"))
@@ -268,41 +270,6 @@ func (m mainModel) fetchFileTree() tea.Msg {
 	return fileTreeMsg{files: files}
 }
 
-type fileTreeMsg struct {
-	files []*gitdiff.File
-}
-
-func sortFiles(files []*gitdiff.File) {
-	slices.SortFunc(files, func(a *gitdiff.File, b *gitdiff.File) int {
-		nameA := filenode.GetFileName(a)
-		nameB := filenode.GetFileName(b)
-		dira := filepath.Dir(nameA)
-		dirb := filepath.Dir(nameB)
-		if dira != "." && dirb != "." && dira == dirb {
-			return strings.Compare(strings.ToLower(nameA), strings.ToLower(nameB))
-		}
-
-		if dira != "." && dirb == "." {
-			return -1
-		}
-		if dirb != "." && dira == "." {
-			return 1
-		}
-
-		if dira != "." && dirb != "." {
-			if strings.HasPrefix(dira, dirb) {
-				return -1
-			}
-
-			if strings.HasPrefix(dirb, dira) {
-				return 1
-			}
-		}
-
-		return strings.Compare(strings.ToLower(nameA), strings.ToLower(nameB))
-	})
-}
-
 func (m mainModel) footerView() string {
 	return lipgloss.NewStyle().
 		Width(m.width).
@@ -336,11 +303,6 @@ func (m mainModel) sidebarWidth() int {
 	}
 }
 
-func (m mainModel) setDiffViewerDimensions() tea.Cmd {
-	dfCmd := m.diffViewer.SetSize(m.width-m.sidebarWidth(), m.height-footerHeight-headerHeight)
-	return dfCmd
-}
-
 func (m *mainModel) stopSearch() {
 	m.searching = false
 	m.search.SetValue("")

pkg/ui/utils.go

@@ -0,0 +1,42 @@
+package ui
+
+import (
+	"path/filepath"
+	"slices"
+	"strings"
+
+	"github.com/bluekeyes/go-gitdiff/gitdiff"
+
+	"github.com/dlvhdr/diffnav/pkg/filenode"
+)
+
+func sortFiles(files []*gitdiff.File) {
+	slices.SortFunc(files, func(a *gitdiff.File, b *gitdiff.File) int {
+		nameA := filenode.GetFileName(a)
+		nameB := filenode.GetFileName(b)
+		dira := filepath.Dir(nameA)
+		dirb := filepath.Dir(nameB)
+		if dira != "." && dirb != "." && dira == dirb {
+			return strings.Compare(strings.ToLower(nameA), strings.ToLower(nameB))
+		}
+
+		if dira != "." && dirb == "." {
+			return -1
+		}
+		if dirb != "." && dira == "." {
+			return 1
+		}
+
+		if dira != "." && dirb != "." {
+			if strings.HasPrefix(dira, dirb) {
+				return -1
+			}
+
+			if strings.HasPrefix(dirb, dira) {
+				return 1
+			}
+		}
+
+		return strings.Compare(strings.ToLower(nameA), strings.ToLower(nameB))
+	})
+}