github
/
Cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Fork 0
Code Issues Releases Wiki Activity

fix code formatting

pull/2854/head
Aaron Liu 2025-09-23 11:22:08 +08:00
parent ef86b6b79a
commit 37f3c4e0b3
2 changed files with 62 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
routers/router.go
View File

@ -620,7 +620,6 @@ func initMasterRouter(dep dependency.Dep) *gin.Engine {
controllers.FromQuery[explorer.FileThumbService](explorer.FileThumbParameterCtx{}), controllers.FromQuery[explorer.FileThumbService](explorer.FileThumbParameterCtx{}),
controllers.Thumb, controllers.Thumb,
) )
// reset thumb removed; use metadata patch to re-enable thumbnails
// Delete files // Delete files
file.DELETE("", file.DELETE("",
controllers.FromJSON[explorer.DeleteFileService](explorer.DeleteFileParameterCtx{}), controllers.FromJSON[explorer.DeleteFileService](explorer.DeleteFileParameterCtx{}),

124
service/basic/site.go
View File

@ -1,17 +1,17 @@
package basic package basic
import ( import (
"sort" "sort"
"strings" "strings"
"github.com/cloudreve/Cloudreve/v4/application/dependency" "github.com/cloudreve/Cloudreve/v4/application/dependency"
"github.com/cloudreve/Cloudreve/v4/inventory" "github.com/cloudreve/Cloudreve/v4/inventory"
"github.com/cloudreve/Cloudreve/v4/inventory/types" "github.com/cloudreve/Cloudreve/v4/inventory/types"
"github.com/cloudreve/Cloudreve/v4/pkg/setting" "github.com/cloudreve/Cloudreve/v4/pkg/setting"
"github.com/cloudreve/Cloudreve/v4/pkg/thumb" "github.com/cloudreve/Cloudreve/v4/pkg/thumb"
"github.com/cloudreve/Cloudreve/v4/service/user" "github.com/cloudreve/Cloudreve/v4/service/user"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/mojocn/base64Captcha" "github.com/mojocn/base64Captcha"
) )
// SiteConfig 站点全局设置序列 // SiteConfig 站点全局设置序列
@ -51,10 +51,10 @@ type SiteConfig struct {
MaxBatchSize int `json:"max_batch_size,omitempty"` MaxBatchSize int `json:"max_batch_size,omitempty"`
ThumbnailWidth int `json:"thumbnail_width,omitempty"` ThumbnailWidth int `json:"thumbnail_width,omitempty"`
ThumbnailHeight int `json:"thumbnail_height,omitempty"` ThumbnailHeight int `json:"thumbnail_height,omitempty"`
CustomProps []types.CustomProps `json:"custom_props,omitempty"` CustomProps []types.CustomProps `json:"custom_props,omitempty"`
// Thumbnail section // Thumbnail section
ThumbExts []string `json:"thumb_exts,omitempty"` ThumbExts []string `json:"thumb_exts,omitempty"`
// App settings // App settings
AppPromotion bool `json:"app_promotion,omitempty"` AppPromotion bool `json:"app_promotion,omitempty"`
@ -78,10 +78,10 @@ type (
) )
func (s *GetSettingService) GetSiteConfig(c *gin.Context) (*SiteConfig, error) { func (s *GetSettingService) GetSiteConfig(c *gin.Context) (*SiteConfig, error) {
dep := dependency.FromContext(c) dep := dependency.FromContext(c)
settings := dep.SettingProvider() settings := dep.SettingProvider()
switch s.Section { switch s.Section {
case "login": case "login":
legalDocs := settings.LegalDocuments(c) legalDocs := settings.LegalDocuments(c)
return &SiteConfig{ return &SiteConfig{
@ -122,53 +122,53 @@ func (s *GetSettingService) GetSiteConfig(c *gin.Context) (*SiteConfig, error) {
}, nil }, nil
case "app": case "app":
appSetting := settings.AppSetting(c) appSetting := settings.AppSetting(c)
return &SiteConfig{ return &SiteConfig{
AppPromotion: appSetting.Promotion, AppPromotion: appSetting.Promotion,
}, nil }, nil
case "thumb": case "thumb":
// Return supported thumbnail extensions from enabled generators. // Return supported thumbnail extensions from enabled generators.
exts := map[string]bool{} exts := map[string]bool{}
if settings.BuiltinThumbGeneratorEnabled(c) { if settings.BuiltinThumbGeneratorEnabled(c) {
for _, e := range thumb.BuiltinSupportedExts { for _, e := range thumb.BuiltinSupportedExts {
exts[e] = true exts[e] = true
} }
} }
if settings.FFMpegThumbGeneratorEnabled(c) { if settings.FFMpegThumbGeneratorEnabled(c) {
for _, e := range settings.FFMpegThumbExts(c) { for _, e := range settings.FFMpegThumbExts(c) {
exts[strings.ToLower(e)] = true exts[strings.ToLower(e)] = true
} }
} }
if settings.VipsThumbGeneratorEnabled(c) { if settings.VipsThumbGeneratorEnabled(c) {
for _, e := range settings.VipsThumbExts(c) { for _, e := range settings.VipsThumbExts(c) {
exts[strings.ToLower(e)] = true exts[strings.ToLower(e)] = true
} }
} }
if settings.LibreOfficeThumbGeneratorEnabled(c) { if settings.LibreOfficeThumbGeneratorEnabled(c) {
for _, e := range settings.LibreOfficeThumbExts(c) { for _, e := range settings.LibreOfficeThumbExts(c) {
exts[strings.ToLower(e)] = true exts[strings.ToLower(e)] = true
} }
} }
if settings.MusicCoverThumbGeneratorEnabled(c) { if settings.MusicCoverThumbGeneratorEnabled(c) {
for _, e := range settings.MusicCoverThumbExts(c) { for _, e := range settings.MusicCoverThumbExts(c) {
exts[strings.ToLower(e)] = true exts[strings.ToLower(e)] = true
} }
} }
if settings.LibRawThumbGeneratorEnabled(c) { if settings.LibRawThumbGeneratorEnabled(c) {
for _, e := range settings.LibRawThumbExts(c) { for _, e := range settings.LibRawThumbExts(c) {
exts[strings.ToLower(e)] = true exts[strings.ToLower(e)] = true
} }
} }
// map -> sorted slice // map -> sorted slice
result := make([]string, 0, len(exts)) result := make([]string, 0, len(exts))
for e := range exts { for e := range exts {
result = append(result, e) result = append(result, e)
} }
sort.Strings(result) sort.Strings(result)
return &SiteConfig{ThumbExts: result}, nil return &SiteConfig{ThumbExts: result}, nil
default: default:
break break
} }
u := inventory.UserFromContext(c) u := inventory.UserFromContext(c)
siteBasic := settings.SiteBasic(c) siteBasic := settings.SiteBasic(c)