Fix Incorrect Priority When Serving filePath.html vs. filePath/index.html

aryanmehrotra · web-flow · commit 1d7f3b844de9 · 2025-02-24T17:14:55.000+05:30
diff --git a/main.go b/main.go
@@ -36,10 +36,10 @@ func main() {
 			if r.URL.Path == rootPath {
 				filePath += indexHTML
 			} else if !ok {
-				if stat, err := os.Stat(filePath); err == nil && stat.IsDir() {
-					filePath += indexHTML
-				} else {
+				if _, err := os.Stat(filePath + ".html"); err == nil {
 					filePath += htmlExtension
+				} else if stat, err := os.Stat(filePath); err == nil && stat.IsDir() {
+					filePath += indexHTML
 				}
 			}
 
diff --git a/main_test.go b/main_test.go
@@ -14,13 +14,20 @@ func TestServer(t *testing.T) {
 	//nolint:staticcheck // Ignore as we are testing the server
 	tempDir := os.TempDir()
 
+	// Create an "index" directory
+	indexDirPath := filepath.Join(tempDir, "docs")
+	if err := os.MkdirAll(indexDirPath, 0600); err != nil {
+		t.Fatalf("Failed to create directory %s: %v", indexDirPath, err)
+	}
+
 	// Create necessary files
 	files := []struct {
 		name    string
 		content string
 	}{
 		{"/index.html", "<html><body>Index</body></html>"},
 		{"/404.html", "<html><body>404 Not Found</body></html>"},
+		{"/docs.html", "<html><body>Index</body></html>"},
 	}
 
 	for _, file := range files {
@@ -46,6 +53,7 @@ func TestServer(t *testing.T) {
 		statusCode int
 	}{
 		{"/", http.StatusOK},
+		{"/docs", http.StatusOK},
 		{"/index", http.StatusOK},
 		{"/index/", http.StatusOK},
 		{tempDir + "/index.html", http.StatusNotFound},

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,10 @@ func main() {`
`36`	`36`	`if r.URL.Path == rootPath {`
`37`	`37`	`filePath += indexHTML`
`38`	`38`	`} else if !ok {`
`39`		`- if stat, err := os.Stat(filePath); err == nil && stat.IsDir() {`
`40`		`- filePath += indexHTML`
`41`		`- } else {`
	`39`	`+ if _, err := os.Stat(filePath + ".html"); err == nil {`
`42`	`40`	`filePath += htmlExtension`
	`41`	`+ } else if stat, err := os.Stat(filePath); err == nil && stat.IsDir() {`
	`42`	`+ filePath += indexHTML`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`