wood/webp_server_go
1
0
Fork 0
mirror of https://github.com/woodchen-ink/webp_server_go.git synced 2025-07-18 13:42:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Go 1.22 (#311)

Browse Source
This commit is contained in:
Nova Kwok 2024-02-10 17:00:40 +08:00 committed by GitHub
parent 0dc7a0f0e1
commit 12d4cc1a0b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/CI.yaml vendored
View File

@ -19,7 +19,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: '1.21' go-version: '1.22'
- name: Setup necessary packages - name: Setup necessary packages
run: | run: |

2
.github/workflows/codecov.yaml vendored
View File

@ -19,7 +19,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: '1.21' go-version: '1.22'
- name: Setup necessary packages - name: Setup necessary packages
run: | run: |

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM golang:1.21-bookworm as builder FROM golang:1.22-bookworm as builder
ARG IMG_PATH=/opt/pics ARG IMG_PATH=/opt/pics
ARG EXHAUST_PATH=/opt/exhaust ARG EXHAUST_PATH=/opt/exhaust

2
encoder/encoder.go
View File

@ -187,7 +187,7 @@ func webpEncoder(img *vips.ImageRef, rawPath string, optimizedPath string, extra
Lossless: false, Lossless: false,
StripMetadata: true, StripMetadata: true,
} }
for i := 0; i <= 6; i++ { for i := range 7 {
ep.ReductionEffort = i ep.ReductionEffort = i
buf, _, err = img.ExportWebp(&ep) buf, _, err = img.ExportWebp(&ep)
if err != nil && strings.Contains(err.Error(), "unable to encode") { if err != nil && strings.Contains(err.Error(), "unable to encode") {

2
encoder/prefetch.go
View File

@ -18,7 +18,7 @@ func PrefetchImages() {
var sTime = time.Now() var sTime = time.Now()
log.Infof("Prefetching using %d cores", config.Jobs) log.Infof("Prefetching using %d cores", config.Jobs)
var finishChan = make(chan int, config.Jobs) var finishChan = make(chan int, config.Jobs)
for i := 0; i < config.Jobs; i++ { for _ = range config.Jobs {
finishChan <- 1 finishChan <- 1
} }

2
go.mod
View File

@ -1,6 +1,6 @@
module webp_server_go module webp_server_go
go 1.21 go 1.22
require ( require (
github.com/cespare/xxhash v1.1.0 github.com/cespare/xxhash v1.1.0

42
handler/router_test.go
View File

@ -100,7 +100,7 @@ func TestConvertDuplicates(t *testing.T) {
// test Chrome // test Chrome
for url, respType := range testLink { for url, respType := range testLink {
for i := 0; i < N; i++ { for _ = range N {
resp, data := requestToServer(url, app, chromeUA, acceptWebP) resp, data := requestToServer(url, app, chromeUA, acceptWebP)
defer resp.Body.Close() defer resp.Body.Close()
contentType := helper.GetContentType(data) contentType := helper.GetContentType(data)
@ -220,12 +220,12 @@ func TestConvertProxyModeBad(t *testing.T) {
func TestConvertProxyModeWork(t *testing.T) { func TestConvertProxyModeWork(t *testing.T) {
setupParam() setupParam()
config.ProxyMode = true config.ProxyMode = true
config.Config.ImgPath = "https://webp.sh" config.Config.ImgPath = "https://docs.webp.sh"
var app = fiber.New() var app = fiber.New()
app.Get("/*", Convert) app.Get("/*", Convert)
url := "http://127.0.0.1:3333/images/cover.jpg" url := "http://127.0.0.1:3333/images/webp_server.jpg"
resp, data := requestToServer(url, app, chromeUA, acceptWebP) resp, data := requestToServer(url, app, chromeUA, acceptWebP)
defer resp.Body.Close() defer resp.Body.Close()
@ -244,28 +244,28 @@ func TestConvertProxyImgMap(t *testing.T) {
config.ProxyMode = false config.ProxyMode = false
config.Config.ImageMap = map[string]string{ config.Config.ImageMap = map[string]string{
"/2": "../pics/dir1", "/2": "../pics/dir1",
"/3": "../pics3", // Invalid path, does not exists "/3": "../pics3", // Invalid path, does not exists
"www.invalid-path.com": "https://webp.sh", // Invalid, it does not start with '/' "www.invalid-path.com": "https://docs.webp.sh", // Invalid, it does not start with '/'
"/www.weird-path.com": "https://webp.sh", "/www.weird-path.com": "https://docs.webp.sh",
"/www.even-more-werid-path.com": "https://webp.sh/images", "/www.even-more-werid-path.com": "https://docs.webp.sh/images",
"http://example.com": "https://webp.sh", "http://example.com": "https://docs.webp.sh",
} }
var app = fiber.New() var app = fiber.New()
app.Get("/*", Convert) app.Get("/*", Convert)
var testUrls = map[string]string{ var testUrls = map[string]string{
"http://127.0.0.1:3333/webp_server.jpg": "image/webp", "http://127.0.0.1:3333/webp_server.jpg": "image/webp",
"http://127.0.0.1:3333/2/inside.jpg": "image/webp", "http://127.0.0.1:3333/2/inside.jpg": "image/webp",
"http://127.0.0.1:3333/www.weird-path.com/images/cover.jpg": "image/webp", "http://127.0.0.1:3333/www.weird-path.com/images/webp_server.jpg": "image/webp",
"http://127.0.0.1:3333/www.even-more-werid-path.com/cover.jpg": "image/webp", "http://127.0.0.1:3333/www.even-more-werid-path.com/webp_server.jpg": "image/webp",
"http://example.com/images/cover.jpg": "image/webp", "http://example.com//images/webp_server.jpg": "image/webp",
} }
var testUrlsLegacy = map[string]string{ var testUrlsLegacy = map[string]string{
"http://127.0.0.1:3333/webp_server.jpg": "image/jpeg", "http://127.0.0.1:3333/webp_server.jpg": "image/jpeg",
"http://127.0.0.1:3333/2/inside.jpg": "image/jpeg", "http://127.0.0.1:3333/2/inside.jpg": "image/jpeg",
"http://example.com/images/cover.jpg": "image/jpeg", "http://example.com/images/webp_server.jpg": "image/jpeg",
} }
var testUrlsInvalid = map[string]string{ var testUrlsInvalid = map[string]string{
@ -304,17 +304,17 @@ func TestConvertProxyImgMapCWD(t *testing.T) {
"/1": "../pics/dir1", "/1": "../pics/dir1",
"/2": "../pics", "/2": "../pics",
"/3": "../pics", // Invalid path, does not exists "/3": "../pics", // Invalid path, does not exists
"http://www.example.com": "https://webp.sh", "http://www.example.com": "https://docs.webp.sh",
} }
var app = fiber.New() var app = fiber.New()
app.Get("/*", Convert) app.Get("/*", Convert)
var testUrls = map[string]string{ var testUrls = map[string]string{
"http://127.0.0.1:3333/1/inside.jpg": "image/webp", "http://127.0.0.1:3333/1/inside.jpg": "image/webp",
"http://127.0.0.1:3333/2/webp_server.jpg": "image/webp", "http://127.0.0.1:3333/2/webp_server.jpg": "image/webp",
"http://127.0.0.1:3333/3/webp_server.jpg": "image/webp", "http://127.0.0.1:3333/3/webp_server.jpg": "image/webp",
"http://www.example.com/images/cover.jpg": "image/webp", "http://www.example.com/images/webp_server.jpg": "image/webp",
} }
for url, respType := range testUrls { for url, respType := range testUrls {