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

Ignore media content sub elements

This commit is contained in:
Shinokuni 2020-09-19 17:25:36 +02:00
parent ccce0a810d
commit 0eb518d692
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@
<description><![CDATA[description]]></description> <description><![CDATA[description]]></description>
<content:encoded><![CDATA[content:encoded]]></content:encoded> <content:encoded><![CDATA[content:encoded]]></content:encoded>
<media:content medium="image" url="https://image2.jpg" /> <media:content medium="image" url="https://image2.jpg"><media:title>image2 title</media:title></media:content>
</item> </item>
</channel> </channel>
</rss> </rss>

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

@ -30,10 +30,15 @@ class RSSItemsAdapter : XmlAdapter<List<Item>> {
"pubDate" -> pubDate = DateUtils.stringToLocalDateTime(nonNullText()) "pubDate" -> pubDate = DateUtils.stringToLocalDateTime(nonNullText())
"dc:date" -> pubDate = DateUtils.stringToLocalDateTime(nonNullText()) "dc:date" -> pubDate = DateUtils.stringToLocalDateTime(nonNullText())
"guid" -> guid = nullableText() "guid" -> guid = nullableText()
"description" -> description = nullableText() "description" -> description = text(failOnElement = false)
"content:encoded" -> content = nullableText() "content:encoded" -> content = nullableText(failOnElement = false)
"enclosure" -> parseEnclosure(this, enclosures) "enclosure" -> parseEnclosure(this, enclosures)
"media:content" -> parseMediaContent(this, mediaContents) "media:content" -> parseMediaContent(this, mediaContents)
"media:group" -> allChildrenAutoIgnore("content") {
when (tagName) {
"media:content" -> parseMediaContent(this, mediaContents)
}
}
else -> skipContents() // for example media:description else -> skipContents() // for example media:description
} }
} }
@ -69,6 +74,8 @@ class RSSItemsAdapter : XmlAdapter<List<Item>> {
if (konsume.attributes.getValueOpt("medium") != null if (konsume.attributes.getValueOpt("medium") != null
&& LibUtils.isMimeImage(konsume.attributes["medium"])) && LibUtils.isMimeImage(konsume.attributes["medium"]))
mediaContents += konsume.attributes["url"] mediaContents += konsume.attributes["url"]
konsume.skipContents() // ignore media content sub elements
} }
private fun validateItem(item: Item) { private fun validateItem(item: Item) {
@ -81,6 +88,6 @@ class RSSItemsAdapter : XmlAdapter<List<Item>> {
companion object { companion object {
val names = Names.of("title", "link", "author", "creator", "pubDate", "date", val names = Names.of("title", "link", "author", "creator", "pubDate", "date",
"guid", "description", "encoded", "enclosure", "content") "guid", "description", "encoded", "enclosure", "content", "group")
} }
} }