From b15a05676cbcb93854fc6d6c5d7a32ed7c0d401d Mon Sep 17 00:00:00 2001
From: dtookey <dtookey@jdsconsulting.net>
Date: Thu, 21 Jul 2022 09:04:37 -0400
Subject: [PATCH] With no testing, and no evidence that we did anything
 correctly, it appears the has cleaned up the api a little tiny bit

---
 servlet/server.go      |  7 +++++++
 servlet/staticRoute.go | 22 ++++++++++++++--------
 tmp.go                 |  9 ---------
 3 files changed, 21 insertions(+), 17 deletions(-)
 delete mode 100644 tmp.go

diff --git a/servlet/server.go b/servlet/server.go
index 49e70d3..62f95b7 100644
--- a/servlet/server.go
+++ b/servlet/server.go
@@ -3,6 +3,7 @@ package servlet
 import (
 	"html/template"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"os"
 	"regexp"
@@ -77,6 +78,12 @@ func (s *VinegarServlet) Start() {
 
 }
 
+func (s *VinegarServlet) PrintRoutes() {
+	for _, route := range s.Routes {
+		log.Println(route.Pattern.String())
+	}
+}
+
 func SendError(w http.ResponseWriter, code int, msg string) {
 	errorFile := "templates/error.html"
 	errorResp := ErrorResponse{code, msg}
diff --git a/servlet/staticRoute.go b/servlet/staticRoute.go
index e34c460..4ab4918 100644
--- a/servlet/staticRoute.go
+++ b/servlet/staticRoute.go
@@ -18,20 +18,24 @@ type (
 
 func NewImageRoute(servlet *VinegarServlet, urlPattern string, pathlike string, useCache bool) *FileRoute {
 	defaultPrune := strings.Replace(urlPattern, ".*", "", -1)
-	imgRoute := FileRoute{srv: servlet, fileRoot: pathlike, UseCache: useCache}
-	rootRoute := NewServletRoute(urlPattern, createUncompressedFileServletFunction(&imgRoute, defaultPrune, pathlike))
-	imgRoute.VinegarRoute = rootRoute //i *kinda* don't like this pattern
-	return &imgRoute
+	route := FileRoute{srv: servlet, fileRoot: pathlike, UseCache: useCache}
+	rootRoute := NewServletRoute(urlPattern, createUncompressedFileServletFunction(&route, defaultPrune, pathlike))
+	route.VinegarRoute = rootRoute //i *kinda* don't like this pattern
+
+	servlet.AddRoute(route.VinegarRoute)
+	return &route
 }
 
 func NewTextRoute(servlet *VinegarServlet, urlPattern string, pathlike string, useCache bool) *FileRoute {
 	defaultPrune := strings.Replace(urlPattern, ".*", "", -1)
-	fr := FileRoute{srv: servlet, fileRoot: pathlike, UseCache: useCache}
-	textRouteHandler := createCompressibleFileServletFunction(&fr, defaultPrune, pathlike)
+	route := FileRoute{srv: servlet, fileRoot: pathlike, UseCache: useCache}
+	textRouteHandler := createCompressibleFileServletFunction(&route, defaultPrune, pathlike)
 	rootRoute := NewServletRoute(urlPattern, textRouteHandler) //i *still* kinda don't like this pattern
-	fr.VinegarRoute = rootRoute
+	route.VinegarRoute = rootRoute
 
-	return &fr
+	servlet.AddRoute(route.VinegarRoute)
+
+	return &route
 }
 
 func NewSingleFileRoute(servlet *VinegarServlet, urlPattern string, pathlike string, useCache bool) *FileRoute {
@@ -49,6 +53,8 @@ func NewSingleFileRoute(servlet *VinegarServlet, urlPattern string, pathlike str
 
 	route.VinegarRoute = parentRoute
 
+	servlet.AddRoute(route.VinegarRoute)
+
 	return &route
 }
 
diff --git a/tmp.go b/tmp.go
deleted file mode 100644
index 6d03aec..0000000
--- a/tmp.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package main
-
-import "vinegar/servlet"
-
-func main() {
-	serv := servlet.NewServlet(":8080")
-
-	serv.Start()
-}