🐛 fix: fs - ToAbsPath if input is empty will return current work dir

gookit · Mar 24, 2024 · deb03c0 · deb03c0
1 parent 45cdda2
commit deb03c0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/fsutil/fsutil.go b/fsutil/fsutil.go
@@ -36,11 +36,21 @@ func UnixPath(path string) string {
 	return strings.ReplaceAll(path, "\\", "/")
 }
 
-// ToAbsPath convert process. will expand home dir
+// ToAbsPath convert path to absolute path.
+// Will expand home dir, if empty will return current work dir
 //
-// TIP: will don't check path
+// TIP: will don't check path is really exists
 func ToAbsPath(p string) string {
-	if len(p) == 0 || IsAbsPath(p) {
+	// return current work dir
+	if len(p) == 0 {
+		wd, err := os.Getwd()
+		if err != nil {
+			return p
+		}
+		return wd
+	}
+
+	if IsAbsPath(p) {
 		return p
 	}
 

diff --git a/fsutil/fsutil_test.go b/fsutil/fsutil_test.go
@@ -27,9 +27,9 @@ func TestSplitPath(t *testing.T) {
 }
 
 func TestToAbsPath(t *testing.T) {
-	assert.Eq(t, "", fsutil.ToAbsPath(""))
 	assert.Eq(t, "/path/to/dir/", fsutil.ToAbsPath("/path/to/dir/"))
 	assert.Neq(t, "~/path/to/dir", fsutil.ToAbsPath("~/path/to/dir"))
+	assert.NotEmpty(t, fsutil.ToAbsPath(""))
 	assert.Neq(t, ".", fsutil.ToAbsPath("."))
 	assert.Neq(t, "..", fsutil.ToAbsPath(".."))
 	assert.Neq(t, "./", fsutil.ToAbsPath("./"))