Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 12:54:38 +03:00
Code Issues Packages 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
1 changed files with 3 additions and 6 deletions
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"}
)
var jsonUnmarshalConf = koanf.UnmarshalConf{
Tag: "json",
}
type MissingConfigError struct {
missingFields []string
}
@@ -1452,7 +1448,8 @@ func (i *Config) GetDefaultIdentifySettings() *identify.Options {
if v.Exists(DefaultIdentifySettings) && v.Get(DefaultIdentifySettings) != nil {
var ret identify.Options
if err := v.UnmarshalWithConf(DefaultIdentifySettings, &ret, jsonUnmarshalConf); err != nil {
if err := v.Unmarshal(DefaultIdentifySettings, &ret); err != nil {
return nil
}
return &ret
@@ -1471,7 +1468,7 @@ func (i *Config) GetDefaultScanSettings() *ScanMetadataOptions {
if v.Exists(DefaultScanSettings) && v.Get(DefaultScanSettings) != nil {
var ret ScanMetadataOptions
if err := v.UnmarshalWithConf(DefaultScanSettings, &ret, jsonUnmarshalConf); err != nil {
if err := v.Unmarshal(DefaultScanSettings, &ret); err != nil {
return nil
}
return &ret