From d92f5ef1ccfb91bba2f622efad0cb54e4e41850f Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Fri, 26 Apr 2024 10:28:37 +0000 Subject: [PATCH] fix(pt/hentaistube): Update episode list selector + minor refactoration (#3191) --- src/pt/hentaistube/build.gradle | 4 ++-- .../pt/hentaistube/HentaisTube.kt | 20 ++++--------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/pt/hentaistube/build.gradle b/src/pt/hentaistube/build.gradle index 88906215f..d5c83e6ed 100644 --- a/src/pt/hentaistube/build.gradle +++ b/src/pt/hentaistube/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'HentaisTube' extClass = '.HentaisTube' - extVersionCode = 1 + extVersionCode = 2 isNsfw = true } @@ -9,4 +9,4 @@ apply from: "$rootDir/common.gradle" dependencies { implementation(project(':lib:blogger-extractor')) -} \ No newline at end of file +} diff --git a/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/HentaisTube.kt b/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/HentaisTube.kt index 9a2b61e9f..0bb40953a 100644 --- a/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/HentaisTube.kt +++ b/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/HentaisTube.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.animeextension.pt.hentaistube import android.app.Application -import android.content.SharedPreferences import androidx.preference.ListPreference import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.animeextension.pt.hentaistube.HentaisTubeFilters.applyFilterParams @@ -19,14 +18,13 @@ import eu.kanade.tachiyomi.network.await import eu.kanade.tachiyomi.network.awaitSuccess import eu.kanade.tachiyomi.util.asJsoup import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking -import kotlinx.serialization.json.Json +import eu.kanade.tachiyomi.util.parseAs import okhttp3.Request import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -import uy.kohesive.injekt.injectLazy class HentaisTube : ConfigurableAnimeSource, ParsedAnimeHttpSource() { @@ -42,9 +40,7 @@ class HentaisTube : ConfigurableAnimeSource, ParsedAnimeHttpSource() { .add("Referer", baseUrl) .add("Origin", baseUrl) - private val json: Json by injectLazy() - - private val preferences: SharedPreferences by lazy { + private val preferences by lazy { Injekt.get().getSharedPreferences("source_$id", 0x0000) } @@ -80,9 +76,7 @@ class HentaisTube : ConfigurableAnimeSource, ParsedAnimeHttpSource() { private val animeList by lazy { val headers = headersBuilder().add("X-Requested-With", "XMLHttpRequest").build() client.newCall(GET("$baseUrl/json-lista-capas.php", headers)).execute() - .body.string() - .let { json.decodeFromString(it) } - .items + .parseAs().items .asSequence() } @@ -151,7 +145,7 @@ class HentaisTube : ConfigurableAnimeSource, ParsedAnimeHttpSource() { // ============================== Episodes ============================== override fun episodeListParse(response: Response) = super.episodeListParse(response).reversed() - override fun episodeListSelector() = "div.pagAniListaContainer > li > a" + override fun episodeListSelector() = "ul.pagAniListaContainer > li > a" override fun episodeFromElement(element: Element) = SEpisode.create().apply { setUrlWithoutDomain(element.attr("href")) @@ -213,12 +207,6 @@ class HentaisTube : ConfigurableAnimeSource, ParsedAnimeHttpSource() { entryValues = PREF_QUALITY_ENTRIES setDefaultValue(PREF_QUALITY_DEFAULT) summary = "%s" - setOnPreferenceChangeListener { _, newValue -> - val selected = newValue as String - val index = findIndexOfValue(selected) - val entry = entryValues[index] as String - preferences.edit().putString(key, entry).commit() - } }.also(screen::addPreference) }