cenochallenge/ReadYou
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix parsing of srcset images (#241)

Browse Source
This commit is contained in:
LA 2022-10-15 20:09:29 +08:00 committed by GitHub
parent ea0e8d5e3c
commit 672f471e12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/me/ash/reader/ui/component/reader/HtmlToComposable.kt
View File

@ -755,7 +755,7 @@ internal class ImageCandidates(
* Might throw if hasImage returns false * Might throw if hasImage returns false
*/ */
fun getBestImageForMaxSize(maxSize: Size, pixelDensity: Float): String { fun getBestImageForMaxSize(maxSize: Size, pixelDensity: Float): String {
val setCandidate = srcSet.splitToSequence(",") val setCandidate = srcSet.splitToSequence(", ")
.map { it.trim() } .map { it.trim() }
.map { it.split(SpaceRegex).take(2).map { x -> x.trim() } } .map { it.split(SpaceRegex).take(2).map { x -> x.trim() } }
.fold(100f to "") { acc, candidate -> .fold(100f to "") { acc, candidate ->
@ -787,10 +787,10 @@ internal class ImageCandidates(
} }
.second .second
if (setCandidate.isNotBlank()) { return StringUtil.resolve(
return StringUtil.resolve(baseUrl, setCandidate) baseUrl,
} setCandidate.takeIf { it.isNotBlank() } ?: absSrc
return StringUtil.resolve(baseUrl, absSrc) )
} }
} }