Added support for data-img-url in images

Author: spacecowboy

app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/HtmlToComposable.kt

@@ -1159,6 +1159,7 @@ private fun Element.firstBestDescendantImg(baseUrl: String): Element? {
                 baseUrl = baseUrl,
                 srcSet = element.attr("srcset") ?: "",
                 absSrc = element.attr("abs:src") ?: "",
+                dataImgUrl = element.attr("data-img-src") ?: "",
                 width = element.attr("width")?.toIntOrNull(),
                 height = element.attr("height")?.toIntOrNull(),
             ).hasImage
@@ -1258,6 +1259,7 @@ internal fun getImageSource(
     baseUrl = baseUrl,
     srcSet = element.attr("srcset") ?: "",
     absSrc = element.attr("abs:src") ?: "",
+    dataImgUrl = element.attr("data-img-url") ?: "",
     width = element.attr("width")?.toIntOrNull(),
     height = element.attr("height")?.toIntOrNull(),
 )
@@ -1266,10 +1268,11 @@ internal class ImageCandidates(
     val baseUrl: String,
     val srcSet: String,
     val absSrc: String,
+    val dataImgUrl: String,
     val width: Int?,
     val height: Int?,
 ) {
-    val hasImage: Boolean = srcSet.isNotBlank() || absSrc.isNotBlank()
+    val hasImage: Boolean = srcSet.isNotBlank() || absSrc.isNotBlank() || dataImgUrl.isNotBlank()
     val notHasImage: Boolean = !hasImage
 
     fun getBestImageForMaxSize(
@@ -1290,7 +1293,7 @@ internal class ImageCandidates(
                                 // Assume it corresponds to 1x pixel density
                                 (1.0f / pixelDensity) to
                                     ImageCandidateFromSetWithPixelDensity(
-                                        url = candidate.first(),
+                                        url = StringUtil.resolve(baseUrl, candidate.first()),
                                         pixelDensity = 1.0f,
                                     )
                             } else {
@@ -1302,7 +1305,7 @@ internal class ImageCandidates(
 
                                         ratio to
                                             ImageCandidateFromSetWithWidth(
-                                                url = candidate.first(),
+                                                url = StringUtil.resolve(baseUrl, candidate.first()),
                                                 width = width.toInt(),
                                             )
                                     }
@@ -1313,7 +1316,7 @@ internal class ImageCandidates(
 
                                         ratio to
                                             ImageCandidateFromSetWithPixelDensity(
-                                                url = candidate.first(),
+                                                url = StringUtil.resolve(baseUrl, candidate.first()),
                                                 pixelDensity = density,
                                             )
                                     }
@@ -1333,8 +1336,12 @@ internal class ImageCandidates(
                     }
                     .second
 
-            return if (setCandidate is NoImageCandidate) {
-                absSrc.takeIf { it.isNotBlank() }?.let {
+            if (setCandidate !is NoImageCandidate) {
+                return setCandidate
+            }
+
+            val dataImgUrlCandidate =
+                dataImgUrl.takeIf { it.isNotBlank() }?.let {
                     val url = StringUtil.resolve(baseUrl, it)
                     if (width != null && height != null) {
                         ImageCandidateWithSize(
@@ -1348,9 +1355,25 @@ internal class ImageCandidates(
                         )
                     }
                 } ?: NoImageCandidate
-            } else {
-                setCandidate
+
+            if (dataImgUrlCandidate !is NoImageCandidate) {
+                return dataImgUrlCandidate
             }
+
+            return absSrc.takeIf { it.isNotBlank() }?.let {
+                val url = StringUtil.resolve(baseUrl, it)
+                if (width != null && height != null) {
+                    ImageCandidateWithSize(
+                        url = url,
+                        width = width,
+                        height = height,
+                    )
+                } else {
+                    ImageCandidateUnknownSize(
+                        url = url,
+                    )
+                }
+            } ?: NoImageCandidate
         } catch (_: Throwable) {
             return NoImageCandidate
         }

app/src/test/java/com/nononsenseapps/feeder/ui/compose/text/HtmlToComposableUnitTest.kt

@@ -1,3 +1,5 @@
+@file:Suppress("ktlint:standard:max-line-length")
+
 package com.nononsenseapps.feeder.ui.compose.text
 
 import io.mockk.every
@@ -16,6 +18,7 @@ class HtmlToComposableUnitTest {
     fun setup() {
         every { element.attr("width") } returns null
         every { element.attr("height") } returns null
+        every { element.attr("data-img-url") } returns null
     }
 
     @Test
@@ -194,10 +197,11 @@ class HtmlToComposableUnitTest {
         assertTrue(result.hasImage)
 
         val maxSize = 1024
-        val best = result.getBestImageForMaxSize(
-            maxSize,
-            8.0f,
-        )
+        val best =
+            result.getBestImageForMaxSize(
+                maxSize,
+                8.0f,
+            )
         assertEquals(
             "https://www.politico.eu/cdn-cgi/image/width=1024,quality=80,onerror=redirect,format=auto/wp-content/uploads/2022/10/07/thumbnail_Kal-econ-cartoon-10-7-22synd.jpeg",
             best.url,
@@ -224,16 +228,47 @@ class HtmlToComposableUnitTest {
         assertTrue(result.hasImage)
 
         val maxSize = 1024
-        val best = result.getBestImageForMaxSize(
-            maxSize,
-            8.0f,
-        )
+        val best =
+            result.getBestImageForMaxSize(
+                maxSize,
+                8.0f,
+            )
         assertEquals(
             "https://duet-cdn.vox-cdn.com/thumbor/184x0:2614x1535/1080x720/filters:focal(1847x240:1848x241):format(webp)/cdn.vox-cdn.com/uploads/chorus_asset/file/24842461/Screenshot_2023_08_10_at_12.22.58_PM.png",
             best.url,
         )
     }
 
+    @Test
+    fun findImageForXDAWithDataImgUrl() {
+        every {
+            element.attr("data-img-url")
+        } returns "https://static1.xdaimages.com/wordpress/wp-content/uploads/2023/12/onedrive-app-for-microsoft-teams.png"
+        every {
+            element.attr("srcset")
+        } returns null
+        every {
+            element.attr("abs:src")
+        } returns null
+        every { element.attr("width") } returns null
+        every { element.attr("height") } returns null
+
+        val result = getImageSource("https://www.xda-developers.com", element)
+
+        assertTrue(result.hasImage)
+
+        val maxSize = 1024
+        val best =
+            result.getBestImageForMaxSize(
+                maxSize,
+                8.0f,
+            )
+        assertEquals(
+            "https://static1.xdaimages.com/wordpress/wp-content/uploads/2023/12/onedrive-app-for-microsoft-teams.png",
+            best.url,
+        )
+    }
+
     @Test
     fun noSourcesMeansEmptyResult() {
         every { element.attr("srcset") } returns ""
@@ -246,10 +281,11 @@ class HtmlToComposableUnitTest {
         assertFalse(result.hasImage)
 
         val maxSize = 1024
-        val best = result.getBestImageForMaxSize(
-            maxSize,
-            8.0f,
-        )
+        val best =
+            result.getBestImageForMaxSize(
+                maxSize,
+                8.0f,
+            )
         assertEquals(
             "",
             best.url,