okay, everything seems to work. somewhat.

cacheutil/WebLRU.go

@@ -1,4 +1,4 @@
-package vinegar
+package cacheutil
 
 import (
 	"bytes"
@@ -12,8 +12,6 @@ import (
 
 const (
 	DefaultCacheTimeInMinutes = 15
-	ContentTypeHeaderKey      = "Content-Type"
-	ContentEncodingHeaderKey  = "Content-Encoding"
 )
 
 type (
@@ -108,7 +106,7 @@ func (l *Lru) Get(key string) (*LruEntry, bool) {
 		if exists {
 			entry.mostRecentAccess = time.Now()
 		} else {
-			fmt.Printf("cache miss for '%s'\n", key)
+			fmt.Printf("cacheutil miss for '%s'\n", key)
 		}
 		return entry, exists
 	}

servlet/dynamicRoute.go

@@ -1,4 +1,4 @@
-package vinegar
+package servlet
 
 import (
 	"fmt"
@@ -7,8 +7,8 @@ import (
 
 type (
 	ApiRoute struct {
-		ServletRoute     *ServletRoute
+		VinegarRoute     *VinegarRoute
-		HttpMethodRoutes *map[HttpMethod]ServletHandleFunction
+		HttpMethodRoutes *map[HttpMethod]VinegarHandlerFunction
 	}
 )
 
@@ -26,7 +26,7 @@ const (
 )
 
 func NewApiRoute(pattern string) *ApiRoute {
-	functionMap := make(map[HttpMethod]ServletHandleFunction)
+	functionMap := make(map[HttpMethod]VinegarHandlerFunction)
 	ancestorRoute := NewServletRoute(pattern, createMethodHandler(&functionMap))
 	route := ApiRoute{
 		ancestorRoute,
@@ -35,7 +35,7 @@ func NewApiRoute(pattern string) *ApiRoute {
 	return &route
 }
 
-func createMethodHandler(m *map[HttpMethod]ServletHandleFunction) ServletHandleFunction {
+func createMethodHandler(m *map[HttpMethod]VinegarHandlerFunction) VinegarHandlerFunction {
 	return func(w http.ResponseWriter, req *http.Request) {
 		method := getHttpMethod(req)
 		fn, exists := (*m)[method]
@@ -52,7 +52,7 @@ func createMethodHandler(m *map[HttpMethod]ServletHandleFunction) ServletHandleF
 	}
 }
 
-func (api *ApiRoute) RegisterHttpMethodHandler(method HttpMethod, handler ServletHandleFunction) {
+func (api *ApiRoute) RegisterHttpMethodHandler(method HttpMethod, handler VinegarHandlerFunction) {
 	(*api.HttpMethodRoutes)[method] = handler
 }
 

servlet/server.go

@@ -1,4 +1,4 @@
-package vinegar
+package servlet
 
 import (
 	"fmt"
@@ -7,10 +7,13 @@ import (
 	"net/http"
 	"os"
 	"regexp"
+	"vinegar/cacheutil"
 )
 
 const (
 	defaultLruSize           = int64(1024 * 1024 * 50)
+	ContentTypeHeaderKey     = "Content-Type"
+	ContentEncodingHeaderKey = "Content-Encoding"
 )
 
 type ErrorResponse struct {
@@ -19,29 +22,29 @@ type ErrorResponse struct {
 }
 
 type (
-	Servlet struct {
+	VinegarServlet struct {
 		Port   string
-		Routes []*ServletRoute
+		Routes []*VinegarRoute
-		Cache  *Lru
+		Cache  *cacheutil.Lru
 	}
 
-	ServletRoute struct {
+	VinegarRoute struct {
 		Pattern *regexp.Regexp
-		Handler ServletHandleFunction
+		Handler VinegarHandlerFunction
 	}
 
-	ServletHandleFunction func(w http.ResponseWriter, req *http.Request)
+	VinegarHandlerFunction func(w http.ResponseWriter, req *http.Request)
 )
 
-func NewServlet(port string) *Servlet {
+func NewServlet(port string) *VinegarServlet {
-	lru := NewLRU(defaultLruSize)
+	lru := cacheutil.NewLRU(defaultLruSize)
-	srv := Servlet{Port: port, Cache: lru}
+	srv := VinegarServlet{Port: port, Cache: lru}
 
 	return &srv
 }
 
-func NewServletRoute(routePattern string, handleFunc ServletHandleFunction) *ServletRoute {
+func NewServletRoute(routePattern string, handleFunc VinegarHandlerFunction) *VinegarRoute {
-	route := ServletRoute{}
+	route := VinegarRoute{}
 
 	pattern := regexp.MustCompile(routePattern)
 
@@ -51,11 +54,11 @@ func NewServletRoute(routePattern string, handleFunc ServletHandleFunction) *Ser
 	return &route
 }
 
-func (s *Servlet) AddRoute(route *ServletRoute) {
+func (s *VinegarServlet) AddRoute(route *VinegarRoute) {
 	s.Routes = append(s.Routes, route)
 }
 
-func (s *Servlet) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+func (s *VinegarServlet) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	path := req.URL.Path
 	fmt.Println("Attempting to match request for " + path)
 	for _, route := range s.Routes {
@@ -66,7 +69,7 @@ func (s *Servlet) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	}
 }
 
-func StartServerGood(s *Servlet) {
+func StartServerGood(s *VinegarServlet) {
 	err := http.ListenAndServe(s.Port, s)
 
 	if err != nil {

servlet/staticRoute.go

@@ -1,60 +1,64 @@
-package vinegar
+package servlet
 
 import (
 	"net/http"
 	"path"
 	"strings"
+	"vinegar/cacheutil"
 )
 
 type (
 	FileRoute struct {
-		*ServletRoute
+		*VinegarRoute
 		fileRoot string
 	}
 )
 
-func NewImageRoute(urlPattern string, pathlike string, servlet *Servlet) *FileRoute {
+func NewImageRoute(urlPattern string, pathlike string, servlet *VinegarServlet) *FileRoute {
 	defaultPrune := strings.Replace(urlPattern, ".*", "", -1)
 	rootRoute := NewServletRoute(urlPattern, createUncompressedFileServletFunction(defaultPrune, pathlike, servlet.Cache))
 	imgRoute := FileRoute{rootRoute, pathlike}
 	return &imgRoute
 }
 
-func NewTextRoute(urlPattern string, pathlike string, servlet *Servlet) *FileRoute {
+func NewTextRoute(urlPattern string, pathlike string, servlet *VinegarServlet) *FileRoute {
 	defaultPrune := strings.Replace(urlPattern, ".*", "", -1)
 	rootRoute := NewServletRoute(urlPattern, createCompressibleFileServletFunction(defaultPrune, pathlike, servlet.Cache))
 	fr := FileRoute{rootRoute, pathlike}
 	return &fr
 }
 
-func NewSingleFileRoute(urlPattern string, pathlike string, servlet *Servlet) *FileRoute {
+func NewSingleFileRoute(urlPattern string, pathlike string, servlet *VinegarServlet) *FileRoute {
 	fun := createSingleFileServletFunction(pathlike)
 	route := FileRoute{
-		ServletRoute: NewServletRoute("^"+urlPattern+"$", fun),
+		VinegarRoute: NewServletRoute("^"+urlPattern+"$", fun),
 		fileRoot:     pathlike,
 	}
 	return &route
 }
 
-func createSingleFileServletFunction(pathlike string) ServletHandleFunction {
+func createSingleFileServletFunction(pathlike string) VinegarHandlerFunction {
-	cache := NewSingleFileCache(pathlike)
+	cache := cacheutil.NewSingleFileCache(pathlike)
-	var fun ServletHandleFunction = func(w http.ResponseWriter, req *http.Request) {
+	var fun VinegarHandlerFunction = func(w http.ResponseWriter, req *http.Request) {
 		w.Header().Add(ContentTypeHeaderKey, cache.Mimetype)
 		if clientAcceptsGzip(req) {
 			w.Header().Add(ContentEncodingHeaderKey, "gzip")
-			w.Write(*cache.CompressedContent)
+			_, err := w.Write(*cache.CompressedContent)
+			if err != nil {
+				panic(err)
+			}
 		}
 	}
 
 	return fun
 }
 
-func createCompressibleFileServletFunction(basePattern string, pathlike string, cache *Lru) ServletHandleFunction {
+func createCompressibleFileServletFunction(basePattern string, pathlike string, cache *cacheutil.Lru) VinegarHandlerFunction {
-	var fun ServletHandleFunction = func(w http.ResponseWriter, req *http.Request) {
+	var fun VinegarHandlerFunction = func(w http.ResponseWriter, req *http.Request) {
 		stub := strings.Replace(req.URL.Path, basePattern, "", 1)
 		cachedContent, exists := cache.Get(stub)
 		if !exists {
-			content, fileExists := GetDiskContent(path.Join(pathlike, stub))
+			content, fileExists := cacheutil.GetDiskContent(path.Join(pathlike, stub))
 			if fileExists {
 				cache.Put(stub, content)
 				cachedContent, _ = cache.Get(stub)
@@ -80,13 +84,13 @@ func createCompressibleFileServletFunction(basePattern string, pathlike string,
 	return fun
 }
 
-func createUncompressedFileServletFunction(basePattern string, pathlike string, cache *Lru) ServletHandleFunction {
+func createUncompressedFileServletFunction(basePattern string, pathlike string, cache *cacheutil.Lru) VinegarHandlerFunction {
-	var fun ServletHandleFunction = func(w http.ResponseWriter, req *http.Request) {
+	var fun VinegarHandlerFunction = func(w http.ResponseWriter, req *http.Request) {
 		stub := strings.Replace(req.URL.Path, basePattern, "", 1)
 
 		entry, exists := cache.Get(stub)
 		if !exists {
-			fileContent, fExists := GetDiskContent(path.Join(pathlike, stub))
+			fileContent, fExists := cacheutil.GetDiskContent(path.Join(pathlike, stub))
 			if fExists {
 				cache.Put(stub, fileContent)
 				entry, exists = cache.Get(stub)