feat: add regular and thumb picture compress format config

Author: krau

config/storage.go

@@ -1,14 +1,16 @@
 package config
 
 type storageConfigs struct {
-	OriginalType string              `toml:"original_type" mapstructure:"original_type" json:"original_type" yaml:"original_type"`
-	RegularType  string              `toml:"regular_type" mapstructure:"regular_type" json:"regular_type" yaml:"regular_type"`
-	ThumbType    string              `toml:"thumb_type" mapstructure:"thumb_type" json:"thumb_type" yaml:"thumb_type"`
-	CacheDir     string              `toml:"cache_dir" mapstructure:"cache_dir" json:"cache_dir" yaml:"cache_dir"`
-	CacheTTL     uint                `toml:"cache_ttl" mapstructure:"cache_ttl" json:"cache_ttl" yaml:"cache_ttl"`
-	Webdav       StorageWebdavConfig `toml:"webdav" mapstructure:"webdav" json:"webdav" yaml:"webdav"`
-	Local        StorageLocalConfig  `toml:"local" mapstructure:"local" json:"local" yaml:"local"`
-	Alist        StorageAlistConfig  `toml:"alist" mapstructure:"alist" json:"alist" yaml:"alist"`
+	OriginalType  string              `toml:"original_type" mapstructure:"original_type" json:"original_type" yaml:"original_type"`
+	RegularType   string              `toml:"regular_type" mapstructure:"regular_type" json:"regular_type" yaml:"regular_type"`
+	RegularFormat string              `toml:"regular_format" mapstructure:"regular_format" json:"regular_format" yaml:"regular_format"`
+	ThumbType     string              `toml:"thumb_type" mapstructure:"thumb_type" json:"thumb_type" yaml:"thumb_type"`
+	ThumbFormat   string              `toml:"thumb_format" mapstructure:"thumb_format" json:"thumb_format" yaml:"thumb_format"`
+	CacheDir      string              `toml:"cache_dir" mapstructure:"cache_dir" json:"cache_dir" yaml:"cache_dir"`
+	CacheTTL      uint                `toml:"cache_ttl" mapstructure:"cache_ttl" json:"cache_ttl" yaml:"cache_ttl"`
+	Webdav        StorageWebdavConfig `toml:"webdav" mapstructure:"webdav" json:"webdav" yaml:"webdav"`
+	Local         StorageLocalConfig  `toml:"local" mapstructure:"local" json:"local" yaml:"local"`
+	Alist         StorageAlistConfig  `toml:"alist" mapstructure:"alist" json:"alist" yaml:"alist"`
 }
 
 type StorageWebdavConfig struct {

config/viper.go

@@ -79,6 +79,8 @@ func InitConfig() {
 	// viper.SetDefault("storage.local.enable", true)
 	viper.SetDefault("storage.local.path", "./manyacg")
 	viper.SetDefault("storage.alist.token_expire", 86400)
+	viper.SetDefault("storage.regular_format", "webp")
+	viper.SetDefault("storage.thumb_format", "webp")
 
 	viper.SetDefault("telegram.sleep", 3)
 	viper.SetDefault("telegram.api_url", "https://api.telegram.org")

storage/storage.go

@@ -84,7 +84,7 @@ func SaveAll(ctx context.Context, artwork *types.Artwork, picture *types.Picture
 			common.Logger.Fatalf("Unknown storage type: %s", config.Cfg.Storage.RegularType)
 			return nil, fmt.Errorf("%w: %s", errs.ErrStorageUnkown, config.Cfg.Storage.RegularType)
 		}
-		regularOutputPath := filePath[:len(filePath)-len(filepath.Ext(filePath))] + "_regular.webp"
+		regularOutputPath := fmt.Sprintf("%s_regular.%s", filePath[:len(filePath)-len(filepath.Ext(filePath))], config.Cfg.Storage.RegularFormat)
 		if err := common.CompressImageByFFmpeg(filePath, regularOutputPath, types.RegularPhotoSideLength); err != nil {
 			return nil, err
 		}
@@ -95,7 +95,7 @@ func SaveAll(ctx context.Context, artwork *types.Artwork, picture *types.Picture
 		if picture.ID == "" {
 			picture.ID = primitive.NewObjectID().Hex()
 		}
-		regularStorageFileName := picture.ID + "_regular.webp"
+		regularStorageFileName := picture.ID + "_regular." + config.Cfg.Storage.RegularFormat
 		regularStoragePath := fmt.Sprintf("/regular/%s/%s/%s", artwork.SourceType, artwork.Artist.UID, regularStorageFileName)
 
 		regularDetail, err = regularStorage.Save(ctx, regularOutputPath, regularStoragePath)
@@ -110,7 +110,8 @@ func SaveAll(ctx context.Context, artwork *types.Artwork, picture *types.Picture
 			common.Logger.Fatalf("Unknown storage type: %s", config.Cfg.Storage.ThumbType)
 			return nil, fmt.Errorf("%w: %s", errs.ErrStorageUnkown, config.Cfg.Storage.ThumbType)
 		}
-		thumbOutputPath := filePath[:len(filePath)-len(filepath.Ext(filePath))] + "_thumb.webp"
+		// thumbOutputPath := filePath[:len(filePath)-len(filepath.Ext(filePath))] + "_thumb.webp"
+		thumbOutputPath := fmt.Sprintf("%s_thumb.webp", filePath[:len(filePath)-len(filepath.Ext(filePath))])
 		if err := common.CompressImageByFFmpeg(filePath, thumbOutputPath, types.ThumbPhotoSideLength); err != nil {
 			return nil, err
 		}
@@ -122,7 +123,7 @@ func SaveAll(ctx context.Context, artwork *types.Artwork, picture *types.Picture
 		if picture.ID == "" {
 			picture.ID = primitive.NewObjectID().Hex()
 		}
-		thumbStorageFileName := picture.ID + "_thumb.webp"
+		thumbStorageFileName := picture.ID + "_thumb." + config.Cfg.Storage.ThumbFormat
 		thumbStoragePath := fmt.Sprintf("/thumb/%s/%s/%s", artwork.SourceType, artwork.Artist.UID, thumbStorageFileName)
 
 		thumbDetail, err = thumbStorage.Save(ctx, thumbOutputPath, thumbStoragePath)

types/permissions.go

@@ -5,17 +5,21 @@ type Permission string
 const (
 	PermissionPostArtwork    Permission = "post_artwork"
 	PermissionDeleteArtwork  Permission = "delete_artwork"
-	PermissionFetchArtwork   Permission = "fetch_artwork"
 	PermissionGetArtworkInfo Permission = "get_artwork_info"
-	PermissionSearchPicture  Permission = "search_picture"
 	PermissionEditArtwork    Permission = "edit_artwork"
+
+	// deprecated
+	PermissionFetchArtwork  Permission = "fetch_artwork"
+	PermissionSearchPicture Permission = "search_picture"
 )
 
 var AllPermissions = []Permission{
 	PermissionPostArtwork,
 	PermissionDeleteArtwork,
-	PermissionFetchArtwork,
 	PermissionGetArtworkInfo,
-	PermissionSearchPicture,
 	PermissionEditArtwork,
+
+	// deprecated
+	PermissionFetchArtwork,
+	PermissionSearchPicture,
 }