From 3ffcefaa1b9ef025a29cd35652f81f05b9e7c665 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sat, 9 Nov 2024 19:11:41 +0200 Subject: [PATCH] Get rid of redundant boxing --- .../kotatsu/parsers/site/all/HitomiLaParser.kt | 4 ++-- .../kotatsu/parsers/site/all/WebtoonsParser.kt | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/HitomiLaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/HitomiLaParser.kt index 173087ac..94ba7cdc 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/HitomiLaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/HitomiLaParser.kt @@ -632,14 +632,14 @@ internal class HitomiLaParser(context: MangaLoaderContext) : MangaParser(context // / ---> - private var scriptLastRetrieval: Long? = null + private var scriptLastRetrieval: Long = -1L private val mutex = Mutex() private var subdomainOffsetDefault = 0 private val subdomainOffsetMap = mutableMapOf() private var commonImageId = "" private suspend fun refreshScript() = mutex.withLock { - if (scriptLastRetrieval == null || (scriptLastRetrieval!! + 60000) < System.currentTimeMillis()) { + if (scriptLastRetrieval == -1L || (scriptLastRetrieval + 60000) < System.currentTimeMillis()) { val ggScript = webClient.httpGet("$ltnBaseUrl/gg.js?_=${System.currentTimeMillis()}").parseRaw() subdomainOffsetDefault = Regex("var o = (\\d)").find(ggScript)!!.groupValues[1].toInt() diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/WebtoonsParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/WebtoonsParser.kt index 8bd7f04d..9e881508 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/WebtoonsParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/WebtoonsParser.kt @@ -213,6 +213,8 @@ internal abstract class WebtoonsParser( state = null, source = source, ), + date = 0L, + readCount = 0L, ) } } @@ -331,9 +333,9 @@ internal abstract class WebtoonsParser( } } - private inner class MangaWebtoon( - val manga: Manga, - @JvmField val date: Long? = null, - @JvmField val readCount: Long? = null, // FIXME get rid of boxing + private class MangaWebtoon( + @JvmField val manga: Manga, + @JvmField val date: Long, + @JvmField val readCount: Long, ) }