Prompt feature leftover items

src/internal/config_function.go

@@ -3,10 +3,8 @@ package internal
 import (
 	"log/slog"
 	"os"
-	"path/filepath"
 	"reflect"
 	"runtime"
-	"strings"
 
 	"github.com/yorukot/superfile/src/internal/ui/rendering"
 	"github.com/yorukot/superfile/src/internal/ui/sidebar"
@@ -56,26 +54,22 @@ func initialConfig(firstFilePanelDirs []string) (toggleDotFile bool, toggleFoote
 		}
 	}
 
+	cwd, _ := os.Getwd()
 	for i := range firstFilePanelDirs {
 		if firstFilePanelDirs[i] == "" {
 			firstFilePanelDirs[i] = common.Config.DefaultDirectory
 		}
 
-		if strings.HasPrefix(firstFilePanelDirs[i], "~") {
-			// We only need to replace the first ~ , not all of them
-			// And only if its a prefix
-			firstFilePanelDirs[i] = strings.Replace(firstFilePanelDirs[i], "~", variable.HomeDir, 1)
-		}
-		firstFilePanelDirs[i], err = filepath.Abs(firstFilePanelDirs[i])
+		firstFilePanelDirs[i] = utils.ResolveAbsPath(cwd, firstFilePanelDirs[i])
 		// In case of unexpected path error, fallback to home dir
-		if err != nil {
-			slog.Error("Unexpected error while calculating firstFilePanelDir", "error", err)
+		if _, err := os.Stat(firstFilePanelDirs[i]); err != nil {
+			slog.Error("cannot get stats for firstFilePanelDir", "error", err)
 			firstFilePanelDirs[i] = variable.HomeDir
 		}
 	}
 
 	slog.Debug("Runtime information", "runtime.GOOS", runtime.GOOS)
-	slog.Debug("Directory configuration", "start_directories", firstFilePanelDirs)
+	slog.Debug("Directory configuration", "cwd", cwd, "start_directories", firstFilePanelDirs)
 
 	var memStats runtime.MemStats
 	runtime.ReadMemStats(&memStats)

src/internal/handle_panel_navigation.go

@@ -25,6 +25,7 @@ func (m *model) pinnedDirectory() {
 // Create new file panel
 func (m *model) createNewFilePanel(location string) error {
 	if len(m.fileModel.filePanels) == m.fileModel.maxFilePanel {
+		// Todo : Define as a predefined error in errors.go
 		return errors.New("maximum panel count reached")
 	}
 

src/internal/model.go

@@ -313,7 +313,7 @@ func (m *model) applyPromptModalAction(action common.ModelAction) {
 		actionErr = m.updateCurrentFilePanelDir(action.Location)
 		successMsg = "Panel directory changed"
 	case common.OpenPanelAction:
-		actionErr = m.createNewFilePanel(action.Location)
+		actionErr = m.createNewFilePanelRelativeToCurrent(action.Location)
 		successMsg = "New panel opened"
 	default:
 		actionErr = errors.New("unhandled action type")
@@ -345,21 +345,23 @@ func (m *model) splitPanel() error {
 	return m.createNewFilePanel(m.fileModel.filePanels[m.filePanelFocusIndex].location)
 }
 
-func (m *model) updateCurrentFilePanelDir(dir string) error {
-	currentPath := m.fileModel.filePanels[m.filePanelFocusIndex].location
-	newPath := dir
-	if !filepath.IsAbs(dir) {
-		// Assume relative path from current
-		newPath = filepath.Join(currentPath, dir)
-	}
+func (m *model) createNewFilePanelRelativeToCurrent(path string) error {
+	currentDir := m.fileModel.filePanels[m.filePanelFocusIndex].location
+	return m.createNewFilePanel(utils.ResolveAbsPath(currentDir, path))
+}
+
+// simulates a 'cd' action
+func (m *model) updateCurrentFilePanelDir(path string) error {
+	currentDir := m.fileModel.filePanels[m.filePanelFocusIndex].location
+	path = utils.ResolveAbsPath(currentDir, path)
 
-	if info, err := os.Stat(newPath); err != nil {
-		return fmt.Errorf("%s : no such file or directory, stats err : %w", newPath, err)
+	if info, err := os.Stat(path); err != nil {
+		return fmt.Errorf("%s : no such file or directory, stats err : %w", path, err)
 	} else if !info.IsDir() {
-		return fmt.Errorf("%s is not a directory", newPath)
+		return fmt.Errorf("%s is not a directory", path)
 	}
 
-	m.fileModel.filePanels[m.filePanelFocusIndex].location = newPath
+	m.fileModel.filePanels[m.filePanelFocusIndex].location = path
 	return nil
 }
 

src/internal/utils/file_utils.go

@@ -3,8 +3,11 @@ package utils
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"reflect"
+	"strings"
 
+	"github.com/adrg/xdg"
 	"github.com/pelletier/go-toml/v2"
 )
 
@@ -95,3 +98,18 @@ func LoadTomlFile(filePath string, defaultData string, target interface{}, fixFl
 	}
 	return false
 }
+
+// If path is not absolute, then append to currentDir and get absolute path
+// Resolve paths starting with "~"
+// currentDir should be an absolute path
+func ResolveAbsPath(currentDir string, path string) string {
+	if strings.HasPrefix(path, "~") {
+		// We dont use variable.HomeDir here, as the util package cannot have dependency
+		// on variable package
+		path = strings.Replace(path, "~", xdg.Home, 1)
+	}
+	if !filepath.IsAbs(path) {
+		path = filepath.Join(currentDir, path)
+	}
+	return filepath.Clean(path)
+}

src/internal/utils/file_utils_test.go

@@ -0,0 +1,60 @@
+package utils
+
+import (
+	"testing"
+
+	"github.com/adrg/xdg"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestResolveAbsPath(t *testing.T) {
+	testdata := []struct {
+		name        string
+		cwd         string
+		path        string
+		expectedRes string
+	}{
+		{
+			name:        "Path cleaup Test 1",
+			cwd:         "/",
+			path:        "////",
+			expectedRes: "/",
+		},
+		{
+			name:        "Basic test",
+			cwd:         "/abc",
+			path:        "def",
+			expectedRes: "/abc/def",
+		},
+		{
+			name:        "Ignore cwd for abs path",
+			cwd:         "/abc",
+			path:        "/def",
+			expectedRes: "/def",
+		},
+		{
+			name:        "Path cleanup Test 2",
+			cwd:         "///abc",
+			path:        "./././def",
+			expectedRes: "/abc/def",
+		},
+		{
+			name:        "Basic test with ~",
+			cwd:         "/",
+			path:        "~",
+			expectedRes: xdg.Home,
+		},
+		{
+			name:        "~ should not be resolved if not first",
+			cwd:         "abc",
+			path:        "x/~",
+			expectedRes: "abc/x/~",
+		},
+	}
+
+	for _, tt := range testdata {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equal(t, tt.expectedRes, ResolveAbsPath(tt.cwd, tt.path))
+		})
+	}
+}