Skip to content

fix(madara): properly parse srcset with image descriptors (w/x suffixes) #17518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AwkwardPeak7 merged 2 commits into from
Jul 19, 2026
+24 −4
Merged

fix(madara): properly parse srcset with image descriptors (w/x suffixes) #17518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74283f6
fix(madara): properly parse srcset with image descriptors (w/x suffixes)
IMXEren Jul 10, 2026
b9bcd8e
refactor(madara): avoid recompiling whitespace regex and split by limit
IMXEren Jul 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib-multisrc/madara/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies {
}

keiyoushi {
baseVersionCode = 51
baseVersionCode = 52
libVersion = "1.4"

deeplink {
Expand Down
26 changes: 23 additions & 3 deletions lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,9 +824,27 @@ abstract class Madara : HttpSource() {
/**
* Get the best image quality available from srcset
*/
protected open fun String.getSrcSetImage(): String? = this.split(" ")
.filter(URL_REGEX::matches)
.maxOfOrNull(String::toString)
protected open fun String.getSrcSetImage(): String? {
val images = this.split(",")
.map { it.trim().split(WHITESPACE_REGEX, limit = 2) }
.filter { it.isNotEmpty() && URL_REGEX.matches(it[0]) }

val imagesWithDescriptor = images
.filter { it.size == 2 }
.mapNotNull { candidate ->
IMAGE_DESCRIPTOR_REGEX.find(candidate[1])?.let { match ->
Pair(candidate[0], match.groupValues[1].toFloat())
}
}

// Prefer images with descriptors as to get the highest resolution
if (imagesWithDescriptor.isNotEmpty()) {
return imagesWithDescriptor.maxByOrNull { it.second }?.first
}

// Fallback to lexicographical comparison of image URLs
return images.maxOfOrNull { it.first() }
}

/**
* Apply any additional processing to the thumbnail URL if needed.
Expand Down Expand Up @@ -1170,6 +1188,8 @@ abstract class Madara : HttpSource() {
companion object {
const val URL_SEARCH_PREFIX = "slug:"
val URL_REGEX = """^(https?://[^\s/$.?#].[^\s]*)${'$'}""".toRegex()
val WHITESPACE_REGEX = """\s+""".toRegex()
val IMAGE_DESCRIPTOR_REGEX = """^(\d+|\d+\.\d+)([wx])$""".toRegex()
}
}

Expand Down