From 941cc61577402db41facf59dc2f146bed998fef7 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Tue, 12 Jul 2022 10:21:21 +0300 Subject: [PATCH] Ignore malformed domains while ops with cookies --- .../parsers/site/grouple/ReadmangaParser.kt | 2 +- .../kotatsu/parsers/util/CookieJar.kt | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/grouple/ReadmangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/grouple/ReadmangaParser.kt index 39c0380c..6ab26771 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/grouple/ReadmangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/grouple/ReadmangaParser.kt @@ -11,7 +11,7 @@ internal class ReadmangaParser( ) : GroupleParser(MangaSource.READMANGA_RU, "readmangafun", 1) { override val configKeyDomain = ConfigKey.Domain( - "readmanga.io", + "readmanga.live", arrayOf("readmanga.io", "readmanga.live", "readmanga.me"), ) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/CookieJar.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/CookieJar.kt index 4c07eef5..8e9ce7c3 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/CookieJar.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/CookieJar.kt @@ -9,10 +9,7 @@ import okhttp3.HttpUrl private const val SCHEME_HTTPS = "https" fun CookieJar.insertCookies(domain: String, vararg cookies: String) { - val url = HttpUrl.Builder() - .scheme(SCHEME_HTTPS) - .host(domain) - .build() + val url = safeUrlOf(domain) ?: return saveFromResponse( url, cookies.mapNotNull { @@ -22,18 +19,12 @@ fun CookieJar.insertCookies(domain: String, vararg cookies: String) { } fun CookieJar.insertCookie(domain: String, cookie: Cookie) { - val url = HttpUrl.Builder() - .scheme(SCHEME_HTTPS) - .host(domain) - .build() + val url = safeUrlOf(domain) ?: return saveFromResponse(url, listOf(cookie)) } fun CookieJar.getCookies(domain: String): List { - val url = HttpUrl.Builder() - .scheme(SCHEME_HTTPS) - .host(domain) - .build() + val url = safeUrlOf(domain) ?: return emptyList() return loadForRequest(url) } @@ -47,4 +38,13 @@ fun CookieJar.copyCookies(oldDomain: String, newDomain: String, names: Array