james/yarr
4
0
Fork 0
mirror of https://github.com/nkanaev/yarr.git synced 2025-11-08 18:39:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix importing certain opml files

Browse Source
This commit is contained in:
Nazar Kanaev
2021-04-22 11:15:16 +01:00
parent 19889c1457
commit 2ae62855cc
3 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/opml/read.go
View File

@@ -13,6 +13,7 @@ type opml struct {
type outline struct {
Type string `xml:"type,attr,omitempty"`
Title string `xml:"text,attr"`
Title2 string `xml:"title,attr,omitempty"`
FeedUrl string `xml:"xmlUrl,attr,omitempty"`
SiteUrl string `xml:"htmlUrl,attr,omitempty"`
Outlines []outline `xml:"outline,omitempty"`
@@ -21,14 +22,18 @@ type outline struct {
func buildFolder(title string, outlines []outline) Folder {
folder := Folder{Title: title}
for _, outline := range outlines {
if outline.Type == "rss" {
if outline.Type == "rss" || outline.FeedUrl != "" {
folder.Feeds = append(folder.Feeds, Feed{
Title: outline.Title,
FeedUrl: outline.FeedUrl,
SiteUrl: outline.SiteUrl,
})
} else {
subfolder := buildFolder(outline.Title, outline.Outlines)
title := outline.Title
if title == "" {
title = outline.Title2
}
subfolder := buildFolder(title, outline.Outlines)
folder.Folders = append(folder.Folders, subfolder)
}
}