Skip to content

Fix same file and directory name #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 24, 2025
Merged

Fix same file and directory name #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f6827ff
handle well known endpoints
aryanmehrotra Jan 24, 2025
5eaf482
Merge branch 'main' of github.com:zopdev/static-server
aryanmehrotra Feb 19, 2025
1ffb846
update gofr version
aryanmehrotra Feb 19, 2025
582ac90
if the directory name is same as file name then check if that file wi…
aryanmehrotra Feb 24, 2025
911392b
Merge branch 'main' of github.com:zopdev/static-server into fix/same-…
aryanmehrotra Feb 24, 2025
088e19a
add tests and fix linter
aryanmehrotra Feb 24, 2025
a763d60
create an index directory to check if index.html gets rendered
aryanmehrotra Feb 24, 2025
8dbd94a
update tests
aryanmehrotra Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
8 changes: 8 additions & 0 deletions main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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},
Expand Down