mirror of
https://github.com/yusing/godoxy.git
synced 2026-04-23 16:58:31 +02:00
simplify icon caching and homepage item override
This commit is contained in:
@@ -194,7 +194,7 @@ func (r *HTTPRoute) addToLoadBalancer(parent task.Parent) {
|
||||
linked = l.(*HTTPRoute)
|
||||
lb = linked.loadBalancer
|
||||
lb.UpdateConfigIfNeeded(cfg)
|
||||
if linked.Raw.Homepage == nil && r.Raw.Homepage != nil {
|
||||
if linked.Raw.Homepage.IsEmpty() && !r.Raw.Homepage.IsEmpty() {
|
||||
linked.Raw.Homepage = r.Raw.Homepage
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -45,7 +45,7 @@ func HomepageCategories() []string {
|
||||
categories := make([]string, 0)
|
||||
routes.GetHTTPRoutes().RangeAll(func(alias string, r route.HTTPRoute) {
|
||||
en := r.RawEntry()
|
||||
if en.Homepage == nil || en.Homepage.Category == "" {
|
||||
if en.Homepage.IsEmpty() || en.Homepage.Category == "" {
|
||||
return
|
||||
}
|
||||
if _, ok := check[en.Homepage.Category]; ok {
|
||||
@@ -63,13 +63,14 @@ func HomepageConfig(useDefaultCategories bool, categoryFilter, providerFilter st
|
||||
routes.GetHTTPRoutes().RangeAll(func(alias string, r route.HTTPRoute) {
|
||||
en := r.RawEntry()
|
||||
item := en.Homepage
|
||||
if item == nil {
|
||||
item = new(homepage.Item)
|
||||
item.Show = true
|
||||
|
||||
if item.IsEmpty() {
|
||||
item = homepage.NewItem(alias)
|
||||
}
|
||||
|
||||
if !item.IsEmpty() {
|
||||
item.Show = true
|
||||
if override := item.GetOverride(); override != item {
|
||||
hpCfg.Add(override)
|
||||
return
|
||||
}
|
||||
|
||||
if !item.Show {
|
||||
@@ -85,8 +86,9 @@ func HomepageConfig(useDefaultCategories bool, categoryFilter, providerFilter st
|
||||
|
||||
if item.Name == "" {
|
||||
reference := r.TargetName()
|
||||
if r.RawEntry().Container != nil {
|
||||
reference = r.RawEntry().Container.ImageName
|
||||
cont := r.RawEntry().Container
|
||||
if cont != nil {
|
||||
reference = cont.ImageName
|
||||
}
|
||||
name, ok := internal.GetDisplayName(reference)
|
||||
if ok {
|
||||
@@ -138,7 +140,7 @@ func HomepageConfig(useDefaultCategories bool, categoryFilter, providerFilter st
|
||||
}
|
||||
|
||||
item.AltURL = r.TargetURL().String()
|
||||
hpCfg.Add(item.GetOverriddenItem())
|
||||
hpCfg.Add(item)
|
||||
})
|
||||
return hpCfg
|
||||
}
|
||||
|
||||
@@ -172,6 +172,10 @@ func (e *RawEntry) Finalize() {
|
||||
}
|
||||
}
|
||||
|
||||
if e.Homepage == nil {
|
||||
e.Homepage = homepage.NewItem(e.Alias)
|
||||
}
|
||||
|
||||
e.finalized = true
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user