From f098832504487e46560cd0a528bf6fd6684d3bf0 Mon Sep 17 00:00:00 2001 From: Charles Lee Date: Tue, 13 Jul 2021 23:27:17 +1000 Subject: [PATCH] Update firstSubdomainFromGalleryId in hitomi.la (#8092) Updated with latest logic from ltn.hitomi.la/common.js --- src/all/hitomi/build.gradle | 2 +- .../tachiyomi/extension/all/hitomi/Hitomi.kt | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/all/hitomi/build.gradle b/src/all/hitomi/build.gradle index 89b5977e5..8bbfa2941 100644 --- a/src/all/hitomi/build.gradle +++ b/src/all/hitomi/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'Hitomi.la' pkgNameSuffix = 'all.hitomi' extClass = '.HitomiFactory' - extVersionCode = 8 + extVersionCode = 9 libVersion = '1.2' containsNsfw = true } diff --git a/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/Hitomi.kt b/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/Hitomi.kt index c3ac9f6aa..18eb0284f 100644 --- a/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/Hitomi.kt +++ b/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/Hitomi.kt @@ -365,19 +365,13 @@ open class Hitomi(override val lang: String, private val nozomiLang: String) : H // https://ltn.hitomi.la/common.js // function subdomain_from_url() - // Change g's if statment from !isNaN(g) + // Change g's if statement from !isNaN(g) private fun firstSubdomainFromGalleryId(pathSegment: String): Char { - val source = getScrambler() - var numberOfFrontends = 3 + var o = 0 var g = pathSegment.toInt(16) - if (g < source[0]) numberOfFrontends = 2 - if (g < source[1]) g = 1 - return (97 + g.rem(numberOfFrontends)).toChar() - } - - private fun getScrambler(): List { - val response = client.newCall(GET("$LTN_BASE_URL/common.js")).execute() - return HEXADECIMAL.findAll(response.body!!.string()).map { Integer.decode(it.value) }.toList() + if (g < 0x80) o = 1 + if (g < 0x40) o = 2 + return (97 + o).toChar() } override fun imageRequest(page: Page): Request {