james/yarr
4
0
Fork 0
mirror of https://github.com/nkanaev/yarr.git synced 2025-07-08 16:00:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

feedburner

Browse Source
This commit is contained in:
Nazar Kanaev 2021-04-02 15:05:22 +01:00
parent 3512350a22
commit 0a0db68905
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/parser/atom.go
View File

@ -24,6 +24,8 @@ type atomEntry struct {
Updated string `xml:"updated"`
Links atomLinks `xml:"link"`
Content atomText `xml:"http://www.w3.org/2005/Atom content"`
OrigLink string `xml:"http://rssnamespace.org/feedburner/ext/1.0 origLink"`
media
}
@ -73,9 +75,9 @@ func ParseAtom(r io.Reader) (*Feed, error) {
dstfeed.Items = append(dstfeed.Items, Item{
GUID: firstNonEmpty(srcitem.ID),
Date: dateParse(firstNonEmpty(srcitem.Published, srcitem.Updated)),
URL: firstNonEmpty(srcitem.Links.First("alternate"), srcfeed.Links.First("")),
URL: firstNonEmpty(srcitem.OrigLink, srcitem.Links.First("alternate"), srcitem.Links.First("")),
Title: srcitem.Title.String(),
Content: firstNonEmpty(srcitem.Content.String(), srcitem.firstMediaDescription()),
Content: firstNonEmpty(srcitem.Content.String(), srcitem.Summary.String(), srcitem.firstMediaDescription()),
ImageURL: srcitem.firstMediaThumbnail(),
AudioURL: "",
})

14
src/parser/rss.go
View File

@ -7,6 +7,8 @@ package parser
import (
"encoding/xml"
"io"
"path"
"strings"
)
type rssFeed struct {
@ -28,8 +30,8 @@ type rssItem struct {
DublinCoreDate string `xml:"http://purl.org/dc/elements/1.1/ date"`
ContentEncoded string `xml:"http://purl.org/rss/1.0/modules/content/ encoded"`
FeedBurnerLink string `xml:"http://rssnamespace.org/feedburner/ext/1.0 origLink"`
FeedBurnerEnclosureLink string `xml:"http://rssnamespace.org/feedburner/ext/1.0 origEnclosureLink"`
OrigLink string `xml:"http://rssnamespace.org/feedburner/ext/1.0 origLink"`
OrigEnclosureLink string `xml:"http://rssnamespace.org/feedburner/ext/1.0 origEnclosureLink"`
ItunesSubtitle string `xml:"http://www.itunes.com/dtds/podcast-1.0.dtd subtitle"`
ItunesSummary string `xml:"http://www.itunes.com/dtds/podcast-1.0.dtd summary"`
@ -74,6 +76,12 @@ func ParseRSS(r io.Reader) (*Feed, error) {
for _, e := range srcitem.Enclosures {
if e.Type == "audio/mpeg" || e.Type == "audio/x-m4a" {
podcastURL = e.URL
origBase := path.Base(srcitem.OrigEnclosureLink)
if origBase != "" && strings.Contains(podcastURL, origBase) {
podcastURL = srcitem.OrigEnclosureLink
}
break
}
}
@ -81,7 +89,7 @@ func ParseRSS(r io.Reader) (*Feed, error) {
dstfeed.Items = append(dstfeed.Items, Item{
GUID: firstNonEmpty(srcitem.GUID, srcitem.Link),
Date: dateParse(firstNonEmpty(srcitem.DublinCoreDate, srcitem.PubDate)),
URL: srcitem.Link,
URL: firstNonEmpty(srcitem.OrigLink, srcitem.Link),
Title: srcitem.Title,
Content: firstNonEmpty(srcitem.ContentEncoded, srcitem.Description),
AudioURL: podcastURL,

5
src/parser/utils.go
View File

@ -12,8 +12,9 @@ import (
func firstNonEmpty(vals ...string) string {
for _, val := range vals {
if len(val) > 0 {
return val
valTrimmed := strings.TrimSpace(val)
if len(valTrimmed) > 0 {
return valTrimmed
}
}
return ""