refactor and fix homepage override not correctly loaded

This commit is contained in:
yusing
2025-02-19 14:58:52 +08:00
parent 161cd84150
commit f0b04afa11
7 changed files with 19 additions and 27 deletions

View File

@@ -87,7 +87,6 @@ func (p *Provider) MarshalText() ([]byte, error) {
}
func (p *Provider) startRoute(parent task.Parent, r *route.Route) gperr.Error {
r.FinalizeHomepageConfig()
err := r.Start(parent)
if err != nil {
delete(p.routes, r.Alias)
@@ -157,7 +156,9 @@ func (p *Provider) loadRoutes() (routes route.Routes, err gperr.Error) {
}
if r.ShouldExclude() {
delete(routes, alias)
continue
}
r.FinalizeHomepageConfig()
}
return routes, errs.Error()
}

View File

@@ -369,15 +369,14 @@ func (r *Route) FinalizeHomepageConfig() {
isDocker := r.Container != nil
hp := r.Homepage
if hp.IsEmpty() {
hp = homepage.NewItem(r.Alias)
if r.Homepage.IsEmpty() {
r.Homepage = homepage.NewItem(r.Alias)
}
hp = hp.GetOverride()
hp := r.Homepage
hp.Alias = r.Alias
hp.Provider = r.Provider
r.Homepage = hp
hp = hp.ApplyOverride()
var key string
if hp.Name == "" {