diff --git a/cmd/schreifuchs-ch/main.go b/cmd/schreifuchs-ch/main.go index 5ff9ba9..2e0724c 100644 --- a/cmd/schreifuchs-ch/main.go +++ b/cmd/schreifuchs-ch/main.go @@ -23,13 +23,19 @@ func main() { cancle() }() - slog.SetLogLoggerLevel(slog.LevelDebug) + slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelDebug}))) cfg, err := config.Read(ctx) if err != nil { slog.Error("could not read configuaration", "err", err) } + slog.SetDefault( + slog.New( + slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: cfg.LogLevel}), + ), + ) + err = server.Start(ctx, cfg) if err != nil { slog.Error("error while serving", "err", err) diff --git a/internal/components/images/helpers.go b/internal/components/images/helpers.go index 7afce25..cc29962 100644 --- a/internal/components/images/helpers.go +++ b/internal/components/images/helpers.go @@ -57,12 +57,17 @@ func PathFromUID(uid string) (string, error) { func SourceSet(src string) string { sb := strings.Builder{} - for i := range 19 { - sb.WriteString(fmt.Sprintf("%s?w=%d %dw, ", src, 100*(i+1), 100*(i+1))) + const steps = 300 + const max = 1500 + + i := 1 + for { + width := i * steps + sb.WriteString(fmt.Sprintf("%s?w=%d %dw, ", src, width, width)) + if width >= max { + return sb.String() + } + sb.WriteRune(',') + i++ } - - i := 20 - sb.WriteString(fmt.Sprintf("%s?w=%d %dw", src, 100*(i+1), 100*(i+1))) - - return sb.String() } diff --git a/internal/pkg/config/resource.go b/internal/pkg/config/resource.go index 7ff973b..83ba9a8 100644 --- a/internal/pkg/config/resource.go +++ b/internal/pkg/config/resource.go @@ -2,6 +2,7 @@ package config import ( "context" + "log/slog" "github.com/sethvargo/go-envconfig" ) @@ -11,6 +12,8 @@ type Cfg struct { Cache *ValkeyConfig `env:", prefix=CACHE_"` Image *ImageConfig `env:", prefix=IMAGE_"` Tracking *UmamiConfig `env:", prefix=TRACKING_"` + + LogLevel slog.Level `env:"LOG_LEVEL, default=DEBUG"` } type WebdavConfig struct { diff --git a/web/layouts/base.templ b/web/layouts/base.templ index 0f772b5..067e86b 100644 --- a/web/layouts/base.templ +++ b/web/layouts/base.templ @@ -22,13 +22,14 @@ templ Base(cfg config.Cfg, title string) {
- schreifuchs.ch + schreifuchs.ch