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

Add support for published tag in Atom feeds

Browse source
This commit is contained in:
neepl 2018-07-18 07:52:05 +03:00 committed by Frédéric Guillot
parent 73a6e617bb
commit 5365f31e90
2 changed files with 59 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reader/atom/atom.go
View file

@ -30,6 +30,7 @@ type atomFeed struct {
type atomEntry struct { type atomEntry struct {
ID string `xml:"id"` ID string `xml:"id"`
Title atomContent `xml:"title"` Title atomContent `xml:"title"`
Published string `xml:"published"`
Updated string `xml:"updated"` Updated string `xml:"updated"`
Links []atomLink `xml:"link"` Links []atomLink `xml:"link"`
Summary string `xml:"summary"` Summary string `xml:"summary"`
@ -128,8 +129,13 @@ func getRelationURL(links []atomLink, relation string) string {
} }
func getDate(a *atomEntry) time.Time { func getDate(a *atomEntry) time.Time {
if a.Updated != "" { dateText := a.Updated
result, err := date.Parse(a.Updated) if dateText == "" {
dateText = a.Published
}
if dateText != "" {
result, err := date.Parse(dateText)
if err != nil { if err != nil {
logger.Error("atom: %v", err) logger.Error("atom: %v", err)
return time.Now() return time.Now()

51
reader/atom/parser_test.go
View file

@ -422,6 +422,57 @@ func TestParseEntryWithEnclosures(t *testing.T) {
} }
} }
func TestParseEntryWithPublished(t *testing.T) {
data := `<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<title>Example Feed</title>
<link href="http://example.org/"/>
<entry>
<link href="http://example.org/2003/12/13/atom03"/>
<id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
<published>2003-12-13T18:30:02Z</published>
<summary>Some text.</summary>
</entry>
</feed>`
feed, err := Parse(bytes.NewBufferString(data))
if err != nil {
t.Error(err)
}
if !feed.Entries[0].Date.Equal(time.Date(2003, time.December, 13, 18, 30, 2, 0, time.UTC)) {
t.Errorf("Incorrect entry date, got: %v", feed.Entries[0].Date)
}
}
func TestParseEntryWithPublishedAndUpdated(t *testing.T) {
data := `<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<title>Example Feed</title>
<link href="http://example.org/"/>
<entry>
<link href="http://example.org/2003/12/13/atom03"/>
<id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
<published>2002-11-12T18:30:02Z</published>
<updated>2003-12-13T18:30:02Z</updated>
<summary>Some text.</summary>
</entry>
</feed>`
feed, err := Parse(bytes.NewBufferString(data))
if err != nil {
t.Error(err)
}
if !feed.Entries[0].Date.Equal(time.Date(2003, time.December, 13, 18, 30, 2, 0, time.UTC)) {
t.Errorf("Incorrect entry date, got: %v", feed.Entries[0].Date)
}
}
func TestParseInvalidXml(t *testing.T) { func TestParseInvalidXml(t *testing.T) {
data := `garbage` data := `garbage`
_, err := Parse(bytes.NewBufferString(data)) _, err := Parse(bytes.NewBufferString(data))