Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use an io.ReadSeeker instead of an io.Reader to parse feeds #2459

Merged
merged 2 commits into from
Mar 7, 2024
Merged

Use an io.ReadSeeker instead of an io.Reader to parse feeds #2459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8864863
Use an io.ReadSeeker instead of an io.Reader to parse feeds
jvoisin Mar 6, 2024
1e6ce78
Merge branch 'main' into seek2
jvoisin Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/reader/rdf/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
)

// Parse returns a normalized feed struct from a RDF feed.
func Parse(baseURL string, data io.Reader) (*model.Feed, error) {
func Parse(baseURL string, data io.ReadSeeker) (*model.Feed, error) {
feed := new(rdfFeed)
if err := xml.NewXMLDecoder(data).Decode(feed); err != nil {
return nil, fmt.Errorf("rdf: unable to parse feed: %w", err)
Expand Down
36 changes: 18 additions & 18 deletions internal/reader/rdf/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func TestParseRDFSample(t *testing.T) {

</rdf:RDF>`

feed, err := Parse("http://xml.com/pub/rdf.xml", bytes.NewBufferString(data))
feed, err := Parse("http://xml.com/pub/rdf.xml", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -186,7 +186,7 @@ func TestParseRDFSampleWithDublinCore(t *testing.T) {

</rdf:RDF>`

feed, err := Parse("http://meerkat.oreillynet.com/feed.rdf", bytes.NewBufferString(data))
feed, err := Parse("http://meerkat.oreillynet.com/feed.rdf", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -253,7 +253,7 @@ func TestParseItemWithOnlyFeedAuthor(t *testing.T) {
</item>
</rdf:RDF>`

feed, err := Parse("http://meerkat.oreillynet.com", bytes.NewBufferString(data))
feed, err := Parse("http://meerkat.oreillynet.com", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand All @@ -278,7 +278,7 @@ func TestParseItemRelativeURL(t *testing.T) {
</item>
</rdf:RDF>`

feed, err := Parse("http://meerkat.oreillynet.com", bytes.NewBufferString(data))
feed, err := Parse("http://meerkat.oreillynet.com", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -307,7 +307,7 @@ func TestParseItemWithoutLink(t *testing.T) {
</item>
</rdf:RDF>`

feed, err := Parse("http://meerkat.oreillynet.com", bytes.NewBufferString(data))
feed, err := Parse("http://meerkat.oreillynet.com", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -338,7 +338,7 @@ func TestParseItemWithDublicCoreDate(t *testing.T) {
</item>
</rdf:RDF>`

feed, err := Parse("http://example.org", bytes.NewBufferString(data))
feed, err := Parse("http://example.org", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -366,7 +366,7 @@ func TestParseItemWithEncodedHTMLInDCCreatorField(t *testing.T) {
</item>
</rdf:RDF>`

feed, err := Parse("http://example.org", bytes.NewBufferString(data))
feed, err := Parse("http://example.org", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand All @@ -392,7 +392,7 @@ func TestParseItemWithoutDate(t *testing.T) {
</item>
</rdf:RDF>`

feed, err := Parse("http://example.org", bytes.NewBufferString(data))
feed, err := Parse("http://example.org", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand All @@ -419,7 +419,7 @@ func TestParseItemWithEncodedHTMLTitle(t *testing.T) {
</item>
</rdf:RDF>`

feed, err := Parse("http://example.org", bytes.NewBufferString(data))
feed, err := Parse("http://example.org", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand All @@ -431,7 +431,7 @@ func TestParseItemWithEncodedHTMLTitle(t *testing.T) {

func TestParseInvalidXml(t *testing.T) {
data := `garbage`
_, err := Parse("http://example.org", bytes.NewBufferString(data))
_, err := Parse("http://example.org", bytes.NewReader([]byte(data)))
if err == nil {
t.Fatal("Parse should returns an error")
}
Expand All @@ -446,7 +446,7 @@ func TestParseFeedWithHTMLEntity(t *testing.T) {
</channel>
</rdf:RDF>`

feed, err := Parse("http://example.org", bytes.NewBufferString(data))
feed, err := Parse("http://example.org", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand All @@ -465,7 +465,7 @@ func TestParseFeedWithInvalidCharacterEntity(t *testing.T) {
</channel>
</rdf:RDF>`

feed, err := Parse("http://example.org", bytes.NewBufferString(data))
feed, err := Parse("http://example.org", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -521,7 +521,7 @@ func TestParseFeedWithURLWrappedInSpaces(t *testing.T) {
</item>
</rdf:RDF>`

feed, err := Parse("http://biorxiv.org", bytes.NewBufferString(data))
feed, err := Parse("http://biorxiv.org", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -556,7 +556,7 @@ func TestParseRDFWithContentEncoded(t *testing.T) {
</item>
</rdf:RDF>`

feed, err := Parse("http://example.org/", bytes.NewBufferString(data))
feed, err := Parse("http://example.org/", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -589,7 +589,7 @@ func TestParseRDFWithEncodedHTMLDescription(t *testing.T) {
</item>
</rdf:RDF>`

feed, err := Parse("http://example.org/", bytes.NewBufferString(data))
feed, err := Parse("http://example.org/", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -623,7 +623,7 @@ func TestParseRDFItemWithDuplicateTitleElement(t *testing.T) {
</item>
</rdf:RDF>`

feed, err := Parse("http://example.org/", bytes.NewBufferString(data))
feed, err := Parse("http://example.org/", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -656,7 +656,7 @@ func TestParseRDFItemWithDublinCoreTitleElement(t *testing.T) {
</item>
</rdf:RDF>`

feed, err := Parse("http://example.org/", bytes.NewBufferString(data))
feed, err := Parse("http://example.org/", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -688,7 +688,7 @@ func TestParseRDFItemWitEmptyTitleElement(t *testing.T) {
</item>
</rdf:RDF>`

feed, err := Parse("http://example.org/", bytes.NewBufferString(data))
feed, err := Parse("http://example.org/", bytes.NewReader([]byte(data)))
if err != nil {
t.Fatal(err)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/reader/rss/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
)

// Parse returns a normalized feed struct from a RSS feed.
func Parse(baseURL string, data io.Reader) (*model.Feed, error) {
func Parse(baseURL string, data io.ReadSeeker) (*model.Feed, error) {
feed := new(rssFeed)
if err := xml.NewXMLDecoder(data).Decode(feed); err != nil {
return nil, fmt.Errorf("rss: unable to parse feed: %w", err)
Expand Down
Loading
Loading