change

Author: coremodmc

echo/echo.go

@@ -0,0 +1,13 @@
+package echo
+
+import (
+	"github.com/3JoB/httpfileserver"
+	"github.com/labstack/echo/v4"
+)
+
+func EchoHandle(fs *httpfileserver.FileServer) echo.HandlerFunc{
+	return func(c echo.Context) error {
+		fs.ServeHTTP(c.Response().Writer, c.Request())
+		return nil
+	}
+}

example/echo/main.go

@@ -5,6 +5,7 @@ import (
 	"github.com/labstack/echo/v4/middleware"
 
 	"github.com/3JoB/httpfileserver"
+	he "github.com/3JoB/httpfileserver/echo"
 )
 
 func main() {
@@ -13,6 +14,6 @@ func main() {
 	e.Use(middleware.Logger())
 	e.Use(middleware.Recover())
 
-	e.GET("*", httpfileserver.New("/assets/", ".").EchoHandle())
+	e.GET("*", he.EchoHandle(httpfileserver.New("/assets/", ".")))
 	e.Logger.Fatal(e.Start(":1113"))
 }

example/gin/main.go

@@ -4,10 +4,11 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"github.com/3JoB/httpfileserver"
+	hg "github.com/3JoB/httpfileserver/gin"
 )
 
 func main() {
 	r := gin.New()
-	r.GET("*", httpfileserver.New("/assets/", ".").GinHandle())
+	r.GET("*", hg.GinHandle(httpfileserver.New("/assets/", ".")))
 	r.Run(":1122")
 }

gin/gin.go

@@ -0,0 +1,12 @@
+package gin
+
+import (
+	"github.com/3JoB/httpfileserver"
+	"github.com/gin-gonic/gin"
+)
+
+func GinHandle(fs *httpfileserver.FileServer) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		fs.ServeHTTP(c.Writer, c.Request)
+	}
+}

httpfileserver.go

@@ -10,11 +10,9 @@ import (
 	"time"
 
 	"github.com/andybalholm/brotli"
-	"github.com/gin-gonic/gin"
 	"github.com/klauspost/compress/flate"
 	"github.com/klauspost/compress/gzip"
 	"github.com/klauspost/compress/zstd"
-	"github.com/labstack/echo/v4"
 )
 
 type FileServer struct {
@@ -141,19 +139,6 @@ func (fs *FileServer) Handle() http.HandlerFunc {
 	return fs.ServeHTTP
 }
 
-func (fs *FileServer) EchoHandle() echo.HandlerFunc {
-	return func(c echo.Context) error {
-		fs.ServeHTTP(c.Response().Writer, c.Request())
-		return nil
-	}
-}
-
-func (fs *FileServer) GinHandle() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		fs.ServeHTTP(c.Writer, c.Request)
-	}
-}
-
 // ServeHTTP is the server of the file server
 func (fs *FileServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	r.URL.Path = strings.TrimPrefix(r.URL.Path, fs.route)