From 5e033a8f72eb4a64cb9c374364570c7839aa37cc Mon Sep 17 00:00:00 2001
From: n0vad3v <n0vad3v@riseup.net>
Date: Sun, 5 Dec 2021 22:20:39 +0800
Subject: [PATCH] Extract checkAllowedType function. Minor Log text
 optimization.

---
 encoder.go |  8 ++++----
 helper.go  | 24 +++++++++++++++++++-----
 router.go  | 22 +++++-----------------
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/encoder.go b/encoder.go
index eda8885..163f8ca 100644
--- a/encoder.go
+++ b/encoder.go
@@ -112,7 +112,7 @@ func avifEncoder(p1, p2 string, quality float32) {
 	var avifQuality = int((100 - quality) / 100 * avif.MaxQuality)
 	err = avif.Encode(dst, img, &avif.Options{Quality: avifQuality})
 	if err != nil {
-		log.Fatalf("Can't encode source image: %v", err)
+		log.Fatalf("Can't encode source image: %v to AVIF", err)
 	}
 
 	convertLog("AVIF", p1, p2, quality)
@@ -128,9 +128,9 @@ func webpEncoder(p1, p2 string, quality float32) {
 		return
 	}
 
-	if err := webp.Encode(&buf, img, &webp.Options{Lossless: false, Quality: quality}); err != nil {
-		log.Error(err)
-		return
+	err = webp.Encode(&buf, img, &webp.Options{Lossless: false, Quality: quality})
+	if err != nil {
+		log.Fatalf("Can't encode source image: %v to WebP", err)
 	}
 
 	if err := ioutil.WriteFile(p2, buf.Bytes(), 0644); err != nil {
diff --git a/helper.go b/helper.go
index 0679f0e..d9e3130 100644
--- a/helper.go
+++ b/helper.go
@@ -3,7 +3,6 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"github.com/valyala/fasthttp"
 	"hash/crc32"
 	"io"
 	"io/ioutil"
@@ -13,9 +12,12 @@ import (
 	"path/filepath"
 	"strconv"
 
+	"github.com/valyala/fasthttp"
+
+	"strings"
+
 	"github.com/h2non/filetype"
 	log "github.com/sirupsen/logrus"
-	"strings"
 )
 
 func avifMatcher(buf []byte) bool {
@@ -61,6 +63,17 @@ func imageExists(filename string) bool {
 	return !info.IsDir()
 }
 
+func checkAllowedType(imgFilename string) bool {
+	imgFilename = strings.ToLower(imgFilename)
+	for _, allowedType := range config.AllowedTypes {
+		allowedType = "." + strings.ToLower(allowedType)
+		if strings.HasSuffix(imgFilename, allowedType) {
+			return true
+		}
+	}
+	return false
+}
+
 // Check for remote filepath, e.g: https://test.webp.sh/node.png
 // return StatusCode, etagValue and length
 func getRemoteImageInfo(fileUrl string) (int, string, string) {
@@ -124,6 +137,7 @@ func genOptimizedAbs(rawImagePath string, exhaustPath string, imageName string,
 	ModifiedTime := STAT.ModTime().Unix()
 	// webpFilename: abc.jpg.png -> abc.jpg.png.1582558990.webp
 	webpFilename := fmt.Sprintf("%s.%d.webp", imageName, ModifiedTime)
+	// avifFilename: abc.jpg.png -> abc.jpg.png.1582558990.avif
 	avifFilename := fmt.Sprintf("%s.%d.avif", imageName, ModifiedTime)
 
 	// /home/webp_server/exhaust/path/to/tsuki.jpg.1582558990.webp
@@ -148,16 +162,16 @@ func genEtag(ImgAbsPath string) string {
 func getCompressionRate(RawImagePath string, optimizedImg string) string {
 	originFileInfo, err := os.Stat(RawImagePath)
 	if err != nil {
-		log.Warnf("fail to get raw image %v", err)
+		log.Warnf("Failed to get raw image %v", err)
 		return ""
 	}
 	optimizedFileInfo, err := os.Stat(optimizedImg)
 	if err != nil {
-		log.Warnf("fail to get webp image %v", err)
+		log.Warnf("Failed to get optimized image %v", err)
 		return ""
 	}
 	compressionRate := float64(optimizedFileInfo.Size()) / float64(originFileInfo.Size())
-	log.Debugf("The compress rate is %d/%d=%.2f", originFileInfo.Size(), optimizedFileInfo.Size(), compressionRate)
+	log.Debugf("The compression rate is %d/%d=%.2f", originFileInfo.Size(), optimizedFileInfo.Size(), compressionRate)
 	return fmt.Sprintf(`%.2f`, compressionRate)
 }
 
diff --git a/router.go b/router.go
index 07be70a..773a1f3 100644
--- a/router.go
+++ b/router.go
@@ -3,14 +3,14 @@ package main
 import (
 	"errors"
 	"fmt"
-	"github.com/gofiber/fiber/v2"
-	log "github.com/sirupsen/logrus"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
 	"path"
-	"strings"
+
+	"github.com/gofiber/fiber/v2"
+	log "github.com/sirupsen/logrus"
 )
 
 func convert(c *fiber.Ctx) error {
@@ -27,7 +27,7 @@ func convert(c *fiber.Ctx) error {
 
 	goodFormat := guessSupportedFormat(&c.Request().Header)
 
-	// old browser only
+	// old browser only, send the original image or fetch from remote and send.
 	if len(goodFormat) == 1 {
 		c.Set("ETag", genEtag(rawImageAbs))
 		if proxyMode {
@@ -39,19 +39,7 @@ func convert(c *fiber.Ctx) error {
 		}
 	}
 
-	var allowed = false
-	for _, ext := range config.AllowedTypes {
-		haystack := strings.ToLower(imgFilename)
-		needle := strings.ToLower("." + ext)
-		if strings.HasSuffix(haystack, needle) {
-			allowed = true
-			break
-		} else {
-			allowed = false
-		}
-	}
-
-	if !allowed {
+	if !checkAllowedType(imgFilename) {
 		msg := "File extension not allowed! " + imgFilename
 		log.Warn(msg)
 		if imageExists(rawImageAbs) {