Add support for parsing enclosed images in RSS feeds

msasikanth · Aug 9, 2023 · b9aa8a8 · b9aa8a8
1 parent 51a27d7
commit b9aa8a8
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 deletions.
diff --git a/.../androidInstrumentedTest/kotlin/dev/sasikanth/rss/reader/network/AndroidFeedParserTest.kt b/.../androidInstrumentedTest/kotlin/dev/sasikanth/rss/reader/network/AndroidFeedParserTest.kt
@@ -46,6 +46,13 @@ class AndroidFeedParserTest {
               imageUrl = null,
               date = 1684924200000
             ),
+            PostPayload(
+              title = "Post with enclosure image",
+              link = "https://example.com/fourth-post",
+              description = "Fourth post description.",
+              imageUrl = "https://example.com/enclosure-image",
+              date = 1684924200000
+            ),
           )
       )
 
@@ -128,6 +135,13 @@ class AndroidFeedParserTest {
             <pubDate>Wed, 24 May 2023 10:30:00 +0000</pubDate>
             <enclosure url="https://example.com/third-post" />
           </item>
+          <item>
+            <title>Post with enclosure image</title>
+            <description>Fourth post description.</description>
+            <pubDate>Wed, 24 May 2023 10:30:00 +0000</pubDate>
+            <enclosure url="https://example.com/fourth-post" />
+            <enclosure type="image/jpeg" url="https://example.com/enclosure-image" />
+          </item>
         </channel>
       </rss>
       """

diff --git a/shared/src/androidMain/kotlin/dev/sasikanth/rss/reader/network/AndroidRssParser.kt b/shared/src/androidMain/kotlin/dev/sasikanth/rss/reader/network/AndroidRssParser.kt
@@ -76,8 +76,7 @@ internal class AndroidRssParser(private val parser: XmlPullParser, private val f
         name == "enclosure" && link.isNullOrBlank() -> link = readAttrText("url", parser)
         name == "description" -> description = readTagText("description", parser)
         name == "pubDate" -> date = readTagText("pubDate", parser)
-        FeedParser.imageTags.contains(name) && image.isNullOrBlank() ->
-          image = readAttrText("url", parser)
+        image.isNullOrBlank() && hasRssImageUrl(name, parser) -> image = readAttrText("url", parser)
         else -> skip(parser)
       }
     }
@@ -101,4 +100,9 @@ internal class AndroidRssParser(private val parser: XmlPullParser, private val f
       date = dateLong
     )
   }
+
+  private fun hasRssImageUrl(name: String, parser: XmlPullParser) =
+    (FeedParser.imageTags.contains(name) ||
+      (name == "enclosure" && parser.getAttributeValue(namespace, "type") == "image/jpeg")) &&
+      !parser.getAttributeValue(namespace, "url").isNullOrBlank()
 }
diff --git a/shared/src/iosMain/kotlin/dev/sasikanth/rss/reader/network/IOSFeedParser.kt b/shared/src/iosMain/kotlin/dev/sasikanth/rss/reader/network/IOSFeedParser.kt
@@ -87,7 +87,7 @@ private class IOSXmlFeedParser(
     currentElement = didStartElement
 
     when {
-      hasRssImageUrl(attributes) -> {
+      !currentItemData.containsKey("imageUrl") && hasRssImageUrl(attributes) -> {
         currentItemData["imageUrl"] = attributes["url"] as String
       }
       hasPodcastRssUrl() -> {
@@ -123,8 +123,8 @@ private class IOSXmlFeedParser(
     currentElement == "enclosure" && currentItemData["link"].isNullOrBlank()
 
   private fun hasRssImageUrl(attributes: Map<Any?, *>) =
-    imageTags.contains(currentElement) &&
-      !currentItemData.containsKey("imageUrl") &&
+    (imageTags.contains(currentElement) ||
+      (currentElement == "enclosure" && attributes["type"] == "image/jpeg")) &&
       attributes.containsKey("url")
 
   private fun PostPayload.Companion.mapRssPost(rssMap: Map<String, String>): PostPayload {

diff --git a/shared/src/iosTest/kotlin/dev/sasikanth/rss/reader/network/IOSFeedParserTest.kt b/shared/src/iosTest/kotlin/dev/sasikanth/rss/reader/network/IOSFeedParserTest.kt
@@ -46,6 +46,13 @@ class IOSFeedParserTest {
               imageUrl = null,
               date = 1684924200000
             ),
+            PostPayload(
+              title = "Post with enclosure image",
+              link = "https://example.com/fourth-post",
+              description = "Fourth post description.",
+              imageUrl = "https://example.com/enclosure-image",
+              date = 1684924200000
+            ),
           )
       )
 
@@ -85,6 +92,13 @@ class IOSFeedParserTest {
             <pubDate>Wed, 24 May 2023 10:30:00 +0000</pubDate>
             <enclosure url="https://example.com/third-post" />
           </item>
+          <item>
+            <title>Post with enclosure image</title>
+            <description>Fourth post description.</description>
+            <pubDate>Wed, 24 May 2023 10:30:00 +0000</pubDate>
+            <enclosure url="https://example.com/fourth-post" />
+            <enclosure type="image/jpeg" url="https://example.com/enclosure-image" />
+          </item>
         </channel>
       </rss>
       """