Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-06 16:34:02 +01:00
Code Issues Projects Releases Wiki Activity

Fix reading task defaults (#4931)

Browse source
This commit is contained in:
WithoutPants 2024-06-05 16:04:14 +10:00 committed by GitHub
parent b232e58b06
commit 0a07194110
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
internal/manager/config/config.go
View file

@ -286,10 +286,6 @@ var (
defaultMenuItems = []string{"scenes", "images", "movies", "markers", "galleries", "performers", "studios", "tags"} defaultMenuItems = []string{"scenes", "images", "movies", "markers", "galleries", "performers", "studios", "tags"}
) )
var jsonUnmarshalConf = koanf.UnmarshalConf{
Tag: "json",
}
type MissingConfigError struct { type MissingConfigError struct {
missingFields []string missingFields []string
} }
@ -1452,7 +1448,8 @@ func (i *Config) GetDefaultIdentifySettings() *identify.Options {
if v.Exists(DefaultIdentifySettings) && v.Get(DefaultIdentifySettings) != nil { if v.Exists(DefaultIdentifySettings) && v.Get(DefaultIdentifySettings) != nil {
var ret identify.Options var ret identify.Options
if err := v.UnmarshalWithConf(DefaultIdentifySettings, &ret, jsonUnmarshalConf); err != nil {
if err := v.Unmarshal(DefaultIdentifySettings, &ret); err != nil {
return nil return nil
} }
return &ret return &ret
@ -1471,7 +1468,7 @@ func (i *Config) GetDefaultScanSettings() *ScanMetadataOptions {
if v.Exists(DefaultScanSettings) && v.Get(DefaultScanSettings) != nil { if v.Exists(DefaultScanSettings) && v.Get(DefaultScanSettings) != nil {
var ret ScanMetadataOptions var ret ScanMetadataOptions
if err := v.UnmarshalWithConf(DefaultScanSettings, &ret, jsonUnmarshalConf); err != nil { if err := v.Unmarshal(DefaultScanSettings, &ret); err != nil {
return nil return nil
} }
return &ret return &ret