Make the verify pass

1 files changed, 11 insertions, 14 deletions

diff --git a/domain.go b/domain.go
index 0b0f2c6d..32a8b09c 100644
--- a/domain.go
+++ b/domain.go
@@ -63,27 +63,24 @@ func (d *domain) checkPath(w http.ResponseWriter, r *http.Request, path string)
 		return
 	}
 
-	// If this file is directory, open the index.html
-	if fi.IsDir() {
-		// If the URL doesn't end with /, send location to client
-		if !strings.HasSuffix(r.URL.Path, "/") {
-			newURL := *r.URL
-			newURL.Path += "/"
-			http.Redirect(w, r, newURL.String(), 302)
-			return
-		}
-
+	switch {
+	// If the URL doesn't end with /, send location to client
+	case fi.IsDir() && !strings.HasSuffix(r.URL.Path, "/"):
+		newURL := *r.URL
+		newURL.Path += "/"
+		http.Redirect(w, r, newURL.String(), 302)
+
+		// If this is directory, we try the index.html
+	case fi.IsDir():
 		fullPath = filepath.Join(fullPath, "index.html")
 		fi, err = os.Lstat(fullPath)
 		if err != nil {
 			return
 		}
-	}
 
-	// We don't allow to open non-regular files
-	if !fi.Mode().IsRegular() {
+		// We don't allow to open the regular file
+	case !fi.Mode().IsRegular():
 		err = fmt.Errorf("%s: is not a regular file", fullPath)
-		return
 	}
 	return
 }