Support OPML files with no categories

piqoni · Dec 27, 2022 · c2db042 · c2db042
1 parent a3e64c5
commit c2db042
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .vscode/
 .obsidian/
+.DS_Store
 *.md
 
 /bin/

diff --git a/config.go b/config.go
@@ -35,11 +35,11 @@ func parseOPML(xmlContent []byte) []RSS {
 	err := xml.Unmarshal(xmlContent, &o)
 	if err != nil {
 		fmt.Println(err)
-	} else {
-		for _, outline := range o.Body.Outline {
-			for _, feed := range outline.Outline {
-				OpmlSlice = append(OpmlSlice, RSS{url: feed.XmlUrl, limit: 20})
-			}
+	}
+	for _, outline := range o.Body.Outline {
+		OpmlSlice = append(OpmlSlice, RSS{url: outline.XmlUrl, limit: 20})
+		for _, feed := range outline.Outline {
+			OpmlSlice = append(OpmlSlice, RSS{url: feed.XmlUrl, limit: 20})
 		}
 	}
 	return OpmlSlice

diff --git a/opml.go b/opml.go
@@ -18,6 +18,9 @@ type Opml struct {
 			Text     string `xml:",chardata"`
 			AttrText string `xml:"text,attr"`
 			Title    string `xml:"title,attr"`
+			Type     string `xml:"type,attr"`
+			XmlUrl   string `xml:"xmlUrl,attr"`
+			HtmlUrl  string `xml:"htmlUrl,attr"`
 			Outline  []struct {
 				Text     string `xml:",chardata"`
 				Type     string `xml:"type,attr"`