filterPaths - trailing slashes

LuluBeatson · LuluBeatson · commit 1cc6f7c5b9f6 · 2025-07-08T09:36:32.000+01:00
diff --git a/pkg/github/repositories.go b/pkg/github/repositories.go
@@ -1295,20 +1295,29 @@ func GetTag(getClient GetClientFn, t translations.TranslationHelperFunc) (tool m
 // It returns a slice of strings containing the matching paths.
 // Directories are returned with a trailing slash.
 func filterPaths(entries []*github.TreeEntry, path string, maxResults int) []string {
-	path = strings.TrimSuffix(path, "/") // Normalize path to avoid double slashes
+	// Remove trailing slash for matching purposes, but flag whether we
+	// only want directories.
+	dirOnly := false
+	if strings.HasSuffix(path, "/") {
+		dirOnly = true
+		path = strings.TrimSuffix(path, "/")
+	}
 
 	matchedPaths := []string{}
 	for _, entry := range entries {
 		if len(matchedPaths) == maxResults {
 			break // Limit the number of results to maxResults
 		}
+		if dirOnly && entry.GetType() != "tree" {
+			continue // Skip non-directory entries if dirOnly is true
+		}
 		entryPath := entry.GetPath()
 		if entryPath == "" {
 			continue // Skip empty paths
 		}
 		if strings.HasSuffix(entryPath, path) {
 			if entry.GetType() == "tree" {
-				entryPath += "/" // show directories with a trailing slash
+				entryPath += "/" // Return directories with a trailing slash
 			}
 			matchedPaths = append(matchedPaths, entryPath)
 		}
diff --git a/pkg/github/repositories_test.go b/pkg/github/repositories_test.go
@@ -2117,6 +2117,26 @@ func Test_filterPaths(t *testing.T) {
 			maxResults: -1,
 			expected:   []string{"folder/", "nested/folder/"},
 		},
+		{
+			name: "dir and file match",
+			tree: []*github.TreeEntry{
+				{Path: github.Ptr("name"), Type: github.Ptr("tree")},
+				{Path: github.Ptr("name"), Type: github.Ptr("blob")},
+			},
+			path:       "name", // No trailing slash can match both files and directories
+			maxResults: -1,
+			expected:   []string{"name/", "name"},
+		},
+		{
+			name: "dir only match",
+			tree: []*github.TreeEntry{
+				{Path: github.Ptr("name"), Type: github.Ptr("tree")},
+				{Path: github.Ptr("name"), Type: github.Ptr("blob")},
+			},
+			path:       "name/", // Trialing slash ensures only directories are matched
+			maxResults: -1,
+			expected:   []string{"name/"},
+		},
 	}
 
 	for _, tc := range tests {
