KotatsuApp/kotatsu-parsers
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix absolute url resolving

Browse Source
This commit is contained in:
Koitharu
2025-01-16 08:51:48 +02:00
parent 6abcdd8d4b
commit 8481fadbd0
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/org/koitharu/kotatsu/parsers/util/Jsoup.kt
View File

@@ -79,7 +79,7 @@ public fun Element.attrAsAbsoluteUrlOrNull(attributeKey: String): String? {
if (attr.isEmpty() || attr.startsWith("data:")) {
return null
}
return (baseUri().toHttpUrlOrNull()?.newBuilder(attr) ?: return null).toString()
return (baseUri().toHttpUrlOrNull()?.resolve(attr) ?: return null).toString()
}
/**

11
src/main/kotlin/org/koitharu/kotatsu/parsers/util/Parse.kt
View File

@@ -12,6 +12,9 @@ import org.jsoup.nodes.Document
import org.koitharu.kotatsu.parsers.InternalParsersApi
import java.text.DateFormat
private val REGEX_SCHEME_PREFIX = Regex("^\\w{2,6}://", RegexOption.IGNORE_CASE)
private const val SCHEME_HTTPS = "https"
/**
* Parse [Response] body as html document using Jsoup
* @see [parseJson]
@@ -76,10 +79,10 @@ public fun String.toRelativeUrl(domain: String): String {
* @return an absolute url with [domain] if this is relative
*/
public fun String.toAbsoluteUrl(domain: String): String = when {
this.startsWith("//") -> "https:$this"
this.startsWith('/') -> "https://$domain$this"
this.startsWith("https://") -> this
else -> "https://$domain/$this"
startsWith("//") -> "$SCHEME_HTTPS:$this"
startsWith('/') -> "$SCHEME_HTTPS://$domain$this"
REGEX_SCHEME_PREFIX.containsMatchIn(this) -> this
else -> "$SCHEME_HTTPS://$domain/$this"
}
public fun concatUrl(host: String, path: String): String {