Refactor: move thumbnail config from ini file to database

pkg/conf/conf.go

@@ -45,21 +45,6 @@ type slave struct {
 	SignatureTTL    int    `validate:"omitempty,gte=1"`
 }
 
-// captcha 验证码配置
-type captcha struct {
-	Height             int `validate:"gte=0"`
-	Width              int `validate:"gte=0"`
-	Mode               int `validate:"gte=0,lte=3"`
-	ComplexOfNoiseText int `validate:"gte=0,lte=2"`
-	ComplexOfNoiseDot  int `validate:"gte=0,lte=2"`
-	IsShowHollowLine   bool
-	IsShowNoiseDot     bool
-	IsShowNoiseText    bool
-	IsShowSlimeLine    bool
-	IsShowSineLine     bool
-	CaptchaLen         int `validate:"gt=0"`
-}
-
 // redis 配置
 type redis struct {
 	Network  string
@@ -68,17 +53,6 @@ type redis struct {
 	DB       string
 }
 
-// 缩略图 配置
-type thumb struct {
-	MaxWidth      uint
-	MaxHeight     uint
-	FileSuffix    string `validate:"min=1"`
-	MaxTaskCount  int
-	EncodeMethod  string `validate:"eq=jpg|eq=png"`
-	EncodeQuality int    `validate:"gte=1,lte=100"`
-	GCAfterGen    bool
-}
-
 // 跨域配置
 type cors struct {
 	AllowOrigins     []string
@@ -132,7 +106,6 @@ func Init(path string) {
 		"SSL":        SSLConfig,
 		"UnixSocket": UnixConfig,
 		"Redis":      RedisConfig,
-		"Thumbnail":  ThumbConfig,
 		"CORS":       CORSConfig,
 		"Slave":      SlaveConfig,
 	}

pkg/conf/defaults.go

@@ -32,17 +32,6 @@ var CORSConfig = &cors{
 	ExposeHeaders:    nil,
 }
 
-// ThumbConfig 缩略图配置
-var ThumbConfig = &thumb{
-	MaxWidth:      400,
-	MaxHeight:     300,
-	FileSuffix:    "._thumb",
-	MaxTaskCount:  -1,
-	EncodeMethod:  "jpg",
-	GCAfterGen:    false,
-	EncodeQuality: 85,
-}
-
 // SlaveConfig 从机配置
 var SlaveConfig = &slave{
 	CallbackTimeout: 20,

pkg/filesystem/driver/local/handler.go

@@ -12,7 +12,6 @@ import (
 	model "github.com/cloudreve/Cloudreve/v3/models"
 	"github.com/cloudreve/Cloudreve/v3/pkg/auth"
 	"github.com/cloudreve/Cloudreve/v3/pkg/cache"
-	"github.com/cloudreve/Cloudreve/v3/pkg/conf"
 	"github.com/cloudreve/Cloudreve/v3/pkg/filesystem/fsctx"
 	"github.com/cloudreve/Cloudreve/v3/pkg/filesystem/response"
 	"github.com/cloudreve/Cloudreve/v3/pkg/serializer"
@@ -188,7 +187,7 @@ func (handler Driver) Delete(ctx context.Context, files []string) ([]string, err
 		}
 
 		// 尝试删除文件的缩略图（如果有）
-		_ = os.Remove(util.RelativePath(value + conf.ThumbConfig.FileSuffix))
+		_ = os.Remove(util.RelativePath(value + model.GetSettingByNameWithDefault("thumb_file_suffix", "._thumb")))
 	}
 
 	return deleteFailed, retErr
@@ -196,7 +195,7 @@ func (handler Driver) Delete(ctx context.Context, files []string) ([]string, err
 
 // Thumb 获取文件缩略图
 func (handler Driver) Thumb(ctx context.Context, path string) (*response.ContentResponse, error) {
-	file, err := handler.Get(ctx, path+conf.ThumbConfig.FileSuffix)
+	file, err := handler.Get(ctx, path+model.GetSettingByNameWithDefault("thumb_file_suffix", "._thumb"))
 	if err != nil {
 		return nil, err
 	}

pkg/filesystem/hooks.go

@@ -5,7 +5,6 @@ import (
 	model "github.com/cloudreve/Cloudreve/v3/models"
 	"github.com/cloudreve/Cloudreve/v3/pkg/cache"
 	"github.com/cloudreve/Cloudreve/v3/pkg/cluster"
-	"github.com/cloudreve/Cloudreve/v3/pkg/conf"
 	"github.com/cloudreve/Cloudreve/v3/pkg/filesystem/driver/local"
 	"github.com/cloudreve/Cloudreve/v3/pkg/filesystem/fsctx"
 	"github.com/cloudreve/Cloudreve/v3/pkg/serializer"
@@ -245,7 +244,7 @@ func HookGenerateThumb(ctx context.Context, fs *FileSystem, fileHeader fsctx.Fil
 		fs.recycleLock.Lock()
 		go func() {
 			defer fs.recycleLock.Unlock()
-			_, _ = fs.Handler.Delete(ctx, []string{fileMode.SourceName + conf.ThumbConfig.FileSuffix})
+			_, _ = fs.Handler.Delete(ctx, []string{fileMode.SourceName + model.GetSettingByNameWithDefault("thumb_file_suffix", "._thumb")})
 			fs.GenerateThumbnail(ctx, fileMode)
 		}()
 	}

pkg/filesystem/image.go

@@ -3,7 +3,6 @@ package filesystem
 import (
 	"context"
 	"fmt"
-	"strconv"
 	"sync"
 
 	"runtime"
@@ -65,7 +64,7 @@ type Pool struct {
 // Init 初始化任务池
 func getThumbWorker() *Pool {
 	once.Do(func() {
-		maxWorker := conf.ThumbConfig.MaxTaskCount
+		maxWorker := model.GetIntSetting("thumb_max_task_count", -1)
 		if maxWorker <= 0 {
 			maxWorker = runtime.GOMAXPROCS(0)
 		}
@@ -118,9 +117,9 @@ func (fs *FileSystem) GenerateThumbnail(ctx context.Context, file *model.File) {
 	// 生成缩略图
 	image.GetThumb(fs.GenerateThumbnailSize(w, h))
 	// 保存到文件
-	err = image.Save(util.RelativePath(file.SourceName + conf.ThumbConfig.FileSuffix))
+	err = image.Save(util.RelativePath(file.SourceName + model.GetSettingByNameWithDefault("thumb_file_suffix", "._thumb")))
 	image = nil
-	if conf.ThumbConfig.GCAfterGen {
+	if model.IsTrueVal(model.GetSettingByName("thumb_gc_after_gen")) {
 		util.Log().Debug("GenerateThumbnail runtime.GC")
 		runtime.GC()
 	}
@@ -139,17 +138,11 @@ func (fs *FileSystem) GenerateThumbnail(ctx context.Context, file *model.File) {
 
 	// 失败时删除缩略图文件
 	if err != nil {
-		_, _ = fs.Handler.Delete(newCtx, []string{file.SourceName + conf.ThumbConfig.FileSuffix})
+		_, _ = fs.Handler.Delete(newCtx, []string{file.SourceName + model.GetSettingByNameWithDefault("thumb_file_suffix", "._thumb")})
 	}
 }
 
 // GenerateThumbnailSize 获取要生成的缩略图的尺寸
 func (fs *FileSystem) GenerateThumbnailSize(w, h int) (uint, uint) {
-	if conf.SystemConfig.Mode == "master" {
-		options := model.GetSettingByNames("thumb_width", "thumb_height")
-		w, _ := strconv.ParseUint(options["thumb_width"], 10, 32)
-		h, _ := strconv.ParseUint(options["thumb_height"], 10, 32)
-		return uint(w), uint(h)
-	}
-	return conf.ThumbConfig.MaxWidth, conf.ThumbConfig.MaxHeight
+	return uint(model.GetIntSetting("thumb_width", 400)), uint(model.GetIntSetting("thumb_width", 300))
 }

pkg/thumb/image.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 
 	model "github.com/cloudreve/Cloudreve/v3/models"
-	"github.com/cloudreve/Cloudreve/v3/pkg/conf"
 	"github.com/cloudreve/Cloudreve/v3/pkg/util"
 
 	//"github.com/nfnt/resize"
@@ -78,11 +77,11 @@ func (image *Thumb) Save(path string) (err error) {
 		return err
 	}
 	defer out.Close()
-	switch conf.ThumbConfig.EncodeMethod {
+	switch model.GetSettingByNameWithDefault("thumb_encode_method", "jpg") {
 	case "png":
 		err = png.Encode(out, image.src)
 	default:
-		err = jpeg.Encode(out, image.src, &jpeg.Options{Quality: conf.ThumbConfig.EncodeQuality})
+		err = jpeg.Encode(out, image.src, &jpeg.Options{Quality: model.GetIntSetting("thumb_encode_quality", 85)})
 	}
 
 	return err