Skip to content
Snippets Groups Projects
Verified Commit b05ab1e2 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

fix: replace snake_case with pascalCase

parent 936de5d0
No related branches found
No related tags found
No related merge requests found
Pipeline #2813 passed
...@@ -171,27 +171,22 @@ func (image *ImageHandle) Resize(size Size) error { ...@@ -171,27 +171,22 @@ func (image *ImageHandle) Resize(size Size) error {
} }
func (image *ImageHandle) prepareWrite(quality Quality) error { func (image *ImageHandle) prepareWrite(quality Quality) error {
log.Printf("preparing image for writing at quality %v", quality)
for _, profile := range image.profiles { for _, profile := range image.profiles {
log.Printf("setting color profile on image '%s' %d", profile.format, len(profile.data))
if err := image.wand.ProfileImage(profile.format, profile.data); err != nil { if err := image.wand.ProfileImage(profile.format, profile.data); err != nil {
return err return err
} }
} }
log.Printf("setting image depth on image %d", image.depth)
if err := image.wand.SetImageDepth(image.depth); err != nil { if err := image.wand.SetImageDepth(image.depth); err != nil {
return err return err
} }
if quality.CompressionQuality != 0 { if quality.CompressionQuality != 0 {
log.Printf("setting compression quality on image %d", quality.CompressionQuality)
if err := image.wand.SetImageCompressionQuality(quality.CompressionQuality); err != nil { if err := image.wand.SetImageCompressionQuality(quality.CompressionQuality); err != nil {
return err return err
} }
} }
if len(quality.SamplingFactors) != 0 { if len(quality.SamplingFactors) != 0 {
log.Printf("setting sampling factors on image %v", quality.SamplingFactors)
if err := image.wand.SetSamplingFactors(quality.SamplingFactors); err != nil { if err := image.wand.SetSamplingFactors(quality.SamplingFactors); err != nil {
return err return err
} }
...@@ -206,7 +201,6 @@ func (image *ImageHandle) Write(quality Quality, target string) error { ...@@ -206,7 +201,6 @@ func (image *ImageHandle) Write(quality Quality, target string) error {
if err := image.prepareWrite(quality); err != nil { if err := image.prepareWrite(quality); err != nil {
return err return err
} }
log.Printf("writing image %s", target)
if err := image.wand.WriteImage(target); err != nil { if err := image.wand.WriteImage(target); err != nil {
return err return err
} }
...@@ -217,7 +211,6 @@ func (image *ImageHandle) WriteImageFile(quality Quality, target *os.File) error ...@@ -217,7 +211,6 @@ func (image *ImageHandle) WriteImageFile(quality Quality, target *os.File) error
if err := image.prepareWrite(quality); err != nil { if err := image.prepareWrite(quality); err != nil {
return err return err
} }
log.Printf("writing image %s", target.Name())
if err := image.wand.WriteImageFile(target); err != nil { if err := image.wand.WriteImageFile(target); err != nil {
return err return err
} }
......
...@@ -16,8 +16,8 @@ type Size struct { ...@@ -16,8 +16,8 @@ type Size struct {
} }
type Quality struct { type Quality struct {
CompressionQuality uint `json:"compression_quality" yaml:"compression-quality"` CompressionQuality uint `json:"compressionQuality" yaml:"compressionQuality"`
SamplingFactors []float64 `json:"sampling_factors" yaml:"sampling-factors"` SamplingFactors []float64 `json:"samplingFactors" yaml:"samplingFactors"`
} }
type ColorProfile struct { type ColorProfile struct {
......
...@@ -28,13 +28,13 @@ type DatabaseConfig struct { ...@@ -28,13 +28,13 @@ type DatabaseConfig struct {
type Config struct { type Config struct {
Sizes []SizeDefinition `yaml:"sizes"` Sizes []SizeDefinition `yaml:"sizes"`
Quality imgconv.Quality `yaml:"quality"` Quality imgconv.Quality `yaml:"quality"`
SourceFolder string `yaml:"source-folder"` SourceFolder string `yaml:"sourceFolder"`
TargetFolder string `yaml:"target-folder"` TargetFolder string `yaml:"targetFolder"`
Redis RedisConfig `yaml:"redis"` Redis RedisConfig `yaml:"redis"`
Database DatabaseConfig `yaml:"database"` Database DatabaseConfig `yaml:"database"`
Concurrency int `yaml:"concurrency"` Concurrency int `yaml:"concurrency"`
UploadTimeout string `yaml:"upload-timeout"` UploadTimeout string `yaml:"uploadTimeout"`
BaseUrl string `yaml:"base-url"` BaseUrl string `yaml:"baseUrl"`
} }
func LoadConfigFromFile(file *os.File) Config { func LoadConfigFromFile(file *os.File) Config {
......
...@@ -10,7 +10,7 @@ type Image struct { ...@@ -10,7 +10,7 @@ type Image struct {
Description string Description string
CreatedAt time.Time CreatedAt time.Time
OriginalName string OriginalName string
MimeType string `json:"mime_type"` MimeType string `json:"mimeType"`
} }
type Result struct { type Result struct {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment