Commit 45dac8aa by Li Feifei

close transformation webp

parent 267afe1a
Pipeline #15304 passed with stages
in 41 seconds
...@@ -8,7 +8,6 @@ import ( ...@@ -8,7 +8,6 @@ import (
"fmt" "fmt"
"github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/aliyun/aliyun-oss-go-sdk/oss"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/chai2010/webp"
"github.com/rocketlaunchr/go-pool" "github.com/rocketlaunchr/go-pool"
"github.com/xxjwxc/gowp/workpool" "github.com/xxjwxc/gowp/workpool"
"image" "image"
...@@ -461,11 +460,11 @@ func pdfThumbnail(objectPath string, file *zip.File, bucket *oss.Bucket) ([]inte ...@@ -461,11 +460,11 @@ func pdfThumbnail(objectPath string, file *zip.File, bucket *oss.Bucket) ([]inte
} }
defer fc.Close() defer fc.Close()
item := syncPool.Borrow() //item := syncPool.Borrow()
defer item.Return() //defer item.Return()
item.MarkAsInvalid() //item.MarkAsInvalid()
//
buf := item.Item.(*bytes.Buffer) //buf := item.Item.(*bytes.Buffer)
var img image.Image var img image.Image
fileSuffix := path.Ext(file.Name) //获取文件后缀 fileSuffix := path.Ext(file.Name) //获取文件后缀
...@@ -479,17 +478,17 @@ func pdfThumbnail(objectPath string, file *zip.File, bucket *oss.Bucket) ([]inte ...@@ -479,17 +478,17 @@ func pdfThumbnail(objectPath string, file *zip.File, bucket *oss.Bucket) ([]inte
return nil, errors.New("image ext is not found") return nil, errors.New("image ext is not found")
} }
if err = webp.Encode(buf, img, &webp.Options{Lossless: true}); err != nil { //if err = webp.Encode(buf, img, &webp.Options{Lossless: true}); err != nil {
return nil, err // return nil, err
} //}
r := bytes.NewReader(buf.Bytes()) //r := bytes.NewReader(buf.Bytes())
objectPathName := objectPath + "images/" objectPathName := objectPath + "images/"
var filenameOnly string var filenameOnly string
filenameOnly = strings.TrimRight(file.Name, fileSuffix) filenameOnly = strings.TrimRight(file.Name, fileSuffix)
filenameOnly = strings.Replace(filenameOnly, "p", "", -1) filenameOnly = strings.Replace(filenameOnly, "p", "", -1)
fileName := fmt.Sprintf("%05s", filenameOnly) + ".webp" fileName := fmt.Sprintf("%05s", filenameOnly) + fileSuffix
info := img.Bounds() info := img.Bounds()
var imageInfo []interface{} var imageInfo []interface{}
...@@ -497,7 +496,7 @@ func pdfThumbnail(objectPath string, file *zip.File, bucket *oss.Bucket) ([]inte ...@@ -497,7 +496,7 @@ func pdfThumbnail(objectPath string, file *zip.File, bucket *oss.Bucket) ([]inte
imageInfo = append(imageInfo, info.Max.X) imageInfo = append(imageInfo, info.Max.X)
imageInfo = append(imageInfo, info.Max.Y) imageInfo = append(imageInfo, info.Max.Y)
return imageInfo, bucket.PutObject(objectPathName+fileName, r) return imageInfo, bucket.PutObject(objectPathName+fileName, fc)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment