james/yarr
4
0
Fork 0
mirror of https://github.com/nkanaev/yarr.git synced 2025-05-24 00:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle base url later

Browse Source
This commit is contained in:
Nazar Kanaev 2021-03-19 21:56:27 +00:00
parent 3a667a3809
commit d185fb6dd7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/feed/json.go
View File

@ -42,7 +42,7 @@ func first(vals ...string) string {
return "" return ""
} }
func (f *jsonFeed) convert(base string) *Feed { func (f *jsonFeed) convert() *Feed {
feed := &Feed{ feed := &Feed{
Title: f.Title, Title: f.Title,
SiteURL: f.SiteURL, SiteURL: f.SiteURL,
@ -67,11 +67,11 @@ func (f *jsonFeed) convert(base string) *Feed {
return feed return feed
} }
func ParseJSON(data io.Reader, base string) (*Feed, error) { func ParseJSON(data io.Reader) (*Feed, error) {
feed := new(jsonFeed) feed := new(jsonFeed)
decoder := json.NewDecoder(data) decoder := json.NewDecoder(data)
if err := decoder.Decode(&feed); err != nil { if err := decoder.Decode(&feed); err != nil {
return nil, err return nil, err
} }
return feed.convert(base), nil return feed.convert(), nil
} }

2
src/feed/json_test.go
View File

@ -24,7 +24,7 @@ func TestJSONFeed(t *testing.T) {
"url": "https://example.org/initial-post" "url": "https://example.org/initial-post"
} }
] ]
}`), "https://example.com") }`))
want := &Feed{ want := &Feed{
Title: "My Example Feed", Title: "My Example Feed",
SiteURL: "https://example.org/", SiteURL: "https://example.org/",