diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/config-b2.sample.json | 6 | ||||
| -rw-r--r-- | config/config-local-unix.sample.json | 2 | ||||
| -rw-r--r-- | config/config.go | 30 |
3 files changed, 30 insertions, 8 deletions
diff --git a/config/config-b2.sample.json b/config/config-b2.sample.json index 372972e..60022dd 100644 --- a/config/config-b2.sample.json +++ b/config/config-b2.sample.json @@ -1,5 +1,4 @@ { - "ForceRewrite": false, "MaxProcessThreads": 4, "MaxPreProcessThreads": 12, "LogLevel": "info", @@ -33,6 +32,7 @@ } }, "Output": { + "RewriteOn": "UnequalHashInCache", "Storage": { "Type": "b2", "Config": { @@ -55,6 +55,7 @@ } }, "Output": { + "RewriteOn": "UnequalHashInCache", "Storage": { "Type": "b2", "Config": { @@ -77,6 +78,7 @@ } }, "Output": { + "RewriteOn": "UnequalHashInCache", "Storage": { "Type": "b2", "Config": { @@ -99,6 +101,7 @@ } }, "Output": { + "RewriteOn": "UnequalHashInCache", "Storage": { "Type": "b2", "Config": { @@ -121,6 +124,7 @@ } }, "Output": { + "RewriteOn": "UnequalHashInCache", "Storage": { "Type": "b2", "Config": { diff --git a/config/config-local-unix.sample.json b/config/config-local-unix.sample.json index 97f69f1..941d995 100644 --- a/config/config-local-unix.sample.json +++ b/config/config-local-unix.sample.json @@ -1,5 +1,4 @@ { - "ForceRewrite": false, "MaxProcessThreads": 4, "MaxPreProcessThreads": 12, "LogLevel": "debug", @@ -27,6 +26,7 @@ } }, "Output": { + "RewriteOn": "UnequalHashInCache", "Storage": { "Type": "local-unix", "Config": { diff --git a/config/config.go b/config/config.go index 1620d75..e55d4b7 100644 --- a/config/config.go +++ b/config/config.go @@ -14,7 +14,6 @@ type Config struct { Converters []ConverterConfig `json:"Converters" validate:"required"` MaxProcessThreads int `json:"MaxProcessThreads" validate:"required,min=1"` MaxPreProcessThreads int `json:"MaxPreProcessThreads" validate:"min=1;gtefield=MaxProcessThreads"` - ForceRewrite bool `json:"ForceRewrite" validate:"required"` LogLevel slog.Level `json:"LogLevel" validate:"required"` } @@ -63,7 +62,7 @@ func (sc *InputStorageConfig) UnmarshalJSON(data []byte) error { } type ConverterConfig struct { - Type string `json:"Type" validate:"required,oneof=webp"` + Type string `json:"Type" validate:"required,oneof=webp jpeg"` Config any `json:"Config" validate:"required"` Output OutputConfig `json:"Output" validate:"required"` } @@ -89,6 +88,12 @@ func (pc *ConverterConfig) UnmarshalJSON(data []byte) error { return fmt.Errorf("unmarshal WebpConfig: %w", err) } pc.Config = &webpConfig + case "jpeg": + var jpegConfig JpegConfig + if err := json.Unmarshal(tmp.Config, &jpegConfig); err != nil { + return fmt.Errorf("unmarshal JpegConfig: %w", err) + } + pc.Config = &jpegConfig default: return fmt.Errorf("unsupported storage type: %s", tmp.Type) } @@ -98,12 +103,18 @@ func (pc *ConverterConfig) UnmarshalJSON(data []byte) error { type WebpConfig struct { Quality int `json:"Quality" validate:"required,min=1,max=100"` - Size SizeConfig `json:"Size" validate:"required"` + Size SizeConfig `json:"Size"` +} + +type JpegConfig struct { + ExtensionName string `json:"ExtensionName" validate:"alpha"` + Quality int `json:"Quality" validate:"required,min=1,max=100"` + Size SizeConfig `json:"Size"` } type SizeConfig struct { - MaxWidth int `json:"MaxWidth" validate:"required,min=0"` - MaxHeight int `json:"MaxHeight" validate:"required,min=0"` + MaxWidth int `json:"MaxWidth"` + MaxHeight int `json:"MaxHeight"` } type OutputStorageConfig struct { @@ -157,7 +168,8 @@ type InputLocalUnixConfig struct { } type OutputConfig struct { - Storage OutputStorageConfig `json:"Storage" validate:"required"` + RewriteOn string `json:"RewriteOn" validate:"oneof=Never UnequalHashInCache Always"` + Storage OutputStorageConfig `json:"Storage" validate:"required"` } type OutputLocalUnixConfig struct { @@ -179,6 +191,12 @@ func LoadConfig(path string, config *Config) error { return err } + for i := range config.Converters { + if config.Converters[i].Output.RewriteOn == "" { + config.Converters[i].Output.RewriteOn = "UnequalHashInCache" + } + } + return nil } |