diff --git a/src/pt/betteranime/build.gradle b/src/pt/betteranime/build.gradle index 4c6c2e4a1..4d179d642 100644 --- a/src/pt/betteranime/build.gradle +++ b/src/pt/betteranime/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'Better Anime' pkgNameSuffix = 'pt.betteranime' extClass = '.BetterAnime' - extVersionCode = 6 + extVersionCode = 7 libVersion = '13' } diff --git a/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/BAFilters.kt b/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/BAFilters.kt index 2c0b71377..446001788 100644 --- a/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/BAFilters.kt +++ b/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/BAFilters.kt @@ -52,7 +52,7 @@ object BAFilters { internal fun getSearchParameters(filters: AnimeFilterList): FilterSearchParams { if (filters.isEmpty()) return FilterSearchParams() - val genres = listOf("") + filters.getFirst().state + val genres = listOf(" ") + filters.getFirst().state .mapNotNull { genre -> if (genre.state) { BAFiltersData.genres.find { it.first == genre.name }!!.second diff --git a/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/BetterAnime.kt b/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/BetterAnime.kt index 64edd1ba9..c8c1b9c8c 100644 --- a/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/BetterAnime.kt +++ b/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/BetterAnime.kt @@ -65,13 +65,16 @@ class BetterAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() { .add("Accept-Language", ACCEPT_LANGUAGE) // ============================== Popular =============================== - // The site doesn't have a popular anime tab, so we use the latest anime page instead. - override fun fetchPopularAnime(page: Int) = super.fetchLatestUpdates(page) + // The site doesn't have a true popular anime tab, + // so we use the latest added anime page instead. + override fun popularAnimeSelector() = latestUpdatesSelector() - override fun popularAnimeSelector() = throw Exception("not used") - override fun popularAnimeFromElement(element: Element) = throw Exception("not used") - override fun popularAnimeRequest(page: Int) = throw Exception("not used") - override fun popularAnimeNextPageSelector() = null + override fun popularAnimeFromElement(element: Element) = latestUpdatesFromElement(element) + + override fun popularAnimeRequest(page: Int): Request = + GET("$baseUrl/ultimosAdicionados?page=$page") + + override fun popularAnimeNextPageSelector() = latestUpdatesNextPageSelector() // ============================== Episodes ============================== override fun episodeListSelector(): String = "ul#episodesList > li.list-group-item-action > a" @@ -84,9 +87,7 @@ class BetterAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() { val episodeName = element.text() setUrlWithoutDomain(element.attr("href")) name = episodeName - episode_number = runCatching { - episodeName.substringAfterLast(" ").toFloat() - }.getOrDefault(0F) + episode_number = episodeName.substringAfterLast(" ").toFloatOrNull() ?: 0F } } @@ -291,7 +292,7 @@ class BetterAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() { ?.trim() } - private inline fun String.toPayloadData(name: String): PayloadData? { + private fun String.toPayloadData(name: String): PayloadData? { return when { isNotBlank() -> PayloadData(name = name, value = listOf(this)) else -> null