Merge pull request #526 from GRFreire/rename-warn-before-override

Warn overwrite when renaming

Author: yorukot

src/internal/handle_file_operations.go

@@ -39,6 +39,39 @@ func (m *model) panelCreateNewFile() {
 
 }
 
+func (m *model) IsRenamingConflicting() bool {
+	panel := m.fileModel.filePanels[m.filePanelFocusIndex]
+	oldPath := panel.element[panel.cursor].location
+	newPath := panel.location + "/" + panel.rename.Value()
+
+	if oldPath == newPath {
+		return false
+	}
+
+	_, err := os.Stat(newPath)
+	if err == nil {
+		return true
+	}
+
+	return false
+}
+
+func (m *model) warnModalForRenaming() {
+	id := shortuuid.New()
+	message := channelMessage{
+		messageId:   id,
+		messageType: sendWarnModal,
+	}
+
+	message.warnModal = warnModal{
+		open:     true,
+		title:    "There is already a file or directory with that name",
+		content:  "This operation will override the existing file",
+		warnType: confirmRenameItem,
+	}
+	channel <- message
+}
+
 // Rename file where the cusror is located
 func (m *model) panelItemRename() {
 	panel := m.fileModel.filePanels[m.filePanelFocusIndex]

src/internal/key_function.go

@@ -205,32 +205,40 @@ func (m *model) warnModalOpenKey(msg string) {
 	switch msg {
 	case containsKey(msg, hotkeys.Quit), containsKey(msg, hotkeys.CancelTyping):
 		m.cancelWarnModal()
+		if m.warnModal.warnType == confirmRenameItem {
+			m.cancelRename()
+		}
 	case containsKey(msg, hotkeys.Confirm):
 		m.warnModal.open = false
-		panel := m.fileModel.filePanels[m.filePanelFocusIndex]
-		if m.fileModel.filePanels[m.filePanelFocusIndex].panelMode == selectMode {
-			if isExternalDiskPath(panel.location) {
-				go func() {
-					m.completelyDeleteMultipleItems()
-					m.fileModel.filePanels[m.filePanelFocusIndex].selected = m.fileModel.filePanels[m.filePanelFocusIndex].selected[:0]
-				}()
-			} else {
-				go func() {
-					m.deleteMultipleItems()
-					m.fileModel.filePanels[m.filePanelFocusIndex].selected = m.fileModel.filePanels[m.filePanelFocusIndex].selected[:0]
-				}()
-			}
-		} else {
-			if isExternalDiskPath(panel.location) {
-				go func() {
-					m.completelyDeleteSingleItem()
-				}()
+		switch m.warnModal.warnType {
+		case confirmDeleteItem:
+			panel := m.fileModel.filePanels[m.filePanelFocusIndex]
+			if m.fileModel.filePanels[m.filePanelFocusIndex].panelMode == selectMode {
+				if isExternalDiskPath(panel.location) {
+					go func() {
+						m.completelyDeleteMultipleItems()
+						m.fileModel.filePanels[m.filePanelFocusIndex].selected = m.fileModel.filePanels[m.filePanelFocusIndex].selected[:0]
+					}()
+				} else {
+					go func() {
+						m.deleteMultipleItems()
+						m.fileModel.filePanels[m.filePanelFocusIndex].selected = m.fileModel.filePanels[m.filePanelFocusIndex].selected[:0]
+					}()
+				}
 			} else {
-				go func() {
-					m.deleteSingleItem()
-				}()
-			}
+				if isExternalDiskPath(panel.location) {
+					go func() {
+						m.completelyDeleteSingleItem()
+					}()
+				} else {
+					go func() {
+						m.deleteSingleItem()
+					}()
+				}
 
+			}
+		case confirmRenameItem:
+            m.confirmRename()
 		}
 	}
 }
@@ -272,7 +280,11 @@ func (m *model) renamingKey(msg string) {
 	case containsKey(msg, hotkeys.CancelTyping):
 		m.cancelRename()
 	case containsKey(msg, hotkeys.ConfirmTyping):
-		m.confirmRename()
+		if m.IsRenamingConflicting() {
+			m.warnModalForRenaming()
+		} else {
+			m.confirmRename()
+		}
 	}
 }
 

src/internal/type.go

@@ -33,6 +33,7 @@ const (
 
 const (
 	confirmDeleteItem warnType = iota
+	confirmRenameItem
 )
 
 // Constants for panel with no focus