feat: Remove existing notify and warn modals

Author: lazysegtree

src/internal/function.go

@@ -361,3 +361,10 @@ func processCmdToTeaCmd(cmd processbar.Cmd) tea.Cmd {
 		}
 	}
 }
+
+func getCopyOrCutOperationName(cut bool) string {
+	if cut {
+		return "cut"
+	}
+	return "copy"
+}

src/internal/handle_file_operations.go

@@ -65,7 +65,7 @@ func (m *model) warnModalForRenaming() tea.Cmd {
 			"There is already a file or directory with that name",
 			"This operation will override the existing file",
 			notify.RenameAction)
-		return NewNofifyModalMsg(notifyModel, reqID)
+		return NewNotifyModalMsg(notifyModel, reqID)
 	}
 }
 
@@ -170,7 +170,7 @@ func (m *model) getDeleteTriggerCmd() tea.Cmd {
 			title = "Are you sure you want to completely delete"
 			content = "This operation cannot be undone and your data will be completely lost."
 		}
-		return NewNofifyModalMsg(notify.New(true, title, content, notify.DeleteAction), reqID)
+		return NewNotifyModalMsg(notify.New(true, title, content, notify.DeleteAction), reqID)
 	}
 }
 
@@ -216,7 +216,7 @@ func (m *model) getPasteItemCmd() tea.Cmd {
 	return func() tea.Msg {
 		err := validatePasteOperation(panelLocation, copyItems, cut)
 		if err != nil {
-			return NewNofifyModalMsg(notify.New(true, "Invalid paste location", err.Error(), notify.NoAction),
+			return NewNotifyModalMsg(notify.New(true, "Invalid paste location", err.Error(), notify.NoAction),
 				reqID)
 		}
 		state := executePasteOperation(&m.processBarModel, panelLocation, copyItems, cut)
@@ -238,11 +238,8 @@ func validatePasteOperation(panelLocation string, copyItems []string, cut bool)
 		}
 
 		if isAncestor(srcPath, panelLocation) {
-			operation := "copy"
-			if cut {
-				operation = "cut"
-			}
-			return fmt.Errorf("cannot %s and paste a directory into itself or its subdirectory", operation)
+			return fmt.Errorf("cannot %s and paste a directory into itself or its subdirectory",
+				getCopyOrCutOperationName(cut))
 		}
 	}
 

src/internal/handle_modal.go

@@ -13,11 +13,6 @@ func (m *model) cancelTypingModal() {
 	m.typingModal.open = false
 }
 
-// Close warn modal
-func (m *model) cancelWarnModal() {
-	m.warnModal.open = false
-}
-
 // Confirm to create file or directory
 func (m *model) createItem() {
 	if err := checkFileNameValidity(m.typingModal.textInput.Value()); err != nil {

src/internal/key_function.go

@@ -193,71 +193,50 @@ func (m *model) typingModalOpenKey(msg string) {
 	}
 }
 
-// TODO : There is a lot of duplication for these models, each one of them has to handle
-// ConfirmTyping and CancelTyping in a similar way. There is a scope of some good refactoring here.
-func (m *model) warnModalOpenKey(msg string) tea.Cmd {
-	switch {
-	case slices.Contains(common.Hotkeys.CancelTyping, msg) || slices.Contains(common.Hotkeys.Quit, msg):
-		m.cancelWarnModal()
-		if m.warnModal.warnType == confirmRenameItem {
-			m.cancelRename()
-		}
-	case slices.Contains(common.Hotkeys.Confirm, msg):
-		m.warnModal.open = false
-		switch m.warnModal.warnType {
-		case confirmDeleteItem:
-			return m.getDeleteCmd()
-		case confirmRenameItem:
-			m.confirmRename()
-		}
-	}
-	return nil
-}
+func (m *model) notifyModelOpenKey(msg string) tea.Cmd {
+	isCancel := slices.Contains(common.Hotkeys.CancelTyping, msg) || slices.Contains(common.Hotkeys.Quit, msg)
+	isConfirm := slices.Contains(common.Hotkeys.Confirm, msg)
 
-func (m *model) notifyModalOpenKey(msg string) {
-	//nolint:gocritic // We use switch here because other key logic is also using switch, so it's more consistent.
-	switch {
-	case slices.Contains(common.Hotkeys.Confirm, msg):
-		m.notifyModal.open = false
+	if !isCancel && !isConfirm {
+		slog.Warn("Invalid keypress in notifyModel", "msg", msg)
+		return nil
+	}
+	m.notifyModel.Close()
+	action := m.notifyModel.GetConfirmAction()
+	if isCancel {
+		return m.handleNotifyModelCancel(action)
 	}
+	return m.handleNotifyModelConfirm(action)
 }
 
-func (m *model) notifyModelOpenKey(msg string) tea.Cmd {
-	switch {
-	case slices.Contains(common.Hotkeys.CancelTyping, msg) || slices.Contains(common.Hotkeys.Quit, msg):
-		m.nofigyModel.Close()
-		if m.nofigyModel.GetConfirmAction() == notify.RenameAction {
-			m.cancelRename()
-		}
-	case slices.Contains(common.Hotkeys.Confirm, msg):
-		m.nofigyModel.Close()
-		switch m.nofigyModel.GetConfirmAction() {
-		case notify.DeleteAction:
-			return m.getDeleteCmd()
-		case notify.RenameAction:
-			m.confirmRename()
-		case notify.NoAction:
-			// Do nothing
-		default:
-			slog.Error("Unknown type of action", "action", m.nofigyModel.GetConfirmAction())
-		}
+func (m *model) handleNotifyModelCancel(action notify.ConfirmActionType) tea.Cmd {
+	switch action {
+	case notify.RenameAction:
+		m.cancelRename()
+	case notify.QuitAction:
+		m.modelQuitState = notQuitting
+	case notify.DeleteAction, notify.NoAction:
+		// Do nothing
 	default:
-		slog.Warn("Invalid keypress in notifyModel", "msg", msg)
+		slog.Error("Unknown type of action", "action", action)
 	}
 	return nil
 }
 
-// Handle key input to confirm or cancel and close quiting warn in SPF
-func (m *model) confirmToQuitSuperfile(msg string) bool {
-	switch {
-	case slices.Contains(common.Hotkeys.CancelTyping, msg) || slices.Contains(common.Hotkeys.Quit, msg):
-		m.modelQuitState = notQuitting
-		return false
-	case slices.Contains(common.Hotkeys.Confirm, msg):
-		return true
+func (m *model) handleNotifyModelConfirm(action notify.ConfirmActionType) tea.Cmd {
+	switch action {
+	case notify.DeleteAction:
+		return m.getDeleteCmd()
+	case notify.RenameAction:
+		m.confirmRename()
+	case notify.QuitAction:
+		m.modelQuitState = quitConfirmationReceived
+	case notify.NoAction:
+		// Ignore
 	default:
-		return false
+		slog.Error("Unknown type of action", "action", action)
 	}
+	return nil
 }
 
 // Handles key inputs inside sort options menu

src/internal/model.go

@@ -14,6 +14,7 @@ import (
 	"github.com/yorukot/superfile/src/config/icon"
 	"github.com/yorukot/superfile/src/internal/common"
 	"github.com/yorukot/superfile/src/internal/ui/metadata"
+	"github.com/yorukot/superfile/src/internal/ui/notify"
 	"github.com/yorukot/superfile/src/internal/utils"
 
 	"github.com/barasher/go-exiftool"
@@ -278,7 +279,7 @@ func (m *model) handleKeyInput(msg tea.KeyMsg) tea.Cmd {
 		"filePanel.focusType", m.fileModel.filePanels[m.filePanelFocusIndex].focusType,
 		"filePanel.panelMode", m.fileModel.filePanels[m.filePanelFocusIndex].panelMode,
 		"typingModal.open", m.typingModal.open,
-		"warnModal.open", m.warnModal.open,
+		"notifyModel.open", m.notifyModel.IsOpen(),
 		"promptModal.open", m.promptModal.IsOpen(),
 		"fileModel.renaming", m.fileModel.renaming,
 		"searchBar.focussed", m.fileModel.filePanels[m.filePanelFocusIndex].searchBar.Focused(),
@@ -291,21 +292,18 @@ func (m *model) handleKeyInput(msg tea.KeyMsg) tea.Cmd {
 		return nil
 	}
 	var cmd tea.Cmd
-	quitSuperfile := false
 	switch {
 	case m.typingModal.open:
 		m.typingModalOpenKey(msg.String())
 	case m.promptModal.IsOpen():
 		// Ignore keypress. It will be handled in Update call via
 		// updateFilePanelState
+		// TODO: Convert that to async via tea.Cmd
 
-	case m.nofigyModel.IsOpen():
-		cmd = m.notifyModelOpenKey(msg.String())
 	// Handles all warn models except the warn model for confirming to quit
-	case m.warnModal.open:
-		cmd = m.warnModalOpenKey(msg.String())
-	case m.notifyModal.open:
-		m.notifyModalOpenKey(msg.String())
+	case m.notifyModel.IsOpen():
+		cmd = m.notifyModelOpenKey(msg.String())
+
 	// If renaming a object
 	case m.fileModel.renaming:
 		cmd = m.renamingKey(msg.String())
@@ -322,9 +320,6 @@ func (m *model) handleKeyInput(msg tea.KeyMsg) tea.Cmd {
 	// If help menu is open
 	case m.helpMenu.open:
 		m.helpMenuKey(msg.String())
-	// If asking to confirm quiting
-	case m.modelQuitState == confirmToQuit:
-		quitSuperfile = m.confirmToQuitSuperfile(msg.String())
 
 	case slices.Contains(common.Hotkeys.Quit, msg.String()):
 		m.modelQuitState = quitInitiated
@@ -338,12 +333,13 @@ func (m *model) handleKeyInput(msg tea.KeyMsg) tea.Cmd {
 	if m.modelQuitState == quitInitiated {
 		if m.processBarModel.HasRunningProcesses() {
 			// Dont quit now, get a confirmation first.
+			m.modelQuitState = quitConfirmationInitiated
 			m.warnModalForQuit()
 			return cmd
 		}
-		quitSuperfile = true
+		m.modelQuitState = quitConfirmationReceived
 	}
-	if quitSuperfile {
+	if m.modelQuitState == quitConfirmationReceived {
 		m.quitSuperfile()
 		return tea.Quit
 	}
@@ -447,9 +443,9 @@ func (m *model) updateCurrentFilePanelDir(path string) error {
 
 // Triggers a warn for confirm quiting
 func (m *model) warnModalForQuit() {
-	m.modelQuitState = confirmToQuit
-	m.warnModal.title = "Confirm to quit superfile"
-	m.warnModal.content = "You still have files being processed. Are you sure you want to exit?"
+	m.notifyModel = notify.New(true, "Confirm to quit superfile",
+		"You still have files being processed. Are you sure you want to exit?",
+		notify.QuitAction)
 }
 
 // Implement View function for bubble tea model to handle visualization.
@@ -542,29 +538,13 @@ func (m *model) View() string {
 		return stringfunction.PlaceOverlay(overlayX, overlayY, typingModal, finalRender)
 	}
 
-	if m.warnModal.open {
-		warnModal := m.warnModalRender()
-		overlayX := m.fullWidth/2 - common.ModalWidth/2
-		overlayY := m.fullHeight/2 - common.ModalHeight/2
-		return stringfunction.PlaceOverlay(overlayX, overlayY, warnModal, finalRender)
-	}
-
-	if m.notifyModal.open {
-		notifyModal := m.notifyModalRender()
+	if m.notifyModel.IsOpen() {
+		notifyModal := m.notifyModel.Render()
 		overlayX := m.fullWidth/2 - common.ModalWidth/2
 		overlayY := m.fullHeight/2 - common.ModalHeight/2
 		return stringfunction.PlaceOverlay(overlayX, overlayY, notifyModal, finalRender)
 	}
 
-	// This is also a render for warnmodal, but its being driven via a different flag
-	// we should also drive it via warnModal.open
-	if m.modelQuitState == confirmToQuit {
-		warnModal := m.warnModalRender()
-		overlayX := m.fullWidth/2 - common.ModalWidth/2
-		overlayY := m.fullHeight/2 - common.ModalHeight/2
-		return stringfunction.PlaceOverlay(overlayX, overlayY, warnModal, finalRender)
-	}
-
 	return finalRender
 }
 

src/internal/model_msg.go

@@ -146,7 +146,7 @@ type NotifyModalUpdateMsg struct {
 	m notify.Model
 }
 
-func NewNofifyModalMsg(m notify.Model, reqID int) NotifyModalUpdateMsg {
+func NewNotifyModalMsg(m notify.Model, reqID int) NotifyModalUpdateMsg {
 	return NotifyModalUpdateMsg{
 		m: m,
 		BaseMessage: BaseMessage{
@@ -156,6 +156,6 @@ func NewNofifyModalMsg(m notify.Model, reqID int) NotifyModalUpdateMsg {
 }
 
 func (msg NotifyModalUpdateMsg) ApplyToModel(m *model) tea.Cmd {
-	m.nofigyModel = msg.m
+	m.notifyModel = msg.m
 	return nil
 }

src/internal/model_render.go

@@ -329,23 +329,6 @@ func (m *model) introduceModalRender() string {
 			subTwo + "\n\n" + subThree + "\n\n" + subFour + "\n\n")
 }
 
-func (m *model) warnModalRender() string {
-	title := m.warnModal.title
-	content := m.warnModal.content
-	confirm := common.ModalConfirm.Render(" (" + common.Hotkeys.Confirm[0] + ") Confirm ")
-	cancel := common.ModalCancel.Render(" (" + common.Hotkeys.Quit[0] + ") Cancel ")
-	tip := confirm + lipgloss.NewStyle().Background(common.ModalBGColor).Render("           ") + cancel
-	return common.ModalBorderStyle(common.ModalHeight, common.ModalWidth).Render(title + "\n\n" + content + "\n\n" + tip)
-}
-
-func (m *model) notifyModalRender() string {
-	title := m.notifyModal.title
-	content := m.notifyModal.content
-	okay := common.ModalConfirm.Render(" (" + common.Hotkeys.Confirm[0] + ") Okay ")
-	okay = common.MainStyle.AlignHorizontal(lipgloss.Center).AlignVertical(lipgloss.Center).Render(okay)
-	return common.ModalBorderStyle(common.ModalHeight, common.ModalWidth).Render(title + "\n\n" + content + "\n\n" + okay)
-}
-
 func (m *model) promptModalRender() string {
 	return m.promptModal.Render()
 }

src/internal/model_test.go

@@ -119,7 +119,7 @@ func TestQuit(t *testing.T) {
 
 		assert.Equal(t, notQuitting, m.modelQuitState)
 		cmd := TeaUpdateWithErrCheck(m, utils.TeaRuneKeyMsg(common.Hotkeys.Quit[0]))
-		assert.Equal(t, confirmToQuit, m.modelQuitState)
+		assert.Equal(t, quitConfirmationInitiated, m.modelQuitState)
 		assert.False(t, IsTeaQuit(cmd))
 
 		// Now we would be asked for confirmation.
@@ -130,7 +130,7 @@ func TestQuit(t *testing.T) {
 
 		// Again trigger quit
 		cmd = TeaUpdateWithErrCheck(m, utils.TeaRuneKeyMsg(common.Hotkeys.Quit[0]))
-		assert.Equal(t, confirmToQuit, m.modelQuitState)
+		assert.Equal(t, quitConfirmationInitiated, m.modelQuitState)
 		assert.False(t, IsTeaQuit(cmd))
 
 		// Confirm this time