diff --git a/src/feed/atom_test.go b/src/feed/atom_test.go index ad0cf98..cd4c332 100644 --- a/src/feed/atom_test.go +++ b/src/feed/atom_test.go @@ -8,7 +8,7 @@ import ( ) func TestAtom(t *testing.T) { - have, _ := ParseAtom(strings.NewReader(` + have, _ := Parse(strings.NewReader(` Example Feed diff --git a/src/feed/feed.go b/src/feed/feed.go index 65d5a80..2fcf321 100644 --- a/src/feed/feed.go +++ b/src/feed/feed.go @@ -28,7 +28,7 @@ func sniff(lookup string) (string, processor) { case "rss": return "rss", ParseRSS case "RDF": - return "rss", ParseRDF + return "rdf", ParseRDF case "feed": return "atom", ParseAtom } @@ -41,11 +41,9 @@ func sniff(lookup string) (string, processor) { } func Parse(r io.Reader) (*Feed, error) { - chunk := make([]byte, 64) - numread, err := r.Read(chunk) - fmt.Println(numread, err) - if err != nil { - return nil, fmt.Errorf("Failed to read: %s", err) + chunk := make([]byte, 1024) + if _, err := r.Read(chunk); err != nil { + return nil, fmt.Errorf("Failed to read input: %s", err) } _, callback := sniff(string(chunk)) diff --git a/src/feed/feed_test.go b/src/feed/feed_test.go index 1f77381..ae2a158 100644 --- a/src/feed/feed_test.go +++ b/src/feed/feed_test.go @@ -6,7 +6,7 @@ func TestSniff(t *testing.T) { testcases := [][2]string{ { ``, - "rss", + "rdf", }, { ``, diff --git a/src/feed/json_test.go b/src/feed/json_test.go index b2258ac..7cd52fb 100644 --- a/src/feed/json_test.go +++ b/src/feed/json_test.go @@ -7,7 +7,7 @@ import ( ) func TestJSONFeed(t *testing.T) { - have, _ := ParseJSON(strings.NewReader(`{ + have, _ := Parse(strings.NewReader(`{ "version": "https://jsonfeed.org/version/1", "title": "My Example Feed", "home_page_url": "https://example.org/", diff --git a/src/feed/rdf_test.go b/src/feed/rdf_test.go index 0deee0b..97761fe 100644 --- a/src/feed/rdf_test.go +++ b/src/feed/rdf_test.go @@ -7,7 +7,7 @@ import ( ) func TestRDFFeed(t *testing.T) { - have, _ := ParseRDF(strings.NewReader(` + have, _ := Parse(strings.NewReader(` diff --git a/src/feed/rss_test.go b/src/feed/rss_test.go index 12fe701..2050b2c 100644 --- a/src/feed/rss_test.go +++ b/src/feed/rss_test.go @@ -7,7 +7,7 @@ import ( ) func TestRSSFeed(t *testing.T) { - have, _ := ParseRSS(strings.NewReader(` + have, _ := Parse(strings.NewReader(`