updates! settings!

hugo.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/hacdias/caddy-hugo/assets"
 	"github.com/hacdias/caddy-hugo/edit"
+	"github.com/hacdias/caddy-hugo/settings"
 	"github.com/mholt/caddy/config/setup"
 	"github.com/mholt/caddy/middleware"
 	"github.com/spf13/hugo/commands"
@@ -27,46 +28,44 @@ func Setup(c *setup.Controller) (middleware.Middleware, error) {
 type handler struct{ Next middleware.Handler }
 
 func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
-	if urlMatch(r, "/admin") {
-		return route(w, r)
+	if middleware.Path(r.URL.Path).Matches("/admin") {
+		page := parseComponents(r)[1]
+
+		if page == "assets" {
+			filename := strings.Replace(r.URL.Path, "/admin/assets", "static", 1)
+			file, err := assets.Asset(filename)
+
+			if err != nil {
+				return 404, nil
+			}
+
+			extension := filepath.Ext(filename)
+			mime := mime.TypeByExtension(extension)
+
+			header := w.Header()
+			header.Set("Content-Type", mime)
+
+			w.Write(file)
+			return 200, nil
+		} else if page == "content" {
+			w.Write([]byte("Content Page"))
+			return 200, nil
+		} else if page == "browse" {
+			w.Write([]byte("Show Data Folder"))
+			return 200, nil
+		} else if page == "edit" {
+			return edit.Execute(w, r)
+		} else if page == "settings" {
+			return settings.Execute(w, r)
+		}
+
+		return 404, nil
 	}
 
 	return h.Next.ServeHTTP(w, r)
 }
 
-func route(w http.ResponseWriter, r *http.Request) (int, error) {
-	page := parseComponents(r)[1]
-
-	if page == "assets" {
-		filename := strings.Replace(r.URL.Path, assetsURL, "static", 1)
-		file, err := assets.Asset(filename)
-
-		if err != nil {
-			return 404, nil
-		}
-
-		extension := filepath.Ext(filename)
-		mime := mime.TypeByExtension(extension)
-
-		header := w.Header()
-		header.Set("Content-Type", mime)
-
-		w.Write(file)
-	} else if page == "content" {
-		w.Write([]byte("Content Page"))
-	} else if page == "browse" {
-		w.Write([]byte("Show Data Folder"))
-	} else if page == "edit" {
-		return edit.Execute(w, r)
-	} else if page == "settings" {
-		w.Write([]byte("Settings Page"))
-	} else {
-		return 404, nil
-	}
-
-	return 200, nil
-}
-
+// TODO: utils package
 func parseComponents(r *http.Request) []string {
 	//The URL that the user queried.
 	path := r.URL.Path