From a79072d462f7e669e7d1d18a33d647b314502bf8 Mon Sep 17 00:00:00 2001 From: Paul Petring Date: Sat, 1 Aug 2015 15:48:43 +0200 Subject: [PATCH] fixed tests for cases without enclosure --- atom.go | 13 ++++++++----- rss.go | 4 +++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/atom.go b/atom.go index f401a3f..3273d1a 100644 --- a/atom.go +++ b/atom.go @@ -111,17 +111,20 @@ func newAtomEntry(i *Item) *AtomEntry { } - if(i.Link.Length>0) { - i.Link.Rel = "enclosure" - } - x := &AtomEntry{ Title: i.Title, - Link: &AtomLink{Href: i.Link.Href, Rel: i.Link.Rel, Type: i.Link.Type, Length: strconv.FormatInt(i.Link.Length,10)}, + Link: &AtomLink{Href: i.Link.Href, Rel: i.Link.Rel, Type: i.Link.Type}, Content: c, Id: id, Updated: anyTimeFormat(time.RFC3339, i.Updated, i.Created), } + + if(i.Link.Length>0) { + i.Link.Rel = "enclosure" + x.Link = &AtomLink{Href: i.Link.Href, Rel: i.Link.Rel, Type: i.Link.Type, Length: strconv.FormatInt(i.Link.Length,10)} + } + + if len(name) > 0 || len(email) > 0 { x.Author = &AtomAuthor{AtomPerson: AtomPerson{Name: name, Email: email}} } diff --git a/rss.go b/rss.go index 79364bd..b37b9cf 100644 --- a/rss.go +++ b/rss.go @@ -91,9 +91,11 @@ func newRssItem(i *Item) *RssItem { Link: i.Link.Href, Description: i.Description, Guid: i.Id, - Enclosure: &RssEnclosure{Url: i.Link.Href, Type: i.Link.Type, Length: i.Link.Length}, PubDate: anyTimeFormat(time.RFC822, i.Created, i.Updated), } + if(i.Link.Length > 0 || i.Link.Type != ""){ + item.Enclosure = &RssEnclosure{Url: i.Link.Href, Type: i.Link.Type, Length: i.Link.Length} + } if i.Author != nil { item.Author = i.Author.Name }