feat: Allow specifying multiple panels at startup

Author: lazysegtree

src/cmd/main.go

@@ -84,9 +84,9 @@ func Run(content embed.FS) {
 		},
 		Action: func(c *cli.Context) error {
 			// If no args are called along with "spf" use current dir
-			path := ""
+			firstFilePanelDirs := []string{""}
 			if c.Args().Present() {
-				path = c.Args().First()
+				firstFilePanelDirs = c.Args().Slice()
 			}
 
 			variable.UpdateVarFromCliArgs(c)
@@ -100,7 +100,7 @@ func Run(content embed.FS) {
 
 			firstUse := checkFirstUse()
 
-			p := tea.NewProgram(internal.InitialModel(path, firstUse, hasTrash), tea.WithAltScreen(), tea.WithMouseCellMotion())
+			p := tea.NewProgram(internal.InitialModel(firstFilePanelDirs, firstUse, hasTrash), tea.WithAltScreen(), tea.WithMouseCellMotion())
 			if _, err := p.Run(); err != nil {
 				utils.PrintfAndExit("Alas, there's been an error: %v", err)
 			}

src/internal/config_function.go

@@ -18,7 +18,7 @@ import (
 // initialConfig load and handle all configuration files (spf config,Hotkeys
 // themes) setted up. Returns absolute path of dir pointing to the file Panel
 
-func initialConfig(dir string) (toggleDotFile bool, toggleFooter bool, firstFilePanelDir string) { //nolint: nonamedreturns // This is the only usecase of named returns, distinguish between multiple return values
+func initialConfig(firstFilePanelDirs []string) (toggleDotFile bool, toggleFooter bool) { //nolint: nonamedreturns // This is the only usecase of named returns, distinguish between multiple return values
 	// Open log stream
 	file, err := os.OpenFile(variable.LogFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
 
@@ -54,29 +54,29 @@ func initialConfig(dir string) (toggleDotFile bool, toggleFooter bool, firstFile
 		}
 	}
 
-	// spf was not called with an argument
-	firstFilePanelDir = dir
-	if firstFilePanelDir == "" {
-		firstFilePanelDir = common.Config.DefaultDirectory
-	}
+	for i := range firstFilePanelDirs {
+		if firstFilePanelDirs[i] == "" {
+			firstFilePanelDirs[i] = common.Config.DefaultDirectory
+		}
 
-	if strings.HasPrefix(firstFilePanelDir, "~") {
-		// We only need to replace the first ~ , not all of them
-		// And only if its a prefix
-		firstFilePanelDir = strings.Replace(firstFilePanelDir, "~", variable.HomeDir, 1)
-	}
-	firstFilePanelDir, err = filepath.Abs(firstFilePanelDir)
-	// In case of unexpected path error, fallback to home dir
-	if err != nil {
-		slog.Error("Unexpected error while calculating firstFilePanelDir", "error", err)
-		firstFilePanelDir = variable.HomeDir
+		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])
+		// In case of unexpected path error, fallback to home dir
+		if err != nil {
+			slog.Error("Unexpected error while calculating firstFilePanelDir", "error", err)
+			firstFilePanelDirs[i] = variable.HomeDir
+		}
 	}
 
 	slog.Debug("Runtime information", "runtime.GOOS", runtime.GOOS,
-		"start directory", firstFilePanelDir)
+		"start directories", firstFilePanelDirs)
 
 	toggleDotFile = utils.ReadBoolFile(variable.ToggleDotFile, false)
 	toggleFooter = utils.ReadBoolFile(variable.ToggleFooter, true)
 
-	return toggleDotFile, toggleFooter, firstFilePanelDir
+	return toggleDotFile, toggleFooter
 }

src/internal/default_config.go

@@ -8,7 +8,7 @@ import (
 )
 
 // Generate and return model containing default configurations for interface
-func defaultModelConfig(toggleDotFile bool, toggleFooter bool, firstFilePanelDir string) model {
+func defaultModelConfig(toggleDotFile bool, toggleFooter bool, firstFilePanelDirs []string) model {
 	return model{
 		filePanelFocusIndex: 0,
 		focusPanel:          nonePanelFocus,
@@ -23,28 +23,7 @@ func defaultModelConfig(toggleDotFile bool, toggleFooter bool, firstFilePanelDir
 			searchBar:   common.GenerateSearchBar(),
 		},
 		fileModel: fileModel{
-			filePanels: []filePanel{
-				{
-					render:   0,
-					cursor:   0,
-					location: firstFilePanelDir,
-					sortOptions: sortOptionsModel{
-						width:  20,
-						height: 4,
-						open:   false,
-						cursor: common.Config.DefaultSortType,
-						data: sortOptionsModelData{
-							options:  []string{"Name", "Size", "Date Modified"},
-							selected: common.Config.DefaultSortType,
-							reversed: common.Config.SortOrderReversed,
-						},
-					},
-					panelMode:        browserMode,
-					focusType:        focus,
-					directoryRecords: make(map[string]directoryRecord),
-					searchBar:        common.GenerateSearchBar(),
-				},
-			},
+			filePanels: filePanelSlice(firstFilePanelDirs),
 			filePreview: filePreviewPanel{
 				open: common.Config.DefaultOpenFilePreview,
 			},

src/internal/model.go

@@ -37,12 +37,12 @@ var progressBarLastRenderTime = time.Now()                      //nolint: gochec
 // is passed to tea.NewProgram() which accepts tea.Model
 // Either way type 'model' is not exported, so there is not way main package can
 // be aware of it, and use it directly
-func InitialModel(dir string, firstUseCheck, hasTrashCheck bool) tea.Model {
-	toggleDotFile, toggleFooter, firstFilePanelDir := initialConfig(dir)
+func InitialModel(firstFilePanelDirs []string, firstUseCheck, hasTrashCheck bool) tea.Model {
+	toggleDotFile, toggleFooter := initialConfig(firstFilePanelDirs)
 	firstUse = firstUseCheck
 	hasTrash = hasTrashCheck
 	batCmd = checkBatCmd()
-	return defaultModelConfig(toggleDotFile, toggleFooter, firstFilePanelDir)
+	return defaultModelConfig(toggleDotFile, toggleFooter, firstFilePanelDirs)
 }
 
 // Init function to be called by Bubble tea framework, sets windows title,

src/internal/model_prompt_test.go

@@ -70,15 +70,15 @@ func TestModel_Update_Prompt(t *testing.T) {
 	// too big Shell command output
 
 	t.Run("Basic Prompt Opening", func(t *testing.T) {
-		m := defaultModelConfig(false, false, "/")
+		m := defaultModelConfig(false, false, []string{"/"})
 		firstUse = false
 		_, err := TeaUpdate(&m, utils.TeaRuneKeyMsg(common.Hotkeys.OpenCommandLine[0]))
 		require.NoError(t, err, "Opening the prompt should not produce an error")
 		assert.True(t, m.promptModal.IsOpen())
 	})
 
 	t.Run("Split Panel", func(t *testing.T) {
-		m := defaultModelConfig(false, false, "/")
+		m := defaultModelConfig(false, false, []string{"/"})
 		firstUse = false
 		assert.Len(t, m.fileModel.filePanels, 1)
 		_, _ = TeaUpdate(&m, utils.TeaRuneKeyMsg(common.Hotkeys.OpenSPFPrompt[0]))

src/internal/type_utils.go

@@ -44,6 +44,39 @@ func (d directory) requiredHeight() int {
 	return 1
 }
 
+// ================ filepanel
+
+func filePanelSlice(dir []string) []filePanel {
+	res := make([]filePanel, len(dir))
+	for i := range dir {
+		res[i] = defaultFilePanel(dir[i])
+	}
+	return res
+}
+
+func defaultFilePanel(dir string) filePanel {
+	return filePanel{
+		render:   0,
+		cursor:   0,
+		location: dir,
+		sortOptions: sortOptionsModel{
+			width:  20,
+			height: 4,
+			open:   false,
+			cursor: common.Config.DefaultSortType,
+			data: sortOptionsModelData{
+				options:  []string{"Name", "Size", "Date Modified"},
+				selected: common.Config.DefaultSortType,
+				reversed: common.Config.SortOrderReversed,
+			},
+		},
+		panelMode:        browserMode,
+		focusType:        focus,
+		directoryRecords: make(map[string]directoryRecord),
+		searchBar:        common.GenerateSearchBar(),
+	}
+}
+
 // ================ String method for easy logging =====================
 
 func (f focusPanelType) String() string {