southfox/miniflux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add support for OPML v1 import

Browse source
This commit is contained in:
Frédéric Guillot 2019-03-26 19:49:59 -07:00 committed by fguillot
parent 304b43cb30
commit 129f1bf3da
2 changed files with 76 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reader/opml/opml.go
View file

@ -4,7 +4,9 @@
package opml // import "miniflux.app/reader/opml" package opml // import "miniflux.app/reader/opml"
import "encoding/xml" import (
"encoding/xml"
)
type opml struct { type opml struct {
XMLName xml.Name `xml:"opml"` XMLName xml.Name `xml:"opml"`
@ -48,10 +50,6 @@ func (o *outline) GetSiteURL() string {
return o.FeedURL return o.FeedURL
} }
func (o *outline) IsCategory() bool {
return o.Text != "" && o.SiteURL == "" && o.FeedURL == ""
}
func (o *outline) Append(subscriptions SubcriptionList, category string) SubcriptionList { func (o *outline) Append(subscriptions SubcriptionList, category string) SubcriptionList {
if o.FeedURL != "" { if o.FeedURL != "" {
subscriptions = append(subscriptions, &Subcription{ subscriptions = append(subscriptions, &Subcription{
@ -67,10 +65,10 @@ func (o *outline) Append(subscriptions SubcriptionList, category string) Subcrip
func (o *opml) Transform() SubcriptionList { func (o *opml) Transform() SubcriptionList {
var subscriptions SubcriptionList var subscriptions SubcriptionList
for _, outline := range o.Outlines { for _, outline := range o.Outlines {
if outline.IsCategory() { if len(outline.Outlines) > 0 {
for _, element := range outline.Outlines { for _, element := range outline.Outlines {
// outline.Text is only available in OPML v2.
subscriptions = element.Append(subscriptions, outline.Text) subscriptions = element.Append(subscriptions, outline.Text)
} }
} else { } else {

71
reader/opml/parser_test.go
View file

@ -122,6 +122,77 @@ func TestParseOpmlWithEmptyTitleAndEmptySiteURL(t *testing.T) {
} }
} }
func TestParseOpmlVersion1(t *testing.T) {
data := `<?xml version="1.0"?>
<opml version="1.0">
<head>
<title>mySubscriptions.opml</title>
<dateCreated>Wed, 13 Mar 2019 11:51:41 GMT</dateCreated>
</head>
<body>
<outline title="Feed 1">
<outline type="rss" title="Feed 1" xmlUrl="http://example.org/feed1/" htmlUrl="http://example.org/1"></outline>
</outline>
<outline title="Feed 2">
<outline type="rss" title="Feed 2" xmlUrl="http://example.org/feed2/" htmlUrl="http://example.org/2"></outline>
</outline>
</body>
</opml>
`
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: ""})
subscriptions, err := Parse(bytes.NewBufferString(data))
if err != nil {
t.Error(err)
}
if len(subscriptions) != 2 {
t.Errorf("Wrong number of subscriptions: %d instead of %d", len(subscriptions), 2)
}
for i := 0; i < len(subscriptions); i++ {
if !subscriptions[i].Equals(expected[i]) {
t.Errorf(`Subscription are different: "%v" vs "%v"`, subscriptions[i], expected[i])
}
}
}
func TestParseOpmlVersion1WithoutOuterOutline(t *testing.T) {
data := `<?xml version="1.0"?>
<opml version="1.0">
<head>
<title>mySubscriptions.opml</title>
<dateCreated>Wed, 13 Mar 2019 11:51:41 GMT</dateCreated>
</head>
<body>
<outline type="rss" title="Feed 1" xmlUrl="http://example.org/feed1/" htmlUrl="http://example.org/1"></outline>
<outline type="rss" title="Feed 2" xmlUrl="http://example.org/feed2/" htmlUrl="http://example.org/2"></outline>
</body>
</opml>
`
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: ""})
subscriptions, err := Parse(bytes.NewBufferString(data))
if err != nil {
t.Error(err)
}
if len(subscriptions) != 2 {
t.Errorf("Wrong number of subscriptions: %d instead of %d", len(subscriptions), 2)
}
for i := 0; i < len(subscriptions); i++ {
if !subscriptions[i].Equals(expected[i]) {
t.Errorf(`Subscription are different: "%v" vs "%v"`, subscriptions[i], expected[i])
}
}
}
func TestParseInvalidXML(t *testing.T) { func TestParseInvalidXML(t *testing.T) {
data := `garbage` data := `garbage`
_, err := Parse(bytes.NewBufferString(data)) _, err := Parse(bytes.NewBufferString(data))