diff options
| author |  jvoisin <julien.voisin@dustri.org>
| 2024-02-24 13:47:03 +0100 |
|---|---|---|
| committer |  Frédéric Guillot <f@miniflux.net>
| 2024-02-24 19:43:33 -0800 |
| commit | c544dadd55b3f96d0f488d0c3e4266ae9f15d71f (patch) | |
| tree | 42aaea5f5900de7adb4548dd0784b656fedafe6c | |
| parent | 1da65d97d86193918d2d5b47f9410ea69e382216 (diff) | |
| download | v2-c544dadd55b3f96d0f488d0c3e4266ae9f15d71f.tar.gz v2-c544dadd55b3f96d0f488d0c3e4266ae9f15d71f.tar.zst v2-c544dadd55b3f96d0f488d0c3e4266ae9f15d71f.zip | |
Fix categories import from Thunderbird's OPML
Thunderbird OPML exports are looking like this:
```xml
<opml version="1.0" xmlns:fz="urn:forumzilla:">
<head>
<title>Thunderbird OPML Export - RSS</title>
<dateCreated>Sat, 24 Feb 2024 11:31:13 GMT</dateCreated>
</head>
<body>
<outline title="News">
<outline type="rss" ...>
<outline type="rss" ...>
...
</outline>
<outline title="Blogs">
<outline type="rss" ...>
<outline type="rss" ...>
...
</outline>
</body>
```
This commit make it so that categories are now correctly imported.
| -rw-r--r-- | internal/reader/opml/parser.go | 2 | ||||
| -rw-r--r-- | internal/reader/opml/parser_test.go | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/internal/reader/opml/parser.go b/internal/reader/opml/parser.go index 5e3fd0d2..09455a69 100644 --- a/internal/reader/opml/parser.go +++ b/internal/reader/opml/parser.go @@ -37,7 +37,7 @@ func getSubscriptionsFromOutlines(outlines opmlOutlineCollection, category strin CategoryName: category, }) } else if outline.Outlines.HasChildren() { - subscriptions = append(subscriptions, getSubscriptionsFromOutlines(outline.Outlines, outline.Text)...) + subscriptions = append(subscriptions, getSubscriptionsFromOutlines(outline.Outlines, outline.GetTitle())...) } } return subscriptions diff --git a/internal/reader/opml/parser_test.go b/internal/reader/opml/parser_test.go index c1d2ca5b..e2e2d143 100644 --- a/internal/reader/opml/parser_test.go +++ b/internal/reader/opml/parser_test.go @@ -129,10 +129,10 @@ func TestParseOpmlVersion1(t *testing.T) { <dateCreated>Wed, 13 Mar 2019 11:51:41 GMT</dateCreated> </head> <body> - <outline title="Feed 1"> + <outline title="Category 1"> <outline type="rss" title="Feed 1" xmlUrl="http://example.org/feed1/" htmlUrl="http://example.org/1"></outline> </outline> - <outline title="Feed 2"> + <outline title="Category 2"> <outline type="rss" title="Feed 2" xmlUrl="http://example.org/feed2/" htmlUrl="http://example.org/2"></outline> </outline> </body> @@ -140,8 +140,8 @@ func TestParseOpmlVersion1(t *testing.T) { ` var expected SubcriptionList - expected = append(expected, &Subcription{Title: "Feed 1", FeedURL: "http://example.org/feed1/", SiteURL: "http://example.org/1", CategoryName: ""}) - expected = append(expected, &Subcription{Title: "Feed 2", FeedURL: "http://example.org/feed2/", SiteURL: "http://example.org/2", CategoryName: ""}) + expected = append(expected, &Subcription{Title: "Feed 1", FeedURL: "http://example.org/feed1/", SiteURL: "http://example.org/1", CategoryName: "Category 1"}) + expected = append(expected, &Subcription{Title: "Feed 2", FeedURL: "http://example.org/feed2/", SiteURL: "http://example.org/2", CategoryName: "Category 2"}) subscriptions, err := Parse(bytes.NewBufferString(data)) if err != nil { @@ -250,7 +250,7 @@ func TestParseOpmlWithInvalidCharacterEntity(t *testing.T) { ` var expected SubcriptionList - expected = append(expected, &Subcription{Title: "Feed 1", FeedURL: "http://example.org/feed1/a&b", SiteURL: "http://example.org/c&d", CategoryName: ""}) + expected = append(expected, &Subcription{Title: "Feed 1", FeedURL: "http://example.org/feed1/a&b", SiteURL: "http://example.org/c&d", CategoryName: "Feed 1"}) subscriptions, err := Parse(bytes.NewBufferString(data)) if err != nil { |