yacloud/tunasync
1
0
Fork 0
mirror of https://github.com/tuna/tunasync.git synced 2025-04-21 04:42:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

format the code

Browse Source
This commit is contained in:
z4yx 2020-03-29 09:06:19 +08:00
parent 7a9895350b
commit 1491b6c42b
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
worker/config.go
View File

@ -185,7 +185,7 @@ func LoadConfig(cfgFile string) (*Config, error) {
for _, m := range cfg.MirrorsConf { for _, m := range cfg.MirrorsConf {
if err := recursiveMirrors(cfg, nil, m); err != nil { if err := recursiveMirrors(cfg, nil, m); err != nil {
return nil, err; return nil, err
} }
} }
@ -193,22 +193,22 @@ func LoadConfig(cfgFile string) (*Config, error) {
} }
func recursiveMirrors(cfg *Config, parent *mirrorConfig, mirror mirrorConfig) error { func recursiveMirrors(cfg *Config, parent *mirrorConfig, mirror mirrorConfig) error {
var curMir mirrorConfig; var curMir mirrorConfig
if parent != nil { if parent != nil {
curMir = *parent; curMir = *parent
} }
curMir.ChildMirrors = nil; curMir.ChildMirrors = nil
if err := mergo.Merge(&curMir, mirror, mergo.WithOverride); err != nil { if err := mergo.Merge(&curMir, mirror, mergo.WithOverride); err != nil {
return err; return err
} }
if mirror.ChildMirrors == nil { if mirror.ChildMirrors == nil {
cfg.Mirrors = append(cfg.Mirrors, curMir); cfg.Mirrors = append(cfg.Mirrors, curMir)
} else { } else {
for _, m := range mirror.ChildMirrors { for _, m := range mirror.ChildMirrors {
if err := recursiveMirrors(cfg, &curMir, m); err != nil { if err := recursiveMirrors(cfg, &curMir, m); err != nil {
return err; return err
} }
} }
} }
return nil; return nil
} }