Fix urlDecode usage

master
Koitharu 2 years ago
parent 1251a6cd75
commit 4a8c7fa36a
Signed by: Koitharu
GPG Key ID: 676DEE768C17A9D7

@ -18,7 +18,6 @@ import org.koitharu.kotatsu.parsers.model.*
import org.koitharu.kotatsu.parsers.network.UserAgents import org.koitharu.kotatsu.parsers.network.UserAgents
import org.koitharu.kotatsu.parsers.util.* import org.koitharu.kotatsu.parsers.util.*
import org.koitharu.kotatsu.parsers.util.json.* import org.koitharu.kotatsu.parsers.util.json.*
import java.net.URLDecoder
import java.text.DateFormat import java.text.DateFormat
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
@ -252,7 +251,7 @@ internal class RemangaParser(
val userCookie = context.cookieJar.getCookies(domain).find { val userCookie = context.cookieJar.getCookies(domain).find {
it.name == "user" it.name == "user"
} ?: return baseHeaders } ?: return baseHeaders
val jo = JSONObject(URLDecoder.decode(userCookie.value, Charsets.UTF_8.name())) val jo = JSONObject(userCookie.value.urlDecode())
val accessToken = jo.getStringOrNull("access_token") ?: return baseHeaders val accessToken = jo.getStringOrNull("access_token") ?: return baseHeaders
return baseHeaders.newBuilder().add("authorization", "bearer $accessToken").build() return baseHeaders.newBuilder().add("authorization", "bearer $accessToken").build()
} }

@ -57,7 +57,7 @@ internal abstract class ChanParser(
row.selectFirst("div.genre")?.select("a")?.mapToSet { row.selectFirst("div.genre")?.select("a")?.mapToSet {
MangaTag( MangaTag(
title = it.text().toTagName(), title = it.text().toTagName(),
key = it.attr("href").substringAfterLast('/').urlEncoded(), key = it.attr("href").substringAfterLast('/').urlDecode(),
source = source, source = source,
) )
} }
@ -133,7 +133,7 @@ internal abstract class ChanParser(
val a = li.children().lastOrNull() ?: li.parseFailed("a is null") val a = li.children().lastOrNull() ?: li.parseFailed("a is null")
MangaTag( MangaTag(
title = a.text().toTagName(), title = a.text().toTagName(),
key = a.attr("href").substringAfterLast('/'), key = a.attr("href").substringAfterLast('/').urlDecode(),
source = source, source = source,
) )
} }

@ -6,7 +6,6 @@ import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.config.ConfigKey
import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.model.*
import org.koitharu.kotatsu.parsers.util.* import org.koitharu.kotatsu.parsers.util.*
import java.net.URLDecoder
import java.util.* import java.util.*
@MangaSourceParser("HENCHAN", "Хентай-тян", "ru", type = ContentType.HENTAI) @MangaSourceParser("HENCHAN", "Хентай-тян", "ru", type = ContentType.HENTAI)
@ -40,7 +39,7 @@ internal class HenChanParser(context: MangaLoaderContext) : ChanParser(context,
val a = it.children().last() ?: doc.parseFailed("Invalid tag") val a = it.children().last() ?: doc.parseFailed("Invalid tag")
MangaTag( MangaTag(
title = a.text().toTitleCase(), title = a.text().toTitleCase(),
key = URLDecoder.decode(a.attr("href").substringAfterLast('/'), "UTF-8"), key = a.attr("href").substringAfterLast('/').urlDecode(),
source = source, source = source,
) )
} ?: manga.tags, } ?: manga.tags,
@ -49,7 +48,8 @@ internal class HenChanParser(context: MangaLoaderContext) : ChanParser(context,
id = generateUid(readLink), id = generateUid(readLink),
url = readLink, url = readLink,
source = source, source = source,
number = 1, number = 0f,
volume = 0,
uploadDate = 0L, uploadDate = 0L,
name = manga.title, name = manga.title,
scanlator = null, scanlator = null,

@ -13,6 +13,7 @@ import org.koitharu.kotatsu.parsers.util.*
internal class YaoiChanParser(context: MangaLoaderContext) : ChanParser(context, MangaSource.YAOICHAN) { internal class YaoiChanParser(context: MangaLoaderContext) : ChanParser(context, MangaSource.YAOICHAN) {
override val configKeyDomain = ConfigKey.Domain( override val configKeyDomain = ConfigKey.Domain(
"v3.yaoi-chan.me",
"v2.yaoi-chan.me", "v2.yaoi-chan.me",
"v1.yaoi-chan.me", "v1.yaoi-chan.me",
"yaoi-chan.me", "yaoi-chan.me",

Loading…
Cancel
Save