FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some RSS2 parsing issues

This commit is contained in:
Shinokuni 2020-09-18 14:12:07 +02:00
parent f6f8807b3a
commit ccce0a810d
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/androidTest/assets/localfeed/rss/rss_feed_special_cases.xml
View File

@ -2,7 +2,7 @@
<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"> <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
<channel> <channel>
<title></title> <title></title>
<atom:link href="https://news.ycombinator.com/feed/" /> <atom:link href="https://news.ycombinator.com/feed/" rel="self"/>
<link>https://news.ycombinator.com/</link> <link>https://news.ycombinator.com/</link>
<description>Links for the intellectually curious, ranked by readers.</description> <description>Links for the intellectually curious, ranked by readers.</description>
</channel> </channel>

3
api/src/androidTest/assets/localfeed/rss/rss_full_feed.xml
View File

@ -2,7 +2,8 @@
<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"> <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
<channel> <channel>
<title>Hacker News</title> <title>Hacker News</title>
<atom:link href="https://news.ycombinator.com/feed/" /> <atom:link href="https://news.ycombinator.com/feed/" rel="self" />
<atom:link href="https://news.ycombinator.com/hub" rel="hub" />
<link>https://news.ycombinator.com/</link> <link>https://news.ycombinator.com/</link>
<description>Links for the intellectually curious, ranked by readers.</description> <description>Links for the intellectually curious, ranked by readers.</description>
</channel> </channel>

3
api/src/androidTest/assets/localfeed/rss_feed.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0"> <rss version="2.0" xmlns:media="http://search.yahoo.com/mrss/">
<channel> <channel>
<title>Hacker News</title> <title>Hacker News</title>
<link>https://news.ycombinator.com/</link> <link>https://news.ycombinator.com/</link>
@ -11,6 +11,7 @@
<comments>https://news.ycombinator.com/item?id=24273602</comments> <comments>https://news.ycombinator.com/item?id=24273602</comments>
<author>Author 1</author> <author>Author 1</author>
<description><![CDATA[<a href="https://news.ycombinator.com/item?id=24273602">Comments</a>]]></description> <description><![CDATA[<a href="https://news.ycombinator.com/item?id=24273602">Comments</a>]]></description>
<media:description>media description</media:description>
</item> </item>
<item> <item>
<title>Palantir S-1</title> <title>Palantir S-1</title>

2
api/src/androidTest/java/com/readrops/api/localfeed/rss/RSSItemsAdapterTest.kt
View File

@ -31,7 +31,7 @@ class RSSItemsAdapterTest {
assertEquals(item.link, "https://www.bbc.com/news/world-africa-53887947") assertEquals(item.link, "https://www.bbc.com/news/world-africa-53887947")
assertEquals(item.pubDate, DateUtils.stringToLocalDateTime("Tue, 25 Aug 2020 17:15:49 +0000")) assertEquals(item.pubDate, DateUtils.stringToLocalDateTime("Tue, 25 Aug 2020 17:15:49 +0000"))
assertEquals(item.author, "Author 1") assertEquals(item.author, "Author 1")
assertNotNull(item.description) assertEquals(item.description, "<a href=\"https://news.ycombinator.com/item?id=24273602\">Comments</a>")
assertEquals(item.guid, "https://www.bbc.com/news/world-africa-53887947") assertEquals(item.guid, "https://www.bbc.com/news/world-africa-53887947")
} }

8
api/src/main/java/com/readrops/api/localfeed/rss/RSSFeedAdapter.kt
View File

@ -24,9 +24,13 @@ class RSSFeedAdapter : XmlAdapter<Feed> {
with(feed) { with(feed) {
when (tagName) { when (tagName) {
"title" -> name = Jsoup.parse(nonNullText()).text() "title" -> name = Jsoup.parse(nonNullText()).text()
"description" -> description = nullableText(failOnElement = false) "description" -> description = nullableText()
"link" -> siteUrl = nullableText() "link" -> siteUrl = nullableText()
"atom:link" -> url = attributes.getValueOpt("href") "atom:link" -> {
if (attributes.getValueOpt("rel") == "self")
url = attributes.getValueOpt("href")
}
else -> skipContents()
} }
} }
} }

1
api/src/main/java/com/readrops/api/localfeed/rss/RSSItemsAdapter.kt
View File

@ -34,6 +34,7 @@ class RSSItemsAdapter : XmlAdapter<List<Item>> {
"content:encoded" -> content = nullableText() "content:encoded" -> content = nullableText()
"enclosure" -> parseEnclosure(this, enclosures) "enclosure" -> parseEnclosure(this, enclosures)
"media:content" -> parseMediaContent(this, mediaContents) "media:content" -> parseMediaContent(this, mediaContents)
else -> skipContents() // for example media:description
} }
} }
} }