diff --git a/handlers/contenu.go b/handlers/contenu.go index a64a7ed..0b8b553 100644 --- a/handlers/contenu.go +++ b/handlers/contenu.go @@ -6,22 +6,21 @@ import ( "net/http" "strings" - "git.agecem.com/agecem/babillard/config" "git.agecem.com/agecem/babillard/data" "github.com/labstack/echo/v4" ) type ContenuHandler struct { - Cfg config.Config + ContenuDir string } -func NewContenuHandler(cfg config.Config) (h ContenuHandler) { - h.Cfg = cfg +func NewContenuHandler(contenuDir string) (h ContenuHandler) { + h.ContenuDir = contenuDir return } func (h ContenuHandler) HandleAPIContenuList(c echo.Context) error { - contenu_dir := h.Cfg.ServerContenuDir + contenu_dir := h.ContenuDir files, err := data.ListContenu(contenu_dir) if err != nil { @@ -37,7 +36,7 @@ func (h ContenuHandler) HandleAPIContenuList(c echo.Context) error { func (h ContenuHandler) HandleAPIContenuFile(c echo.Context) error { filename := c.Param("filename") - contenu_dir := h.Cfg.ServerContenuDir + contenu_dir := h.ContenuDir if filename == ".gitkeep" { return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"}) diff --git a/handlers/handlers.go b/handlers/handlers.go index b571711..16f8aeb 100644 --- a/handlers/handlers.go +++ b/handlers/handlers.go @@ -5,7 +5,6 @@ import ( "log" "net/http" - "git.agecem.com/agecem/babillard/config" "git.agecem.com/agecem/babillard/public" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" @@ -24,7 +23,7 @@ API Specifications return c.String(http.StatusOK, apispec) } -func RunServer(cfg config.Config) { +func RunServer(contenuDir string, serverPort int) { log.Print("[I] Starting webserver") e := echo.New() @@ -46,11 +45,11 @@ func RunServer(cfg config.Config) { groupAPI := e.Group("/api") - contenuHandler := NewContenuHandler(cfg) + contenuHandler := NewContenuHandler(contenuDir) groupAPI.GET("/", HandleAPIShow) groupAPI.GET("/contenu/", contenuHandler.HandleAPIContenuList) groupAPI.GET("/contenu/:filename/", contenuHandler.HandleAPIContenuFile) - e.Logger.Fatal(e.Start(fmt.Sprintf(":%d", cfg.ServerPort))) + e.Logger.Fatal(e.Start(fmt.Sprintf(":%d", serverPort))) }