refactor: rename

9 files changed, 28 insertions, 28 deletions

diff --git a/internal/testanalyze/analyze.go b/internal/testanalyze/analyze.go
index d0f2bdb..22a8f9c 100644
--- a/internal/testanalyze/analyze.go
+++ b/internal/testanalyze/analyze.go
@@ -84,19 +84,19 @@ func (a *MockedAnalyzer) ResetProgress() {}
 // SetFollowSymlinks does nothing
 func (a *MockedAnalyzer) SetFollowSymlinks(v bool) {}
 
-// RemoveItemFromDirWithErr returns error
-func RemoveItemFromDirWithErr(dir, file fs.Item) error {
+// ItemFromDirWithErr returns error
+func ItemFromDirWithErr(dir, file fs.Item) error {
 	return errors.New("Failed")
 }
 
-// RemoveItemFromDirWithSleep returns error
-func RemoveItemFromDirWithSleep(dir, file fs.Item) error {
+// ItemFromDirWithSleep returns error
+func ItemFromDirWithSleep(dir, file fs.Item) error {
 	time.Sleep(time.Millisecond * 600)
-	return remove.RemoveItemFromDir(dir, file)
+	return remove.ItemFromDir(dir, file)
 }
 
-// RemoveItemFromDirWithSleepAndErr returns error
-func RemoveItemFromDirWithSleepAndErr(dir, file fs.Item) error {
+// ItemFromDirWithSleepAndErr returns error
+func ItemFromDirWithSleepAndErr(dir, file fs.Item) error {
 	time.Sleep(time.Millisecond * 600)
 	return errors.New("Failed")
 }
diff --git a/pkg/remove/parallel.go b/pkg/remove/parallel.go
index 27a43ea..606db20 100644
--- a/pkg/remove/parallel.go
+++ b/pkg/remove/parallel.go
@@ -10,10 +10,10 @@ import (
 
 var concurrencyLimit = make(chan struct{}, 3*runtime.GOMAXPROCS(0))
 
-// RemoveItemFromDirParallel removes item from dir
-func RemoveItemFromDirParallel(dir, item fs.Item) error {
+// ItemFromDirParallel removes item from dir
+func ItemFromDirParallel(dir, item fs.Item) error {
 	if !item.IsDir() {
-		return RemoveItemFromDir(dir, item)
+		return ItemFromDir(dir, item)
 	}
 	errChan := make(chan error, 1) // we show only first error
 	var wait sync.WaitGroup
diff --git a/pkg/remove/parallel_linux_test.go b/pkg/remove/parallel_linux_test.go
index fca34ef..f628842 100644
--- a/pkg/remove/parallel_linux_test.go
+++ b/pkg/remove/parallel_linux_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestRemoveItemFromDirParallelWithErr(t *testing.T) {
+func TestItemFromDirParallelWithErr(t *testing.T) {
 	fin := testdir.CreateTestDir()
 	defer fin()
 
@@ -38,11 +38,11 @@ func TestRemoveItemFromDirParallelWithErr(t *testing.T) {
 		},
 	}
 
-	err = RemoveItemFromDirParallel(dir, subdir)
+	err = ItemFromDirParallel(dir, subdir)
 	assert.Contains(t, err.Error(), "permission denied")
 }
 
-func TestRemoveItemFromDirParallelWithErr2(t *testing.T) {
+func TestItemFromDirParallelWithErr2(t *testing.T) {
 	fin := testdir.CreateTestDir()
 	defer fin()
 
@@ -62,6 +62,6 @@ func TestRemoveItemFromDirParallelWithErr2(t *testing.T) {
 
 	subdir := dir.Files[0].(*analyze.Dir)
 
-	err = RemoveItemFromDirParallel(dir, subdir)
+	err = ItemFromDirParallel(dir, subdir)
 	assert.Contains(t, err.Error(), "permission denied")
 }
diff --git a/pkg/remove/parallel_test.go b/pkg/remove/parallel_test.go
index 6196d78..f53ef5c 100644
--- a/pkg/remove/parallel_test.go
+++ b/pkg/remove/parallel_test.go
@@ -39,7 +39,7 @@ func TestRemoveFileParallel(t *testing.T) {
 	dir.Files = fs.Files{subdir}
 	subdir.Files = fs.Files{file}
 
-	err := RemoveItemFromDirParallel(subdir, file)
+	err := ItemFromDirParallel(subdir, file)
 	assert.Nil(t, err)
 
 	assert.Equal(t, 0, len(subdir.Files))
@@ -64,6 +64,6 @@ func TestRemoveDirParallel(t *testing.T) {
 
 	subdir := dir.Files[0].(*analyze.Dir)
 
-	err := RemoveItemFromDirParallel(dir, subdir)
+	err := ItemFromDirParallel(dir, subdir)
 	assert.Nil(t, err)
 }
diff --git a/pkg/remove/remove.go b/pkg/remove/remove.go
index 9fba6d4..a385eeb 100644
--- a/pkg/remove/remove.go
+++ b/pkg/remove/remove.go
@@ -7,8 +7,8 @@ import (
 	"github.com/dundee/gdu/v5/pkg/fs"
 )
 
-// RemoveItemFromDir removes item from dir
-func RemoveItemFromDir(dir, item fs.Item) error {
+// ItemFromDir removes item from dir
+func ItemFromDir(dir, item fs.Item) error {
 	err := os.RemoveAll(item.GetPath())
 	if err != nil {
 		return err
diff --git a/pkg/remove/remove_linux_test.go b/pkg/remove/remove_linux_test.go
index 19fc503..2739ba9 100644
--- a/pkg/remove/remove_linux_test.go
+++ b/pkg/remove/remove_linux_test.go
@@ -37,6 +37,6 @@ func TestRemoveFileWithErr(t *testing.T) {
 		},
 	}
 
-	err = RemoveItemFromDir(dir, subdir)
+	err = ItemFromDir(dir, subdir)
 	assert.Contains(t, err.Error(), "permission denied")
 }
diff --git a/pkg/remove/remove_test.go b/pkg/remove/remove_test.go
index 11a1c23..a2ed697 100644
--- a/pkg/remove/remove_test.go
+++ b/pkg/remove/remove_test.go
@@ -83,7 +83,7 @@ func TestRemoveFile(t *testing.T) {
 	dir.Files = fs.Files{subdir}
 	subdir.Files = fs.Files{file}
 
-	err := RemoveItemFromDir(subdir, file)
+	err := ItemFromDir(subdir, file)
 	assert.Nil(t, err)
 
 	assert.Equal(t, 0, len(subdir.Files))
diff --git a/tui/tui.go b/tui/tui.go
index 23d0599..70c11e8 100644
--- a/tui/tui.go
+++ b/tui/tui.go
@@ -110,7 +110,7 @@ func CreateUI(
 		output:                  output,
 		askBeforeDelete:         true,
 		showItemCount:           false,
-		remover:                 remove.RemoveItemFromDir,
+		remover:                 remove.ItemFromDir,
 		emptier:                 remove.EmptyFileFromDir,
 		exec:                    Execute,
 		linkedItems:             make(fs.HardLinkedItems, 10),
@@ -224,7 +224,7 @@ func (ui *UI) SetChangeCwdFn(fn func(string) error) {
 
 // SetDeleteInParallel sets the flag to delete files in parallel
 func (ui *UI) SetDeleteInParallel() {
-	ui.remover = remove.RemoveItemFromDirParallel
+	ui.remover = remove.ItemFromDirParallel
 }
 
 // StartUILoop starts tview application
diff --git a/tui/tui_test.go b/tui/tui_test.go
index 33a600d..a3a7503 100644
--- a/tui/tui_test.go
+++ b/tui/tui_test.go
@@ -358,7 +358,7 @@ func TestDeleteSelectedInBackground(t *testing.T) {
 	defer fin()
 
 	ui := getAnalyzedPathMockedApp(t, true, true, false)
-	ui.remover = testanalyze.RemoveItemFromDirWithSleep
+	ui.remover = testanalyze.ItemFromDirWithSleep
 	ui.done = make(chan struct{})
 	ui.SetDeleteInBackground()
 
@@ -382,7 +382,7 @@ func TestDeleteSelectedInBackgroundAndParallel(t *testing.T) {
 	defer fin()
 
 	ui := getAnalyzedPathMockedApp(t, true, true, false)
-	ui.remover = testanalyze.RemoveItemFromDirWithSleep
+	ui.remover = testanalyze.ItemFromDirWithSleep
 	ui.done = make(chan struct{})
 	ui.SetDeleteInBackground()
 	ui.SetDeleteInParallel()
@@ -485,7 +485,7 @@ func TestDeleteSelectedWithErr(t *testing.T) {
 	defer fin()
 
 	ui := getAnalyzedPathMockedApp(t, false, true, false)
-	ui.remover = testanalyze.RemoveItemFromDirWithErr
+	ui.remover = testanalyze.ItemFromDirWithErr
 
 	assert.Equal(t, 1, ui.table.GetRowCount())
 
@@ -509,7 +509,7 @@ func TestDeleteSelectedInBackgroundWithErr(t *testing.T) {
 
 	ui := getAnalyzedPathMockedApp(t, false, true, false)
 	ui.SetDeleteInBackground()
-	ui.remover = testanalyze.RemoveItemFromDirWithSleepAndErr
+	ui.remover = testanalyze.ItemFromDirWithSleepAndErr
 
 	assert.Equal(t, 1, ui.table.GetRowCount())
 
@@ -540,7 +540,7 @@ func TestDeleteMarkedWithErr(t *testing.T) {
 	defer fin()
 
 	ui := getAnalyzedPathMockedApp(t, false, true, false)
-	ui.remover = testanalyze.RemoveItemFromDirWithErr
+	ui.remover = testanalyze.ItemFromDirWithErr
 
 	assert.Equal(t, 1, ui.table.GetRowCount())
 
@@ -652,7 +652,7 @@ func TestDeleteMarkedInBackgroundWithErr(t *testing.T) {
 
 	ui := getAnalyzedPathMockedApp(t, false, true, false)
 	ui.SetDeleteInBackground()
-	ui.remover = testanalyze.RemoveItemFromDirWithErr
+	ui.remover = testanalyze.ItemFromDirWithErr
 
 	assert.Equal(t, 1, ui.table.GetRowCount())