From b05ab1e28331febed99841b0af03022d3e504884 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Sat, 14 May 2022 01:21:03 +0200
Subject: [PATCH] fix: replace snake_case with pascalCase
---
imgconv/imagehandle.go | 7 -------
imgconv/types.go | 4 ++--
shared/config.go | 8 ++++----
shared/types.go | 2 +-
4 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/imgconv/imagehandle.go b/imgconv/imagehandle.go
index 427b77b..344cbde 100644
--- a/imgconv/imagehandle.go
+++ b/imgconv/imagehandle.go
@@ -171,27 +171,22 @@ func (image *ImageHandle) Resize(size Size) error {
}
func (image *ImageHandle) prepareWrite(quality Quality) error {
- log.Printf("preparing image for writing at quality %v", quality)
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 {
return err
}
}
- log.Printf("setting image depth on image %d", image.depth)
if err := image.wand.SetImageDepth(image.depth); err != nil {
return err
}
if quality.CompressionQuality != 0 {
- log.Printf("setting compression quality on image %d", quality.CompressionQuality)
if err := image.wand.SetImageCompressionQuality(quality.CompressionQuality); err != nil {
return err
}
}
if len(quality.SamplingFactors) != 0 {
- log.Printf("setting sampling factors on image %v", quality.SamplingFactors)
if err := image.wand.SetSamplingFactors(quality.SamplingFactors); err != nil {
return err
}
@@ -206,7 +201,6 @@ func (image *ImageHandle) Write(quality Quality, target string) error {
if err := image.prepareWrite(quality); err != nil {
return err
}
- log.Printf("writing image %s", target)
if err := image.wand.WriteImage(target); err != nil {
return err
}
@@ -217,7 +211,6 @@ func (image *ImageHandle) WriteImageFile(quality Quality, target *os.File) error
if err := image.prepareWrite(quality); err != nil {
return err
}
- log.Printf("writing image %s", target.Name())
if err := image.wand.WriteImageFile(target); err != nil {
return err
}
diff --git a/imgconv/types.go b/imgconv/types.go
index 6468630..881ccd9 100644
--- a/imgconv/types.go
+++ b/imgconv/types.go
@@ -16,8 +16,8 @@ type Size struct {
}
type Quality struct {
- CompressionQuality uint `json:"compression_quality" yaml:"compression-quality"`
- SamplingFactors []float64 `json:"sampling_factors" yaml:"sampling-factors"`
+ CompressionQuality uint `json:"compressionQuality" yaml:"compressionQuality"`
+ SamplingFactors []float64 `json:"samplingFactors" yaml:"samplingFactors"`
}
type ColorProfile struct {
diff --git a/shared/config.go b/shared/config.go
index 966b014..4a8013d 100644
--- a/shared/config.go
+++ b/shared/config.go
@@ -28,13 +28,13 @@ type DatabaseConfig struct {
type Config struct {
Sizes []SizeDefinition `yaml:"sizes"`
Quality imgconv.Quality `yaml:"quality"`
- SourceFolder string `yaml:"source-folder"`
- TargetFolder string `yaml:"target-folder"`
+ SourceFolder string `yaml:"sourceFolder"`
+ TargetFolder string `yaml:"targetFolder"`
Redis RedisConfig `yaml:"redis"`
Database DatabaseConfig `yaml:"database"`
Concurrency int `yaml:"concurrency"`
- UploadTimeout string `yaml:"upload-timeout"`
- BaseUrl string `yaml:"base-url"`
+ UploadTimeout string `yaml:"uploadTimeout"`
+ BaseUrl string `yaml:"baseUrl"`
}
func LoadConfigFromFile(file *os.File) Config {
diff --git a/shared/types.go b/shared/types.go
index 8433117..63cd708 100644
--- a/shared/types.go
+++ b/shared/types.go
@@ -10,7 +10,7 @@ type Image struct {
Description string
CreatedAt time.Time
OriginalName string
- MimeType string `json:"mime_type"`
+ MimeType string `json:"mimeType"`
}
type Result struct {
--
GitLab