fix: Fix rabbit comments

Author: lazysegtree

src/cmd/main.go

@@ -130,7 +130,7 @@ func spfAppAction(_ context.Context, c *cli.Command) error {
 
 	firstUse := checkFirstUse()
 
-	p := tea.NewProgram(internal.InitialModel(firstFilePanelDirs, firstUse, common.InitTrash()),
+	p := tea.NewProgram(internal.InitialModel(firstFilePanelDirs, firstUse),
 		tea.WithAltScreen(), tea.WithMouseCellMotion())
 	if _, err := p.Run(); err != nil {
 		utils.PrintfAndExit("Alas, there's been an error: %v", err)

src/config/fixed_variable.go

@@ -49,7 +49,7 @@ var (
 	DarwinTrashDirectory = filepath.Join(HomeDir, ".Trash")
 
 	// These are used by github.com/rkoesters/xdg/trash package
-	// We need to make sure that these directories exists
+	// We need to make sure that these directories exist
 	LinuxTrashDirectory      = filepath.Join(xdg.DataHome, "Trash")
 	LinuxTrashDirectoryFiles = filepath.Join(xdg.DataHome, "Trash", "files")
 	LinuxTrashDirectoryInfo  = filepath.Join(xdg.DataHome, "Trash", "info")

src/internal/common/load_config.go

@@ -334,9 +334,15 @@ func InitTrash() bool {
 	if runtime.GOOS != utils.OsLinux {
 		return true
 	}
-	return utils.CreateDirectories(
+	err := utils.CreateDirectories(
 		variable.LinuxTrashDirectory,
 		variable.LinuxTrashDirectoryFiles,
 		variable.LinuxTrashDirectoryInfo,
-	) == nil
+	)
+	if err != nil {
+		slog.Warn("Failed to initialize XDG trash; falling back to permanent delete",
+			"error", err, "trashDir", variable.LinuxTrashDirectory)
+		return false
+	}
+	return true
 }

src/internal/default_config.go

@@ -16,7 +16,7 @@ import (
 // Maybe we can replace slice of strings with var args - Should we ?
 // TODO: Move the configuration parameters to a ModelConfig struct.
 // Something like `RendererConfig` struct for `Renderer` struct in ui/renderer package
-func defaultModelConfig(toggleDotFile, toggleFooter, firstUse, hasTrash bool, firstFilePanelDirs []string) *model {
+func defaultModelConfig(toggleDotFile, toggleFooter, firstUse bool, firstFilePanelDirs []string) *model {
 	return &model{
 		filePanelFocusIndex: 0,
 		focusPanel:          nonePanelFocus,
@@ -42,7 +42,7 @@ func defaultModelConfig(toggleDotFile, toggleFooter, firstUse, hasTrash bool, fi
 		toggleDotFile:  toggleDotFile,
 		toggleFooter:   toggleFooter,
 		firstUse:       firstUse,
-		hasTrash:       hasTrash,
+		hasTrash:       common.InitTrash(),
 	}
 }
 

src/internal/model.go

@@ -36,10 +36,10 @@ var et *exiftool.Exiftool                                       //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(firstFilePanelDirs []string, firstUseCheck, hasTrash bool) tea.Model {
+func InitialModel(firstFilePanelDirs []string, firstUseCheck bool) tea.Model {
 	toggleDotFile, toggleFooter := initialConfig(firstFilePanelDirs)
 	batCmd = checkBatCmd()
-	return defaultModelConfig(toggleDotFile, toggleFooter, firstUseCheck, hasTrash, firstFilePanelDirs)
+	return defaultModelConfig(toggleDotFile, toggleFooter, firstUseCheck, firstFilePanelDirs)
 }
 
 // Init function to be called by Bubble tea framework, sets windows title,

src/internal/model_file_operations_test.go

@@ -141,7 +141,7 @@ func TestFileRename(t *testing.T) {
 		actualTest := func(doRename bool) {
 			m := defaultTestModel(curTestDir)
 			p := NewTestTeaProgWithEventLoop(t, m)
-			setFilePanelSelectedItemByLocation(t, m.getFocusedFilePanel(), file2)
+			setFilePanelSelectedItemByLocation(t, m.getFocusedFilePanel(), file3)
 
 			p.SendKeyDirectly(common.Hotkeys.FilePanelItemRename[0])
 			m.getFocusedFilePanel().rename.SetValue("file2.txt")

src/internal/test_utils.go

@@ -44,7 +44,7 @@ func setupFiles(t *testing.T, files ...string) {
 // -------------------- Model setup utils
 
 func defaultTestModel(dirs ...string) *model {
-	m := defaultModelConfig(false, false, false, false, dirs)
+	m := defaultModelConfig(false, false, false, dirs)
 	m.disableMetatdata = true
 	_, _ = TeaUpdate(m, tea.WindowSizeMsg{Width: 2 * common.MinimumWidth, Height: 2 * common.MinimumHeight})
 	return m

src/internal/utils/file_utils.go

@@ -221,6 +221,9 @@ func DirSize(path string) int64 {
 // Create all dirs that does not already exists
 func CreateDirectories(dirs ...string) error {
 	for _, dir := range dirs {
+		if dir == "" {
+			continue
+		}
 		if err := os.MkdirAll(dir, 0755); err != nil {
 			return fmt.Errorf("failed to create directory %s: %w", dir, err)
 		}