diff --git a/Dockerfile b/Dockerfile index 64dcd84..23c26d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM golang:1.18-alpine3.15 as buildbase WORKDIR /app -RUN apk add --no-cache git gcc musl-dev vips-dev +RUN apk add --no-cache git gcc musl-dev RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main sqlite-dev ENV GOFLAGS="-tags=linux,libsqlite3,sqlite_fts5" ADD *.go go.mod go.sum /app/ @@ -30,7 +30,7 @@ EXPOSE 443 EXPOSE 8080 CMD ["GoBlog"] HEALTHCHECK --interval=1m --timeout=10s CMD GoBlog healthcheck -RUN apk add --no-cache tzdata tor vips-dev +RUN apk add --no-cache tzdata tor RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main sqlite-dev COPY templates/ /app/templates/ COPY --from=build /app/GoBlog /bin/ diff --git a/docs/build.md b/docs/build.md index 2f9ad50..ba98b61 100644 --- a/docs/build.md +++ b/docs/build.md @@ -32,7 +32,6 @@ Requirements: - git - go >= 1.17 - libsqlite3 with FTS5 enabled >= 3.31 (the newer the better) -- libvips >= 8.10 (the newer the better) Build command: diff --git a/docs/usage.md b/docs/usage.md index 51890ce..ba0722e 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -27,7 +27,7 @@ It is possible to configure multiple compression providers. If one fails, the ne 1. Tinify 2. Cloudflare -3. Local compression using VIPS +3. Local compression ## Text-to-Speech diff --git a/go.mod b/go.mod index b2e56c0..c78294c 100644 --- a/go.mod +++ b/go.mod @@ -13,9 +13,9 @@ require ( github.com/c2h5oh/datasize v0.0.0-20200825124411-48ed595a09d2 github.com/carlmjohnson/requests v0.22.1 github.com/cretz/bine v0.2.0 - github.com/davidbyttow/govips/v2 v2.11.0 github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f github.com/dgraph-io/ristretto v0.1.0 + github.com/disintegration/imaging v1.6.2 github.com/dmulholl/mp3lib v1.0.0 github.com/elnormous/contenttype v1.0.2 github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac @@ -139,6 +139,7 @@ require ( golang.zx2c4.com/wireguard/windows v0.4.10 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gvisor.dev/gvisor v0.0.0-20220126021142-d8aa030b2591 // indirect diff --git a/go.sum b/go.sum index 395173f..c9af3bc 100644 --- a/go.sum +++ b/go.sum @@ -94,14 +94,14 @@ github.com/cretz/bine v0.2.0/go.mod h1:WU4o9QR9wWp8AVKtTM1XD5vUHkEqnf2vVSo6dBqbe github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davidbyttow/govips/v2 v2.11.0 h1:eJY+Sgt2LRVh6TFSNMnl5rrFkDfuToG5uE5aLSV1jvM= -github.com/davidbyttow/govips/v2 v2.11.0/go.mod h1:goq38QD8XEMz2aWEeucEZqRxAWsemIN40vbUqfPfTAw= github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f h1:q/DpyjJjZs94bziQ7YkBmIlpqbVP7yw179rnzoNVX1M= github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f/go.mod h1:QGrK8vMWWHQYQ3QU9bw9Y9OPNfxccGzfb41qjvVeXtY= github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI= github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= +github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE= github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E= github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= @@ -372,7 +372,6 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/paulmach/go.geojson v1.4.0 h1:5x5moCkCtDo5x8af62P9IOAYGQcYHtxz2QJ3x1DoCgY= github.com/paulmach/go.geojson v1.4.0/go.mod h1:YaKx1hKpWF+T2oj2lFJPsW/t1Q5e1jQI61eoQSTwpIs= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= @@ -505,7 +504,7 @@ golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl4 golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20220321031419-a8550c1d254a h1:LnH9RNcpPv5Kzi15lXg42lYMPUf0x8CuPv1YnvBWZAg= golang.org/x/image v0.0.0-20220321031419-a8550c1d254a/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -562,7 +561,6 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -668,7 +666,6 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= diff --git a/mediaCompression.go b/mediaCompression.go index 8432e5a..ee4381b 100644 --- a/mediaCompression.go +++ b/mediaCompression.go @@ -1,18 +1,17 @@ package main import ( - "bytes" "context" "crypto/sha256" "errors" "fmt" + "image/png" "io" "log" - "math" "net/http" "github.com/carlmjohnson/requests" - "github.com/davidbyttow/govips/v2/vips" + "github.com/disintegration/imaging" "go.goblog.app/app/pkgs/bufferpool" ) @@ -145,27 +144,6 @@ func (*localMediaCompressor) compress(url string, upload mediaStorageSaveFunc, h if !allowed { return "", nil } - // Start Vips - vips.Startup(&vips.Config{ - CollectStats: false, - MaxCacheFiles: 0, - MaxCacheMem: 0, - MaxCacheSize: 0, - ConcurrencyLevel: 1, - }) - // Check type - var imgType vips.ImageType - switch fileExtension { - case "jpg", "jpeg": - imgType = vips.ImageTypeJPEG - case "png": - imgType = vips.ImageTypePNG - default: - imgType = vips.ImageTypeUnknown - } - if !vips.IsTypeSupported(imgType) { - return "", nil - } // Download image imgBuffer := bufferpool.Get() defer bufferpool.Put(imgBuffer) @@ -178,47 +156,29 @@ func (*localMediaCompressor) compress(url string, upload mediaStorageSaveFunc, h log.Println("Local compressor error:", err.Error()) return "", errors.New("failed to download image using local compressor") } - // Compress image using bimg - img, err := vips.NewImageFromReader(imgBuffer) + // Decode image + img, err := imaging.Decode(imgBuffer, imaging.AutoOrientation(true)) if err != nil { log.Println("Local compressor error:", err.Error()) return "", errors.New("failed to compress image using local compressor") } - // Auto rotate image - err = img.AutoRotate() - if err != nil { - log.Println("Local compressor error:", err.Error()) - return "", errors.New("failed to compress image using local compressor") + // Resize image + resizedImage := imaging.Fit(img, defaultCompressionWidth, defaultCompressionHeight, imaging.Lanczos) + // Encode image + resizedBuffer := bufferpool.Get() + defer bufferpool.Put(resizedBuffer) + switch fileExtension { + case "jpg", "jpeg": + err = imaging.Encode(resizedBuffer, resizedImage, imaging.JPEG, imaging.JPEGQuality(75)) + case "png": + err = imaging.Encode(resizedBuffer, resizedImage, imaging.PNG, imaging.PNGCompressionLevel(png.BestCompression)) } - // Get resize ratio to fit in max width and height - ratioHeight := float64(defaultCompressionHeight) / float64(img.Height()) - ratioWidth := float64(defaultCompressionWidth) / float64(img.Width()) - ratio := math.Min(ratioHeight, ratioWidth) - // Resize image (only downscale) - if ratio < 1 { - err = img.Resize(ratio, vips.KernelAuto) - if err != nil { - log.Println("Local compressor error:", err.Error()) - return "", errors.New("failed to compress image using local compressor") - } - } - // Export resized image - ep := vips.NewDefaultExportParams() - ep.StripMetadata = true // Strip metadata - ep.Interlaced = true // Progressive image - ep.TrellisQuant = true // Trellis quantization (JPEG only) - ep.OptimizeCoding = true // Optimize Huffman coding tables (JPEG only) - ep.OptimizeScans = true // Optimize progressive scans (JPEG only) - ep.OvershootDeringing = true // Overshoot deringing (JPEG only) - ep.Compression = 100 // Compression factor - ep.Quality = 75 // Quality factor - compressed, _, err := img.Export(ep) if err != nil { log.Println("Local compressor error:", err.Error()) return "", errors.New("failed to compress image using local compressor") } // Upload compressed file - return uploadCompressedFile(fileExtension, bytes.NewReader(compressed), upload) + return uploadCompressedFile(fileExtension, resizedBuffer, upload) } func uploadCompressedFile(fileExtension string, r io.Reader, upload mediaStorageSaveFunc) (string, error) {