user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolves #62

Browse Source
This commit is contained in:
Pupil
2020-01-31 10:24:19 +09:00
parent 2c9c8e223c
commit e46d1123df
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libpupil/src/main/java/xyz/quaver/hitomi/common.kt
View File

@@ -17,20 +17,19 @@
package xyz.quaver.hitomi package xyz.quaver.hitomi
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonConfiguration
import kotlinx.serialization.list import kotlinx.serialization.list
import java.net.URL import java.net.URL
const val protocol = "https:" const val protocol = "https:"
fun getGalleryInfo(galleryID: Int): List<GalleryInfo> { @Suppress("EXPERIMENTAL_API_USAGE")
return Json(JsonConfiguration.Stable).parse( fun getGalleryInfo(galleryID: Int) =
Json.nonstrict.parse(
GalleryInfo.serializer().list, GalleryInfo.serializer().list,
Regex("""\[.+]""").find( Regex("""\[.+]""").find(
URL("$protocol//$domain/galleries/$galleryID.js").readText() URL("$protocol//$domain/galleries/$galleryID.js").readText()
)?.value ?: "[]" )?.value ?: "[]"
) )
}
//common.js //common.js
var adapose = false var adapose = false

4
libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt
View File

@@ -17,7 +17,6 @@
package xyz.quaver.hiyobi package xyz.quaver.hiyobi
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonConfiguration
import kotlinx.serialization.list import kotlinx.serialization.list
import org.jsoup.Jsoup import org.jsoup.Jsoup
import xyz.quaver.hitomi.GalleryInfo import xyz.quaver.hitomi.GalleryInfo
@@ -64,7 +63,8 @@ fun getReader(galleryID: Int) : Reader {
val title = Jsoup.connect(reader).get().title() val title = Jsoup.connect(reader).get().title()
val galleryInfo = Json(JsonConfiguration.Stable).parse( @Suppress("EXPERIMENTAL_API_USAGE")
val galleryInfo = Json.parse(
GalleryInfo.serializer().list, GalleryInfo.serializer().list,
with(URL(url).openConnection() as HttpsURLConnection) { with(URL(url).openConnection() as HttpsURLConnection) {
setRequestProperty("User-Agent", user_agent) setRequestProperty("User-Agent", user_agent)