diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-03-17 22:03:27 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-03-17 22:03:27 +0100 |
commit | b80853de90b10171155b8f3fde47d64ec7bfa0dd (patch) | |
tree | 435d3dbf7a495a0c6ce64c9769e037179aa0d27b /resources | |
parent | 423594e03a906ef4150f433666ff588b022c3c92 (diff) |
all: gofmt -w -r 'interface{} -> any' .
Updates #9687
Diffstat (limited to 'resources')
70 files changed, 278 insertions, 273 deletions
diff --git a/resources/errorResource.go b/resources/errorResource.go index a7f99c2b7..70f05d3f7 100644 --- a/resources/errorResource.go +++ b/resources/errorResource.go @@ -56,7 +56,7 @@ func (e *errorResource) ReadSeekCloser() (hugio.ReadSeekCloser, error) { panic(e.error) } -func (e *errorResource) Content() (interface{}, error) { +func (e *errorResource) Content() (any, error) { panic(e.error) } @@ -88,7 +88,7 @@ func (e *errorResource) Params() maps.Params { panic(e.error) } -func (e *errorResource) Data() interface{} { +func (e *errorResource) Data() any { panic(e.error) } @@ -116,7 +116,7 @@ func (e *errorResource) Resize(spec string) (resource.Image, error) { panic(e.error) } -func (e *errorResource) Filter(filters ...interface{}) (resource.Image, error) { +func (e *errorResource) Filter(filters ...any) (resource.Image, error) { panic(e.error) } diff --git a/resources/image.go b/resources/image.go index 3a790a217..86cc3251a 100644 --- a/resources/image.go +++ b/resources/image.go @@ -238,7 +238,7 @@ func (i *imageResource) Fill(spec string) (resource.Image, error) { return img, err } -func (i *imageResource) Filter(filters ...interface{}) (resource.Image, error) { +func (i *imageResource) Filter(filters ...any) (resource.Image, error) { conf := images.GetDefaultImageConfig("filter", i.Proc.Cfg) var gfilters []gift.Filter diff --git a/resources/image_extended_test.go b/resources/image_extended_test.go index 6c657a92a..a0b274f3e 100644 --- a/resources/image_extended_test.go +++ b/resources/image_extended_test.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build extended // +build extended package resources diff --git a/resources/image_test.go b/resources/image_test.go index e85fe9b9a..a7577e0a6 100644 --- a/resources/image_test.go +++ b/resources/image_test.go @@ -351,7 +351,7 @@ func TestImageWithMetadata(t *testing.T) { image := fetchSunset(c) - meta := []map[string]interface{}{ + meta := []map[string]any{ { "title": "My Sunset", "name": "Sunset #:counter", @@ -694,7 +694,7 @@ func TestImageOperationsGolden(t *testing.T) { f.Overlay(gopher.(images.ImageSource), 20, 30), f.Text("No options"), f.Text("This long text is to test line breaks. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."), - f.Text("Hugo rocks!", map[string]interface{}{"x": 3, "y": 3, "size": 20, "color": "#fc03b1"}), + f.Text("Hugo rocks!", map[string]any{"x": 3, "y": 3, "size": 20, "color": "#fc03b1"}), } resized, err := orig.Fill("400x200 center") diff --git a/resources/images/color_test.go b/resources/images/color_test.go index 0a1718180..52871e691 100644 --- a/resources/images/color_test.go +++ b/resources/images/color_test.go @@ -25,7 +25,7 @@ func TestHexStringToColor(t *testing.T) { for _, test := range []struct { arg string - expect interface{} + expect any }{ {"f", false}, {"#f", false}, diff --git a/resources/images/config.go b/resources/images/config.go index f9a3fa09d..e72bf5485 100644 --- a/resources/images/config.go +++ b/resources/images/config.go @@ -131,9 +131,9 @@ var defaultImaging = Imaging{ Quality: defaultJPEGQuality, } -func DecodeConfig(m map[string]interface{}) (ImagingConfig, error) { +func DecodeConfig(m map[string]any) (ImagingConfig, error) { if m == nil { - m = make(map[string]interface{}) + m = make(map[string]any) } i := ImagingConfig{ diff --git a/resources/images/config_test.go b/resources/images/config_test.go index 7b2459250..816a69cf9 100644 --- a/resources/images/config_test.go +++ b/resources/images/config_test.go @@ -23,7 +23,7 @@ import ( func TestDecodeConfig(t *testing.T) { c := qt.New(t) - m := map[string]interface{}{ + m := map[string]any{ "quality": 42, "resampleFilter": "NearestNeighbor", "anchor": "topLeft", @@ -37,7 +37,7 @@ func TestDecodeConfig(t *testing.T) { c.Assert(imaging.ResampleFilter, qt.Equals, "nearestneighbor") c.Assert(imaging.Anchor, qt.Equals, "topleft") - m = map[string]interface{}{} + m = map[string]any{} imagingConfig, err = DecodeConfig(m) c.Assert(err, qt.IsNil) @@ -45,30 +45,30 @@ func TestDecodeConfig(t *testing.T) { c.Assert(imaging.ResampleFilter, qt.Equals, "box") c.Assert(imaging.Anchor, qt.Equals, "smart") - _, err = DecodeConfig(map[string]interface{}{ + _, err = DecodeConfig(map[string]any{ "quality": 123, }) c.Assert(err, qt.Not(qt.IsNil)) - _, err = DecodeConfig(map[string]interface{}{ + _, err = DecodeConfig(map[string]any{ "resampleFilter": "asdf", }) c.Assert(err, qt.Not(qt.IsNil)) - _, err = DecodeConfig(map[string]interface{}{ + _, err = DecodeConfig(map[string]any{ "anchor": "asdf", }) c.Assert(err, qt.Not(qt.IsNil)) - imagingConfig, err = DecodeConfig(map[string]interface{}{ + imagingConfig, err = DecodeConfig(map[string]any{ "anchor": "Smart", }) imaging = imagingConfig.Cfg c.Assert(err, qt.IsNil) c.Assert(imaging.Anchor, qt.Equals, "smart") - imagingConfig, err = DecodeConfig(map[string]interface{}{ - "exif": map[string]interface{}{ + imagingConfig, err = DecodeConfig(map[string]any{ + "exif": map[string]any{ "disableLatLong": true, }, }) @@ -81,7 +81,7 @@ func TestDecodeConfig(t *testing.T) { func TestDecodeImageConfig(t *testing.T) { for i, this := range []struct { in string - expect interface{} + expect any }{ {"300x400", newImageConfig(300, 400, 75, 0, "box", "smart", "")}, {"300x400 #fff", newImageConfig(300, 400, 75, 0, "box", "smart", "fff")}, diff --git a/resources/images/exif/exif.go b/resources/images/exif/exif.go index 5406665cf..2841bd153 100644 --- a/resources/images/exif/exif.go +++ b/resources/images/exif/exif.go @@ -134,7 +134,7 @@ func (d *Decoder) Decode(r io.Reader) (ex *Exif, err error) { lat, long, _ = x.LatLong() } - walker := &exifWalker{x: x, vals: make(map[string]interface{}), includeMatcher: d.includeFieldsRe, excludeMatcher: d.excludeFieldsrRe} + walker := &exifWalker{x: x, vals: make(map[string]any), includeMatcher: d.includeFieldsRe, excludeMatcher: d.excludeFieldsrRe} if err = x.Walk(walker); err != nil { return } @@ -144,7 +144,7 @@ func (d *Decoder) Decode(r io.Reader) (ex *Exif, err error) { return } -func decodeTag(x *_exif.Exif, f _exif.FieldName, t *tiff.Tag) (interface{}, error) { +func decodeTag(x *_exif.Exif, f _exif.FieldName, t *tiff.Tag) (any, error) { switch t.Format() { case tiff.StringVal, tiff.UndefVal: s := nullString(t.Val) @@ -158,7 +158,7 @@ func decodeTag(x *_exif.Exif, f _exif.FieldName, t *tiff.Tag) (interface{}, erro return "unknown", nil } - var rv []interface{} + var rv []any for i := 0; i < int(t.Count); i++ { switch t.Format() { @@ -203,7 +203,7 @@ func tryParseDate(x *_exif.Exif, s string) (time.Time, error) { type exifWalker struct { x *_exif.Exif - vals map[string]interface{} + vals map[string]any includeMatcher *regexp.Regexp excludeMatcher *regexp.Regexp } @@ -246,10 +246,10 @@ func init() { } } -type Tags map[string]interface{} +type Tags map[string]any func (v *Tags) UnmarshalJSON(b []byte) error { - vv := make(map[string]interface{}) + vv := make(map[string]any) if err := tcodec.Unmarshal(b, &vv); err != nil { return err } diff --git a/resources/images/filters.go b/resources/images/filters.go index fd7e31457..90667af7c 100644 --- a/resources/images/filters.go +++ b/resources/images/filters.go @@ -32,7 +32,7 @@ type Filters struct { } // Overlay creates a filter that overlays src at position x y. -func (*Filters) Overlay(src ImageSource, x, y interface{}) gift.Filter { +func (*Filters) Overlay(src ImageSource, x, y any) gift.Filter { return filter{ Options: newFilterOpts(src.Key(), x, y), Filter: overlayFilter{src: src, x: cast.ToInt(x), y: cast.ToInt(y)}, @@ -40,7 +40,7 @@ func (*Filters) Overlay(src ImageSource, x, y interface{}) gift.Filter { } // Text creates a filter that draws text with the given options. -func (*Filters) Text(text string, options ...interface{}) gift.Filter { +func (*Filters) Text(text string, options ...any) gift.Filter { tf := textFilter{ text: text, color: "#ffffff", @@ -95,7 +95,7 @@ func (*Filters) Text(text string, options ...interface{}) gift.Filter { // Brightness creates a filter that changes the brightness of an image. // The percentage parameter must be in range (-100, 100). -func (*Filters) Brightness(percentage interface{}) gift.Filter { +func (*Filters) Brightness(percentage any) gift.Filter { return filter{ Options: newFilterOpts(percentage), Filter: gift.Brightness(cast.ToFloat32(percentage)), @@ -104,7 +104,7 @@ func (*Filters) Brightness(percentage interface{}) gift.Filter { // ColorBalance creates a filter that changes the color balance of an image. // The percentage parameters for each color channel (red, green, blue) must be in range (-100, 500). -func (*Filters) ColorBalance(percentageRed, percentageGreen, percentageBlue interface{}) gift.Filter { +func (*Filters) ColorBalance(percentageRed, percentageGreen, percentageBlue any) gift.Filter { return filter{ Options: newFilterOpts(percentageRed, percentageGreen, percentageBlue), Filter: gift.ColorBalance(cast.ToFloat32(percentageRed), cast.ToFloat32(percentageGreen), cast.ToFloat32(percentageBlue)), @@ -115,7 +115,7 @@ func (*Filters) ColorBalance(percentageRed, percentageGreen, percentageBlue inte // The hue parameter is the angle on the color wheel, typically in range (0, 360). // The saturation parameter must be in range (0, 100). // The percentage parameter specifies the strength of the effect, it must be in range (0, 100). -func (*Filters) Colorize(hue, saturation, percentage interface{}) gift.Filter { +func (*Filters) Colorize(hue, saturation, percentage any) gift.Filter { return filter{ Options: newFilterOpts(hue, saturation, percentage), Filter: gift.Colorize(cast.ToFloat32(hue), cast.ToFloat32(saturation), cast.ToFloat32(percentage)), @@ -124,7 +124,7 @@ func (*Filters) Colorize(hue, saturation, percentage interface{}) gift.Filter { // Contrast creates a filter that changes |