Fixed FilterOutDirs hadnling of broken symlinks

arduino · Jan 15, 2024 · 075c5c8 · 075c5c8
1 parent 8366036
commit 075c5c8
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 18 deletions.
diff --git a/list.go b/list.go
@@ -78,7 +78,7 @@ func (p *PathList) FilterDirs() {
 func (p *PathList) FilterOutDirs() {
 	res := (*p)[:0]
 	for _, path := range *p {
-		if path.IsNotDir() {
+		if !path.IsDir() {
 			res = append(res, path)
 		}
 	}
@@ -96,7 +96,7 @@ func (p *PathList) FilterOutHiddenFiles() {
 func (p *PathList) Filter(acceptorFunc func(*Path) bool) {
 	res := (*p)[:0]
 	for _, path := range *p {
-        if acceptorFunc(path) {
+		if acceptorFunc(path) {
 			res = append(res, path)
 		}
 	}

diff --git a/paths_test.go b/paths_test.go
@@ -284,25 +284,49 @@ func TestFilterDirs(t *testing.T) {
 }
 
 func TestFilterOutDirs(t *testing.T) {
-	testPath := New("testdata", "fileset")
+	{
+		testPath := New("testdata", "fileset")
 
-	list, err := testPath.ReadDir()
-	require.NoError(t, err)
-	require.Len(t, list, 6)
+		list, err := testPath.ReadDir()
+		require.NoError(t, err)
+		require.Len(t, list, 6)
+
+		pathEqualsTo(t, "testdata/fileset/anotherFile", list[0])
+		pathEqualsTo(t, "testdata/fileset/file", list[1])
+		pathEqualsTo(t, "testdata/fileset/folder", list[2])
+		pathEqualsTo(t, "testdata/fileset/symlinktofolder", list[3])
+		pathEqualsTo(t, "testdata/fileset/test.txt", list[4])
+		pathEqualsTo(t, "testdata/fileset/test.txt.gz", list[5])
+
+		list.FilterOutDirs()
+		require.Len(t, list, 4)
+		pathEqualsTo(t, "testdata/fileset/anotherFile", list[0])
+		pathEqualsTo(t, "testdata/fileset/file", list[1])
+		pathEqualsTo(t, "testdata/fileset/test.txt", list[2])
+		pathEqualsTo(t, "testdata/fileset/test.txt.gz", list[3])
+	}
 
-	pathEqualsTo(t, "testdata/fileset/anotherFile", list[0])
-	pathEqualsTo(t, "testdata/fileset/file", list[1])
-	pathEqualsTo(t, "testdata/fileset/folder", list[2])
-	pathEqualsTo(t, "testdata/fileset/symlinktofolder", list[3])
-	pathEqualsTo(t, "testdata/fileset/test.txt", list[4])
-	pathEqualsTo(t, "testdata/fileset/test.txt.gz", list[5])
+	{
+		list, err := New("testdata", "broken_symlink", "dir_1").ReadDirRecursive()
+		require.NoError(t, err)
 
-	list.FilterOutDirs()
-	require.Len(t, list, 4)
-	pathEqualsTo(t, "testdata/fileset/anotherFile", list[0])
-	pathEqualsTo(t, "testdata/fileset/file", list[1])
-	pathEqualsTo(t, "testdata/fileset/test.txt", list[2])
-	pathEqualsTo(t, "testdata/fileset/test.txt.gz", list[3])
+		require.Len(t, list, 7)
+		pathEqualsTo(t, "testdata/broken_symlink/dir_1/broken_link", list[0])
+		pathEqualsTo(t, "testdata/broken_symlink/dir_1/file2", list[1])
+		pathEqualsTo(t, "testdata/broken_symlink/dir_1/linked_dir", list[2])
+		pathEqualsTo(t, "testdata/broken_symlink/dir_1/linked_dir/file1", list[3])
+		pathEqualsTo(t, "testdata/broken_symlink/dir_1/linked_file", list[4])
+		pathEqualsTo(t, "testdata/broken_symlink/dir_1/real_dir", list[5])
+		pathEqualsTo(t, "testdata/broken_symlink/dir_1/real_dir/file1", list[6])
+
+		list.FilterOutDirs()
+		require.Len(t, list, 5)
+		pathEqualsTo(t, "testdata/broken_symlink/dir_1/broken_link", list[0])
+		pathEqualsTo(t, "testdata/broken_symlink/dir_1/file2", list[1])
+		pathEqualsTo(t, "testdata/broken_symlink/dir_1/linked_dir/file1", list[2])
+		pathEqualsTo(t, "testdata/broken_symlink/dir_1/linked_file", list[3])
+		pathEqualsTo(t, "testdata/broken_symlink/dir_1/real_dir/file1", list[4])
+	}
 }
 
 func TestEquivalentPaths(t *testing.T) {

diff --git a/testdata/broken_symlink/dir_1/broken_link b/testdata/broken_symlink/dir_1/broken_link
@@ -0,0 +1 @@
+broken
diff --git a/testdata/broken_symlink/dir_1/file2 b/testdata/broken_symlink/dir_1/file2
diff --git a/testdata/broken_symlink/dir_1/linked_dir b/testdata/broken_symlink/dir_1/linked_dir
@@ -0,0 +1 @@
+real_dir
diff --git a/testdata/broken_symlink/dir_1/linked_file b/testdata/broken_symlink/dir_1/linked_file
@@ -0,0 +1 @@
+file2
diff --git a/testdata/broken_symlink/dir_1/real_dir/file1 b/testdata/broken_symlink/dir_1/real_dir/file1
diff --git a/testdata/loops/regular_4_with_permission_error/dir2/dir1 b/testdata/loops/regular_4_with_permission_error/dir2/dir1
@@ -0,0 +1 @@
+../dir1
diff --git a/testdata/loops/regular_4_with_permission_error/dir2/file2 b/testdata/loops/regular_4_with_permission_error/dir2/file2