Global refactoring

Author: DarthSim

.circleci/config.yml

@@ -98,7 +98,7 @@ jobs:
           command: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | BINARY=golangci-lint sh -s -- -b $(go env GOPATH)/bin v1.18.0
       - run:
           name: Lint imgproxy
-          command: golangci-lint run .
+          command: golangci-lint run
 
   build:
     executor: imgproxy
@@ -119,7 +119,7 @@ jobs:
             - go-modules-{{ checksum "go.sum" }}
       - run:
           name: Build imgproxy
-          command: go test -v
+          command: go test -v ./...
       - save_cache:
           key: go-modules-{{ checksum "go.sum" }}
           paths:

.golangci.yml

@@ -35,12 +35,12 @@ issues:
     # False positives on CGO generated code
     - linters: [staticcheck]
       text: "SA4000:"
-      path: vips\.go
+      path: vips/*
 
     # False positives on CGO generated code
     - linters: [gocritic]
       text: "dupSubExpr"
-      path: vips\.go
+      path: vips/*
 
     - linters: [stylecheck]
       text: "ST1005:"

bufpool.go bufpool/bufpool.go

@@ -1,10 +1,14 @@
-package main
+package bufpool
 
 import (
 	"bytes"
 	"runtime"
 	"sort"
 	"sync"
+
+	"github.com/imgproxy/imgproxy/v2/config"
+	"github.com/imgproxy/imgproxy/v2/imath"
+	"github.com/imgproxy/imgproxy/v2/metrics/prometheus"
 )
 
 type intSlice []int
@@ -13,7 +17,7 @@ func (p intSlice) Len() int           { return len(p) }
 func (p intSlice) Less(i, j int) bool { return p[i] < p[j] }
 func (p intSlice) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
 
-type bufPool struct {
+type Pool struct {
 	name        string
 	defaultSize int
 	maxSize     int
@@ -25,12 +29,12 @@ type bufPool struct {
 	mutex sync.Mutex
 }
 
-func newBufPool(name string, n int, defaultSize int) *bufPool {
-	pool := bufPool{
+func New(name string, n int, defaultSize int) *Pool {
+	pool := Pool{
 		name:        name,
 		defaultSize: defaultSize,
 		buffers:     make([]*bytes.Buffer, n),
-		calls:       make(intSlice, conf.BufferPoolCalibrationThreshold),
+		calls:       make(intSlice, config.BufferPoolCalibrationThreshold),
 	}
 
 	for i := range pool.buffers {
@@ -40,7 +44,7 @@ func newBufPool(name string, n int, defaultSize int) *bufPool {
 	return &pool
 }
 
-func (p *bufPool) calibrateAndClean() {
+func (p *Pool) calibrateAndClean() {
 	sort.Sort(p.calls)
 
 	pos := int(float64(len(p.calls)) * 0.95)
@@ -49,8 +53,8 @@ func (p *bufPool) calibrateAndClean() {
 	p.callInd = 0
 	p.maxSize = p.normalizeSize(score)
 
-	p.defaultSize = maxInt(p.defaultSize, p.calls[0])
-	p.maxSize = maxInt(p.defaultSize, p.maxSize)
+	p.defaultSize = imath.Max(p.defaultSize, p.calls[0])
+	p.maxSize = imath.Max(p.defaultSize, p.maxSize)
 
 	cleaned := false
 
@@ -65,11 +69,11 @@ func (p *bufPool) calibrateAndClean() {
 		runtime.GC()
 	}
 
-	setPrometheusBufferDefaultSize(p.name, p.defaultSize)
-	setPrometheusBufferMaxSize(p.name, p.maxSize)
+	prometheus.SetBufferDefaultSize(p.name, p.defaultSize)
+	prometheus.SetBufferMaxSize(p.name, p.maxSize)
 }
 
-func (p *bufPool) Get(size int) *bytes.Buffer {
+func (p *Pool) Get(size int) *bytes.Buffer {
 	p.mutex.Lock()
 	defer p.mutex.Unlock()
 
@@ -111,7 +115,7 @@ func (p *bufPool) Get(size int) *bytes.Buffer {
 
 	buf.Reset()
 
-	growSize := maxInt(size, p.defaultSize)
+	growSize := imath.Max(size, p.defaultSize)
 
 	if growSize > buf.Cap() {
 		buf.Grow(growSize)
@@ -120,7 +124,7 @@ func (p *bufPool) Get(size int) *bytes.Buffer {
 	return buf
 }
 
-func (p *bufPool) Put(buf *bytes.Buffer) {
+func (p *Pool) Put(buf *bytes.Buffer) {
 	p.mutex.Lock()
 	defer p.mutex.Unlock()
 
@@ -142,14 +146,14 @@ func (p *bufPool) Put(buf *bytes.Buffer) {
 			p.buffers[i] = buf
 
 			if buf.Cap() > 0 {
-				observePrometheusBufferSize(p.name, buf.Cap())
+				prometheus.ObserveBufferSize(p.name, buf.Cap())
 			}
 
 			return
 		}
 	}
 }
 
-func (p *bufPool) normalizeSize(n int) int {
+func (p *Pool) normalizeSize(n int) int {
 	return (n/bytes.MinRead + 2) * bytes.MinRead
 }

buf_reader.go bufreader/bufreader.go

@@ -1,26 +1,28 @@
-package main
+package bufreader
 
 import (
 	"bufio"
 	"bytes"
 	"io"
+
+	"github.com/imgproxy/imgproxy/v2/imath"
 )
 
-type bufReader struct {
+type Reader struct {
 	r   io.Reader
 	buf *bytes.Buffer
 	cur int
 }
 
-func newBufReader(r io.Reader, buf *bytes.Buffer) *bufReader {
-	br := bufReader{
+func New(r io.Reader, buf *bytes.Buffer) *Reader {
+	br := Reader{
 		r:   r,
 		buf: buf,
 	}
 	return &br
 }
 
-func (br *bufReader) Read(p []byte) (int, error) {
+func (br *Reader) Read(p []byte) (int, error) {
 	if err := br.fill(br.cur + len(p)); err != nil {
 		return 0, err
 	}
@@ -30,7 +32,7 @@ func (br *bufReader) Read(p []byte) (int, error) {
 	return n, nil
 }
 
-func (br *bufReader) ReadByte() (byte, error) {
+func (br *Reader) ReadByte() (byte, error) {
 	if err := br.fill(br.cur + 1); err != nil {
 		return 0, err
 	}
@@ -40,7 +42,7 @@ func (br *bufReader) ReadByte() (byte, error) {
 	return b, nil
 }
 
-func (br *bufReader) Discard(n int) (int, error) {
+func (br *Reader) Discard(n int) (int, error) {
 	if n < 0 {
 		return 0, bufio.ErrNegativeCount
 	}
@@ -52,12 +54,12 @@ func (br *bufReader) Discard(n int) (int, error) {
 		return 0, err
 	}
 
-	n = minInt(n, br.buf.Len()-br.cur)
+	n = imath.Min(n, br.buf.Len()-br.cur)
 	br.cur += n
 	return n, nil
 }
 
-func (br *bufReader) Peek(n int) ([]byte, error) {
+func (br *Reader) Peek(n int) ([]byte, error) {
 	if n < 0 {
 		return []byte{}, bufio.ErrNegativeCount
 	}
@@ -76,18 +78,18 @@ func (br *bufReader) Peek(n int) ([]byte, error) {
 	return br.buf.Bytes()[br.cur : br.cur+n], nil
 }
 
-func (br *bufReader) Flush() error {
+func (br *Reader) Flush() error {
 	_, err := br.buf.ReadFrom(br.r)
 	return err
 }
 
-func (br *bufReader) fill(need int) error {
+func (br *Reader) fill(need int) error {
 	n := need - br.buf.Len()
 	if n <= 0 {
 		return nil
 	}
 
-	n = maxInt(4096, n)
+	n = imath.Max(4096, n)
 
 	if _, err := br.buf.ReadFrom(io.LimitReader(br.r, int64(n))); err != nil {
 		return err