From 60479a869418c7daaae5566987cd12ab76b829df Mon Sep 17 00:00:00 2001 From: Niko Storni Date: Thu, 16 Jul 2020 04:44:53 +0200 Subject: [PATCH] compression changes --- compression/compression.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/compression/compression.go b/compression/compression.go index 7214e05..fae5711 100644 --- a/compression/compression.go +++ b/compression/compression.go @@ -3,7 +3,6 @@ package compression import ( "io/ioutil" "mime" - "os" "path/filepath" "github.com/lbryio/lbry.go/v2/extras/errors" @@ -30,8 +29,12 @@ func Compress(path, fileName, mimeType, storePath string) (string, string, error case "image/gif": converter := giftowebp.NewConverter() converter.LoopCompatibility = false - converter.WebPConfig.SetTargetSize(500 * 1024) - converter.WebPConfig.SetMethod(2) + if len(file) > 500*1024 { + converter.WebPConfig.SetTargetSize(500 * 1024) + } else { + converter.WebPConfig.SetTargetSize(len(file)) + } + converter.WebPConfig.SetMethod(4) webpBin, err := converter.Convert(file) if err != nil { return "", "", errors.Err(err) @@ -41,8 +44,8 @@ func Compress(path, fileName, mimeType, storePath string) (string, string, error if err != nil { return "", "", errors.Err(err) } - err = os.Remove(path) - return fileName + ".webp", mime.TypeByExtension(".webp"), errors.Err(err) + //err = os.Remove(path) + return fileName + ".webp", mime.TypeByExtension(".webp"), nil case mime.TypeByExtension("png"): case mime.TypeByExtension("jpeg"): case mime.TypeByExtension("jpg"):