chore: migrated navigation & types to new file

Author: harryfrzz

src/internal/model.go

@@ -808,7 +808,7 @@ func (m *model) updateRenderForOverlay(finalRender string) string {
 
 	if panel.sortOptions.open {
 		sortOptions := m.sortOptionsRender()
-		overlayX := m.fullWidth/2 - panel.sortOptions.width/29
+		overlayX := m.fullWidth/2 - panel.sortOptions.width/2
 		overlayY := m.fullHeight/2 - panel.sortOptions.height/2
 		return stringfunction.PlaceOverlay(overlayX, overlayY, sortOptions, finalRender)
 	}

src/internal/ui/bulk_rename/model.go

@@ -9,7 +9,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 
@@ -19,8 +18,6 @@ import (
 	"github.com/yorukot/superfile/src/internal/utils"
 )
 
-type RenameType int
-
 const (
 	FindReplace RenameType = iota
 	AddPrefix
@@ -30,49 +27,12 @@ const (
 	EditorMode
 )
 
-type CaseType int
-
 const (
 	CaseLower CaseType = iota
 	CaseUpper
 	CaseTitle
 )
 
-type Model struct {
-	open         bool
-	renameType   RenameType
-	caseType     CaseType
-	cursor       int
-	startNumber  int
-	errorMessage string
-
-	findInput    textinput.Model
-	replaceInput textinput.Model
-	prefixInput  textinput.Model
-	suffixInput  textinput.Model
-
-	preview []RenamePreview
-
-	reqCnt int
-
-	width  int
-	height int
-
-	selectedFiles []string
-	currentDir    string
-}
-
-type RenamePreview struct {
-	OldPath string
-	OldName string
-	NewName string
-	Error   string
-}
-
-type UpdateMsg struct {
-	reqID int
-}
-
 func (msg UpdateMsg) GetReqID() int {
 	return msg.reqID
 }
@@ -230,21 +190,10 @@ func (m *Model) handleEditorMode() common.ModelAction {
 	}
 }
 
-type EditorModeAction struct {
-	TmpfilePath   string
-	Editor        string
-	SelectedFiles []string
-	CurrentDir    string
-}
-
 func (a EditorModeAction) String() string {
 	return "EditorModeAction with editor: " + a.Editor
 }
 
-type BulkRenameAction struct {
-	Previews []RenamePreview
-}
-
 func (a BulkRenameAction) String() string {
 	return "BulkRenameAction with " + strconv.Itoa(len(a.Previews)) + " items"
 }
@@ -288,64 +237,6 @@ func (m *Model) adjustValue(delta int) {
 		}
 	}
 }
-func (m *Model) navigateCursor(delta int) {
-	if delta > 0 {
-		m.navigateDown()
-	} else {
-		m.navigateUp()
-	}
-}
-
-func (m *Model) navigateUp() {
-	if m.cursor > 0 {
-		m.cursor--
-		m.focusInput()
-	}
-}
-
-func (m *Model) navigateDown() {
-	if m.cursor < 1 {
-		m.cursor++
-		m.focusInput()
-	}
-}
-
-func (m *Model) focusInput() {
-	m.findInput.Blur()
-	m.replaceInput.Blur()
-	m.prefixInput.Blur()
-	m.suffixInput.Blur()
-
-	switch m.renameType {
-	case FindReplace:
-		if m.cursor == 0 {
-			m.findInput.Focus()
-		} else {
-			m.replaceInput.Focus()
-		}
-	case AddPrefix:
-		m.prefixInput.Focus()
-	case AddSuffix:
-		m.suffixInput.Focus()
-
-	}
-}
-
-func (m *Model) nextType() {
-	m.renameType = RenameType((int(m.renameType) + 1) % 6)
-	m.focusInput()
-	m.preview = nil
-}
-
-func (m *Model) prevType() {
-	newType := int(m.renameType) - 1
-	if newType < 0 {
-		newType = 5
-	}
-	m.renameType = RenameType(newType)
-	m.focusInput()
-	m.preview = nil
-}
 func (m *Model) GeneratePreview() []RenamePreview {
 	return m.generatePreview(false)
 }
@@ -543,11 +434,6 @@ func bulkRenameOperation(processBarModel *processbar.Model, previews []RenamePre
 	return p.State
 }
 
-type BulkRenameResultMsg struct {
-	state processbar.ProcessState
-	count int
-}
-
 func NewBulkRenameResultMsg(state processbar.ProcessState, count int) BulkRenameResultMsg {
 	return BulkRenameResultMsg{state: state, count: count}
 }

src/internal/ui/bulk_rename/navigation.go

@@ -0,0 +1,60 @@
+package bulkrename
+
+func (m *Model) navigateCursor(delta int) {
+	if delta > 0 {
+		m.navigateDown()
+	} else {
+		m.navigateUp()
+	}
+}
+
+func (m *Model) navigateUp() {
+	if m.cursor > 0 {
+		m.cursor--
+		m.focusInput()
+	}
+}
+
+func (m *Model) navigateDown() {
+	if m.cursor < 1 {
+		m.cursor++
+		m.focusInput()
+	}
+}
+
+func (m *Model) focusInput() {
+	m.findInput.Blur()
+	m.replaceInput.Blur()
+	m.prefixInput.Blur()
+	m.suffixInput.Blur()
+
+	switch m.renameType {
+	case FindReplace:
+		if m.cursor == 0 {
+			m.findInput.Focus()
+		} else {
+			m.replaceInput.Focus()
+		}
+	case AddPrefix:
+		m.prefixInput.Focus()
+	case AddSuffix:
+		m.suffixInput.Focus()
+
+	}
+}
+
+func (m *Model) nextType() {
+	m.renameType = RenameType((int(m.renameType) + 1) % 6)
+	m.focusInput()
+	m.preview = nil
+}
+
+func (m *Model) prevType() {
+	newType := int(m.renameType) - 1
+	if newType < 0 {
+		newType = 5
+	}
+	m.renameType = RenameType(newType)
+	m.focusInput()
+	m.preview = nil
+}

src/internal/ui/bulk_rename/type.go

@@ -0,0 +1,59 @@
+package bulkrename
+import (
+	"github.com/charmbracelet/bubbles/textinput"
+	"github.com/yorukot/superfile/src/internal/ui/processbar"
+)
+
+type RenameType int
+type CaseType int
+
+type Model struct {
+	open         bool
+	renameType   RenameType
+	caseType     CaseType
+	cursor       int
+	startNumber  int
+	errorMessage string
+
+	findInput    textinput.Model
+	replaceInput textinput.Model
+	prefixInput  textinput.Model
+	suffixInput  textinput.Model
+
+	preview []RenamePreview
+
+	reqCnt int
+
+	width  int
+	height int
+
+	selectedFiles []string
+	currentDir    string
+}
+
+type RenamePreview struct {
+	OldPath string
+	OldName string
+	NewName string
+	Error   string
+}
+
+type BulkRenameAction struct {
+	Previews []RenamePreview
+}
+
+type UpdateMsg struct {
+	reqID int
+}
+
+type EditorModeAction struct {
+	TmpfilePath   string
+	Editor        string
+	SelectedFiles []string
+	CurrentDir    string
+}
+
+type BulkRenameResultMsg struct {
+	state processbar.ProcessState
+	count int
+}

src/superfile_config/hotkeys.toml

@@ -1,8 +1,6 @@
 # =================================================================================================
 # Global hotkeys (cannot conflict with other hotkeys)
 
-# Need to add vim hotkeys for bulk_rename
-
 confirm = ['enter', 'right', 'l']
 quit = ['q', 'esc']
 cd_quit = ['Q', '']