✅ test: fsutil - update some util func and add more unit tests

fsutil/check_test.go

@@ -25,6 +25,7 @@ func TestFsUtil_common(t *testing.T) {
 	assert.Eq(t, "test.jpg", fsutil.Name("path/to/test.jpg"))
 	assert.Eq(t, "", fsutil.Name(""))
 
+	assert.NotEmpty(t, fsutil.DirPath("path/to/test.jpg"))
 	if runtime.GOOS == "windows" {
 		assert.Eq(t, "path\\to", fsutil.Dir("path/to/test.jpg"))
 	} else {

fsutil/define_test.go

@@ -0,0 +1,29 @@
+package fsutil_test
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/gookit/goutil/fsutil"
+	"github.com/gookit/goutil/testutil/assert"
+	"github.com/gookit/goutil/testutil/fakeobj"
+)
+
+func TestNewEntry(t *testing.T) {
+	fPath := "/path/to/some.txt"
+	ent := fakeobj.NewDirEntry(fPath)
+
+	fe := fsutil.NewEntry(fPath, ent)
+	assert.False(t, fe.IsDir())
+	assert.Eq(t, fPath, fe.Path())
+	assert.Eq(t, fsutil.Name(fPath), fe.Name())
+	assert.Equal(t, "file: /path/to/some.txt", fmt.Sprint(fe))
+
+	fi, err := fe.Info()
+	assert.NoError(t, err)
+	// dump.P(fi)
+	assert.Equal(t, "some.txt", fi.Name())
+
+	nfi := fsutil.NewFileInfo(fPath, fi)
+	assert.Equal(t, fPath, nfi.Path())
+}

fsutil/info.go

@@ -8,6 +8,9 @@ import (
 	"github.com/gookit/goutil/internal/comfunc"
 )
 
+// DirPath get dir path from filepath, without last name.
+func DirPath(fpath string) string { return filepath.Dir(fpath) }
+
 // Dir get dir path from filepath, without last name.
 func Dir(fpath string) string { return filepath.Dir(fpath) }
 

fsutil/operate.go

@@ -227,6 +227,11 @@ func MustRemove(fPath string) {
 // NOTICE: will ignore error
 func QuietRemove(fPath string) { _ = os.Remove(fPath) }
 
+// SafeRemoveAll removes path and any children it contains. will ignore error
+func SafeRemoveAll(path string) {
+	_ = os.RemoveAll(path)
+}
+
 // RmIfExist removes the named file or (empty) directory on exists.
 func RmIfExist(fPath string) error { return DeleteIfExist(fPath) }
 

fsutil/operate_test.go

@@ -16,18 +16,21 @@ func TestMkdir(t *testing.T) {
 		return
 	}
 
-	err := os.Chmod("./testdata", os.ModePerm)
+	err := os.Chmod("testdata", os.ModePerm)
 
 	if assert.NoErr(t, err) {
-		assert.NoErr(t, fsutil.Mkdir("./testdata/sub/sub21", os.ModePerm))
-		assert.NoErr(t, fsutil.Mkdir("./testdata/sub/sub22", 0666))
+		assert.NoErr(t, fsutil.Mkdir("testdata/sub/sub21", os.ModePerm))
+		assert.NoErr(t, fsutil.Mkdir("testdata/sub/sub22", 0666))
 		// 066X will error
-		assert.NoErr(t, fsutil.Mkdir("./testdata/sub/sub23/sub31", 0777))
+		assert.NoErr(t, fsutil.Mkdir("testdata/sub/sub23/sub31", 0774))
 
-		assert.NoErr(t, fsutil.MkParentDir("./testdata/sub/sub24/sub32"))
-		assert.True(t, fsutil.IsDir("./testdata/sub/sub24"))
+		assert.NoErr(t, fsutil.MkParentDir("testdata/sub/sub24/sub32"))
+		assert.True(t, fsutil.IsDir("testdata/sub/sub24"))
+		fsutil.SafeRemoveAll("testdata/sub")
 
-		assert.NoErr(t, os.RemoveAll("./testdata/sub"))
+		assert.NoErr(t, fsutil.MkDirs(0774, "testdata/sub1/sub21", "testdata/sub1/sub22"))
+		assert.NoErr(t, fsutil.MkSubDirs(0774, "testdata/sub2", "sub21", "sub22"))
+		assert.NoErr(t, fsutil.RemoveSub("testdata", fsutil.ExcludeDotFile, fsutil.ExcludeSuffix(".jpg")))
 	}
 }
 

fsutil/opread.go

@@ -72,7 +72,7 @@ func ReadStringOrErr(in any) (string, error) {
 }
 
 // ReadAll read contents from path or io.Reader, will panic on in type error
-func ReadAll(in any) []byte { return GetContents(in) }
+func ReadAll(in any) []byte { return MustRead(in) }
 
 // GetContents read contents from path or io.Reader, will panic on in type error
 func GetContents(in any) []byte { return MustRead(in) }