Fixed fileHandler

src/FileHandlers.go

@@ -5,11 +5,8 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"strings"
 )
 
-const staticDir = "static"
-
 type FileData struct {
 	ImageNames      []string
 	SpicyImageNames []string
@@ -21,6 +18,8 @@ type AsciiEntry struct {
 	FontSize int
 }
 
+const staticDir = "static"
+
 // move FileData and AsciiEntry here if you want, or leave in main.go
 func FileHandler(w http.ResponseWriter, r *http.Request) {
 	data := FileData{
@@ -29,40 +28,30 @@ func FileHandler(w http.ResponseWriter, r *http.Request) {
 		AsciiFiles:      []AsciiEntry{},
 	}
 
-	dirs, err := os.ReadDir(staticDir)
+	files, _ := os.ReadDir(filepath.Join(staticDir, "images"))
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	for _, dir := range dirs {
-		dirName := dir.Name()
-
-		if strings.EqualFold(dirName, "images") {
-
-			files, _ := os.ReadDir(filepath.Join(staticDir, dirName))
 	for _, file := range files {
 		fileName := file.Name()
-				data.ImageNames = append(data.ImageNames, filepath.Join(staticDir, dirName, fileName))
+		data.ImageNames = append(data.ImageNames, filepath.Join(staticDir, "images", fileName))
 	}
-		} else if strings.EqualFold(dirName, "spicy") {
+	files, _ = os.ReadDir(filepath.Join("uploads"))
-
-			files, _ := os.ReadDir(filepath.Join(staticDir, dirName))
 	for _, file := range files {
 		fileName := file.Name()
-				data.SpicyImageNames = append(data.SpicyImageNames, filepath.Join(staticDir, dirName, fileName))
+		data.ImageNames = append(data.ImageNames, filepath.Join("uploads", fileName))
 	}
-		} else if strings.EqualFold(dirName, "ascii_art") {
 
-			files, _ := os.ReadDir(filepath.Join(staticDir, dirName))
+	files, _ = os.ReadDir(filepath.Join(staticDir, "spicy"))
+	for _, file := range files {
+		fileName := file.Name()
+		data.SpicyImageNames = append(data.SpicyImageNames, filepath.Join(staticDir, "spicy", fileName))
+	}
+
+	files, _ = os.ReadDir(filepath.Join(staticDir, "ascii_art"))
 	for _, file := range files {
 		fileName := file.Name()
 		data.AsciiFiles = append(data.AsciiFiles,
-					AsciiEntry{Name: filepath.Join(staticDir, dirName, fileName), FontSize: 12},
+			AsciiEntry{Name: filepath.Join(staticDir, "ascii_art", fileName), FontSize: 12},
 		)
 	}
-		}
-	}
 
 	w.Header().Set("Content-Type", "application/json")
 	json.NewEncoder(w).Encode(data)