From e46d1123df11a07a25999f5b89ea7ec3c7025cd8 Mon Sep 17 00:00:00 2001 From: Pupil Date: Fri, 31 Jan 2020 10:24:19 +0900 Subject: [PATCH] resolves #62 --- libpupil/src/main/java/xyz/quaver/hitomi/common.kt | 7 +++---- libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libpupil/src/main/java/xyz/quaver/hitomi/common.kt b/libpupil/src/main/java/xyz/quaver/hitomi/common.kt index 82327704..7901fbef 100644 --- a/libpupil/src/main/java/xyz/quaver/hitomi/common.kt +++ b/libpupil/src/main/java/xyz/quaver/hitomi/common.kt @@ -17,20 +17,19 @@ package xyz.quaver.hitomi import kotlinx.serialization.json.Json -import kotlinx.serialization.json.JsonConfiguration import kotlinx.serialization.list import java.net.URL const val protocol = "https:" -fun getGalleryInfo(galleryID: Int): List { - return Json(JsonConfiguration.Stable).parse( +@Suppress("EXPERIMENTAL_API_USAGE") +fun getGalleryInfo(galleryID: Int) = + Json.nonstrict.parse( GalleryInfo.serializer().list, Regex("""\[.+]""").find( URL("$protocol//$domain/galleries/$galleryID.js").readText() )?.value ?: "[]" ) -} //common.js var adapose = false diff --git a/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt b/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt index d464e0f4..9500513e 100644 --- a/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt +++ b/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt @@ -17,7 +17,6 @@ package xyz.quaver.hiyobi import kotlinx.serialization.json.Json -import kotlinx.serialization.json.JsonConfiguration import kotlinx.serialization.list import org.jsoup.Jsoup import xyz.quaver.hitomi.GalleryInfo @@ -64,7 +63,8 @@ fun getReader(galleryID: Int) : Reader { val title = Jsoup.connect(reader).get().title() - val galleryInfo = Json(JsonConfiguration.Stable).parse( + @Suppress("EXPERIMENTAL_API_USAGE") + val galleryInfo = Json.parse( GalleryInfo.serializer().list, with(URL(url).openConnection() as HttpsURLConnection) { setRequestProperty("User-Agent", user_agent)