agecem/babillard
5
0
Fork 0
Code Issues 5 Pull requests Releases Packages Activity

Merge pull request 'BREAKING: Déplacer config à cmd.app.Config et bump couleuvre' (#14) from refactor/app-config into main

Browse source 
Reviewed-on: #14
This commit is contained in:
Victor Lacasse-Beaudoin 2023-12-04 21:32:38 -05:00
commit 7c4e8d8227
6 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmd/cmd.go
View file

@ -9,13 +9,13 @@ import (
"git.agecem.com/agecem/babillard/handlers" "git.agecem.com/agecem/babillard/handlers"
) )
var cfg config.Config var app couleuvre.App[config.Config]
func Cfg() config.Config { return cfg }
func init() { func init() {
flag.StringVar(&cfg.ServerContenuDir, ServerContenuDirName, ServerContenuDirDefault, ServerContenuDirDescription) app = couleuvre.NewApp[config.Config]("BABILLARD_", ".", "_")
flag.IntVar(&cfg.ServerPort, ServerPortName, ServerPortDefault, ServerPortDescription)
flag.StringVar(&app.Config.ServerContenuDir, ServerContenuDirName, ServerContenuDirDefault, ServerContenuDirDescription)
flag.IntVar(&app.Config.ServerPort, ServerPortName, ServerPortDefault, ServerPortDescription)
} }
const ( const (
@ -34,14 +34,12 @@ const (
) )
func ServerCmdExecuter() error { func ServerCmdExecuter() error {
handlers.RunServer(Cfg()) handlers.RunServer(app.Config.ServerContenuDir, app.Config.ServerPort)
return nil return nil
} }
func Execute() error { func Execute() error {
app := couleuvre.NewApp("BABILLARD_", ".", "_") if err := app.Parse(); err != nil {
if err := app.Parse(&cfg); err != nil {
return err return err
} }

2
examples/babillard.yaml Normal file
View file

@ -0,0 +1,2 @@
serverport: 9999
servercontenudir: '/dev/null'

2
go.mod
View file

@ -5,7 +5,7 @@ go 1.21.3
toolchain go1.21.4 toolchain go1.21.4
require ( require (
codeberg.org/vlbeaudoin/couleuvre v0.8.0 codeberg.org/vlbeaudoin/couleuvre v0.10.0
github.com/labstack/echo/v4 v4.11.3 github.com/labstack/echo/v4 v4.11.3
) )

4
go.sum
View file

@ -1,5 +1,5 @@
codeberg.org/vlbeaudoin/couleuvre v0.8.0 h1:61lJ8zICGWiBX2Ao0+p1L+fU78KKibgJ5M6kCFHXjN0= codeberg.org/vlbeaudoin/couleuvre v0.10.0 h1:Uk6795M7ziZPu1Fv8KgGNEbRjc1u4NPdPU4Tip0IpHU=
codeberg.org/vlbeaudoin/couleuvre v0.8.0/go.mod h1:+M8nPA/3LknsY72RP0ZHCZycQ1SPxxRoXpnyHeSNE7U= codeberg.org/vlbeaudoin/couleuvre v0.10.0/go.mod h1:+M8nPA/3LknsY72RP0ZHCZycQ1SPxxRoXpnyHeSNE7U=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

11
handlers/contenu.go
View file

@ -6,22 +6,21 @@ import (
"net/http" "net/http"
"strings" "strings"
"git.agecem.com/agecem/babillard/config"
"git.agecem.com/agecem/babillard/data" "git.agecem.com/agecem/babillard/data"
"github.com/labstack/echo/v4" "github.com/labstack/echo/v4"
) )
type ContenuHandler struct { type ContenuHandler struct {
Cfg config.Config ContenuDir string
} }
func NewContenuHandler(cfg config.Config) (h ContenuHandler) { func NewContenuHandler(contenuDir string) (h ContenuHandler) {
h.Cfg = cfg h.ContenuDir = contenuDir
return return
} }
func (h ContenuHandler) HandleAPIContenuList(c echo.Context) error { func (h ContenuHandler) HandleAPIContenuList(c echo.Context) error {
contenu_dir := h.Cfg.ServerContenuDir contenu_dir := h.ContenuDir
files, err := data.ListContenu(contenu_dir) files, err := data.ListContenu(contenu_dir)
if err != nil { if err != nil {
@ -37,7 +36,7 @@ func (h ContenuHandler) HandleAPIContenuList(c echo.Context) error {
func (h ContenuHandler) HandleAPIContenuFile(c echo.Context) error { func (h ContenuHandler) HandleAPIContenuFile(c echo.Context) error {
filename := c.Param("filename") filename := c.Param("filename")
contenu_dir := h.Cfg.ServerContenuDir contenu_dir := h.ContenuDir
if filename == ".gitkeep" { if filename == ".gitkeep" {
return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"}) return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"})

7
handlers/handlers.go
View file

@ -5,7 +5,6 @@ import (
"log" "log"
"net/http" "net/http"
"git.agecem.com/agecem/babillard/config"
"git.agecem.com/agecem/babillard/public" "git.agecem.com/agecem/babillard/public"
"github.com/labstack/echo/v4" "github.com/labstack/echo/v4"
"github.com/labstack/echo/v4/middleware" "github.com/labstack/echo/v4/middleware"
@ -24,7 +23,7 @@ API Specifications
return c.String(http.StatusOK, apispec) return c.String(http.StatusOK, apispec)
} }
func RunServer(cfg config.Config) { func RunServer(contenuDir string, serverPort int) {
log.Print("[I] Starting webserver") log.Print("[I] Starting webserver")
e := echo.New() e := echo.New()
@ -46,11 +45,11 @@ func RunServer(cfg config.Config) {
groupAPI := e.Group("/api") groupAPI := e.Group("/api")
contenuHandler := NewContenuHandler(cfg) contenuHandler := NewContenuHandler(contenuDir)
groupAPI.GET("/", HandleAPIShow) groupAPI.GET("/", HandleAPIShow)
groupAPI.GET("/contenu/", contenuHandler.HandleAPIContenuList) groupAPI.GET("/contenu/", contenuHandler.HandleAPIContenuList)
groupAPI.GET("/contenu/:filename/", contenuHandler.HandleAPIContenuFile) 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)))
} }