extern/glance
1
0
Fork 0
mirror of https://github.com/glanceapp/glance.git synced 2025-06-21 18:31:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't show error if RSS feeds didn't return any items

Browse Source
This commit is contained in:
Svilen Markov 2024-08-10 18:01:54 +01:00
parent b25b117717
commit 328e10b89f
6 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/assets/templates/rss-detailed-list.html
View File

@ -33,6 +33,8 @@
{{ end }} {{ end }}
</div> </div>
</li> </li>
{{ else }}
<li>{{ .NoItemsMessage }}</li>
{{ end }} {{ end }}
</ul> </ul>
{{ end }} {{ end }}

4
internal/assets/templates/rss-horizontal-cards-2.html
View File

@ -3,6 +3,7 @@
{{ define "widget-content-classes" }}widget-content-frameless{{ end }} {{ define "widget-content-classes" }}widget-content-frameless{{ end }}
{{ define "widget-content" }} {{ define "widget-content" }}
{{ if gt (len .Items) 0 }}
<div class="carousel-container"> <div class="carousel-container">
<div class="cards-horizontal carousel-items-container"{{ if ne 0.0 .CardHeight }} style="--rss-card-height: {{ .CardHeight }}rem;"{{ end }}> <div class="cards-horizontal carousel-items-container"{{ if ne 0.0 .CardHeight }} style="--rss-card-height: {{ .CardHeight }}rem;"{{ end }}>
{{ range .Items }} {{ range .Items }}
@ -25,4 +26,7 @@
{{ end }} {{ end }}
</div> </div>
</div> </div>
{{ else }}
<div class="widget-content-frame padding-widget">{{ .NoItemsMessage }}</div>
{{ end }}
{{ end }} {{ end }}

4
internal/assets/templates/rss-horizontal-cards.html
View File

@ -3,6 +3,7 @@
{{ define "widget-content-classes" }}widget-content-frameless{{ end }} {{ define "widget-content-classes" }}widget-content-frameless{{ end }}
{{ define "widget-content" }} {{ define "widget-content" }}
{{ if gt (len .Items) 0 }}
<div class="carousel-container"> <div class="carousel-container">
<div class="cards-horizontal carousel-items-container"{{ if ne 0.0 .ThumbnailHeight }} style="--rss-thumbnail-height: {{ .ThumbnailHeight }}rem;"{{ end }}> <div class="cards-horizontal carousel-items-container"{{ if ne 0.0 .ThumbnailHeight }} style="--rss-thumbnail-height: {{ .ThumbnailHeight }}rem;"{{ end }}>
{{ range .Items }} {{ range .Items }}
@ -25,4 +26,7 @@
{{ end }} {{ end }}
</div> </div>
</div> </div>
{{ else }}
<div class="widget-content-frame padding-widget">{{ .NoItemsMessage }}</div>
{{ end }}
{{ end }} {{ end }}

2
internal/assets/templates/rss-list.html
View File

@ -12,6 +12,8 @@
</li> </li>
</ul> </ul>
</li> </li>
{{ else }}
<li>{{ .NoItemsMessage }}</li>
{{ end }} {{ end }}
</ul> </ul>
{{ end }} {{ end }}

2
internal/feed/rss.go
View File

@ -228,7 +228,7 @@ func GetItemsFromRSSFeeds(requests []RSSFeedRequest) (RSSFeedItems, error) {
entries = append(entries, feeds[i]...) entries = append(entries, feeds[i]...)
} }
if len(entries) == 0 { if failed == len(requests) {
return nil, ErrNoContent return nil, ErrNoContent
} }

3
internal/widget/rss.go
View File

@ -18,6 +18,7 @@ type RSS struct {
Items feed.RSSFeedItems `yaml:"-"` Items feed.RSSFeedItems `yaml:"-"`
Limit int `yaml:"limit"` Limit int `yaml:"limit"`
CollapseAfter int `yaml:"collapse-after"` CollapseAfter int `yaml:"collapse-after"`
NoItemsMessage string `yaml:"-"`
} }
func (widget *RSS) Initialize() error { func (widget *RSS) Initialize() error {
@ -45,6 +46,8 @@ func (widget *RSS) Initialize() error {
} }
} }
widget.NoItemsMessage = "No items were returned from the feeds."
return nil return nil
} }