mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-29 22:29:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Create a struct with all of Hugo's config options

Browse Source 
Primary motivation is documentation, but it will also hopefully simplify the code.

Also,

* Lower case the default output format names; this is in line with the custom ones (map keys) and how
it's treated all the places. This avoids doing `stringds.EqualFold` everywhere.

Closes #10896
Closes #10620
This commit is contained in:
Bjørn Erik Pedersen
2023-01-04 18:24:36 +01:00
parent 6aededf6b4
commit 241b21b0fd
337 changed files with 13377 additions and 14898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
resources/images/image.go
View File

@@ -25,6 +25,7 @@ import (
"sync"
"github.com/bep/gowebp/libwebp/webpoptions"
"github.com/gohugoio/hugo/config"
"github.com/gohugoio/hugo/resources/images/webp"
"github.com/gohugoio/hugo/media"
@@ -174,8 +175,8 @@ func (i *Image) initConfig() error {
return nil
}
func NewImageProcessor(cfg ImagingConfig) (*ImageProcessor, error) {
e := cfg.Cfg.Exif
func NewImageProcessor(cfg *config.ConfigNamespace[ImagingConfig, ImagingConfigInternal]) (*ImageProcessor, error) {
e := cfg.Config.Imaging.Exif
exifDecoder, err := exif.NewDecoder(
exif.WithDateDisabled(e.DisableDate),
exif.WithLatLongDisabled(e.DisableLatLong),
@@ -193,7 +194,7 @@ func NewImageProcessor(cfg ImagingConfig) (*ImageProcessor, error) {
}
type ImageProcessor struct {
Cfg ImagingConfig
Cfg *config.ConfigNamespace[ImagingConfig, ImagingConfigInternal]
exifDecoder *exif.Decoder
}
@@ -304,11 +305,14 @@ func (p *ImageProcessor) doFilter(src image.Image, targetFormat Format, filters
return dst, nil
}
func GetDefaultImageConfig(action string, defaults ImagingConfig) ImageConfig {
func GetDefaultImageConfig(action string, defaults *config.ConfigNamespace[ImagingConfig, ImagingConfigInternal]) ImageConfig {
if defaults == nil {
defaults = defaultImageConfig
}
return ImageConfig{
Action: action,
Hint: defaults.Hint,
Quality: defaults.Cfg.Quality,
Hint: defaults.Config.Hint,
Quality: defaults.Config.Imaging.Quality,
}
}
@@ -350,17 +354,17 @@ func (f Format) DefaultExtension() string {
func (f Format) MediaType() media.Type {
switch f {
case JPEG:
return media.JPEGType
return media.Builtin.JPEGType
case PNG:
return media.PNGType
return media.Builtin.PNGType
case GIF:
return media.GIFType
return media.Builtin.GIFType
case TIFF:
return media.TIFFType
return media.Builtin.TIFFType
case BMP:
return media.BMPType
return media.Builtin.BMPType
case WEBP:
return media.WEBPType
return media.Builtin.WEBPType
default:
panic(fmt.Sprintf("%d is not a valid image format", f))
}