From b7b46498c728b0ceb99d4b3e373ffe61b4a4293e Mon Sep 17 00:00:00 2001 From: hasanpasha Date: Sat, 22 Feb 2025 18:18:15 +0300 Subject: [PATCH 1/4] fix episodes order: reverse --- .../animeextension/all/shabakatycinemana/ShabakatyCinemana.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt b/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt index de6d7488..e8f72120 100644 --- a/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt +++ b/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt @@ -335,7 +335,7 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() { { it.name.split(SEASON_EPISODE_DELIMITER).first().parseAs() }, { it.name.split(SEASON_EPISODE_DELIMITER).last().parseAs() }, ), - ) + ).reversed() } else { return listOf( SEpisode.create().apply { From f5ea928758ea9921c70b552e98f7f6801198ce53 Mon Sep 17 00:00:00 2001 From: hasanpasha Date: Sat, 22 Feb 2025 18:43:37 +0300 Subject: [PATCH 2/4] fix: animePage hasNextPage for popular, search, and latest --- .../all/shabakatycinemana/ShabakatyCinemana.kt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt b/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt index e8f72120..22a3066d 100644 --- a/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt +++ b/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt @@ -225,7 +225,7 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() { override fun latestUpdatesParse(response: Response): AnimesPage { val animeList = response.asModelList(SAnimeDeserializer) - return AnimesPage(animeList, animeList.size < LATEST_ITEMS_PER_PAGE) + return AnimesPage(animeList, animeList.size == LATEST_ITEMS_PER_PAGE) } override fun popularAnimeRequest(page: Int): Request { @@ -239,7 +239,7 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() { override fun popularAnimeParse(response: Response): AnimesPage { val animeList = response.asModelList(SAnimeDeserializer) - return AnimesPage(animeList, animeList.size < POPULAR_ITEMS_PER_PAGE) + return AnimesPage(animeList, animeList.size == POPULAR_ITEMS_PER_PAGE) } override suspend fun getSearchAnime( @@ -295,10 +295,11 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() { val resp = client.newCall(GET(url, headers)).execute() // Todo: remove SAnimeWithInfo data class if no longer needed val animeListWithInfo = resp.asModel(SAnimeWithInfoDeserializer) - return AnimesPage(animeListWithInfo.animes, animeListWithInfo.animes.isNotEmpty()) + return AnimesPage(animeListWithInfo.animes, animeListWithInfo.animes.size == POPULAR_ITEMS_PER_PAGE) } else { // star=8&year=1900,2025 url = url.newBuilder() + .addQueryParameter("level", "0") .addPathSegment("AdvancedSearch") .addQueryParameter("type", kindName) .addQueryParameter("page", "${page - 1}") @@ -310,13 +311,17 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() { } if (query.isNotBlank()) { - url = url.newBuilder().addQueryParameter("videoTitle", query).build() + url = url.newBuilder() + .addQueryParameter("videoTitle", query) + .addQueryParameter("staffTitle", query) + .build() } println(url) val resp = client.newCall(GET(url, headers)).execute() val animeList = resp.asModelList(SAnimeDeserializer) - return AnimesPage(animeList, animeList.size < SEARCH_ITEMS_PER_PAGE) + println("search has next page: ${animeList.size} == $SEARCH_ITEMS_PER_PAGE ${animeList.size == SEARCH_ITEMS_PER_PAGE}") + return AnimesPage(animeList, animeList.size == SEARCH_ITEMS_PER_PAGE) } } From b0c714a162983a629b3971eae6f1c083344b132a Mon Sep 17 00:00:00 2001 From: hasanpasha Date: Sat, 22 Feb 2025 18:44:48 +0300 Subject: [PATCH 3/4] remove debug prints --- .../animeextension/all/shabakatycinemana/ShabakatyCinemana.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt b/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt index 22a3066d..5370f8b9 100644 --- a/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt +++ b/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt @@ -233,7 +233,6 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() { val kind = KINDS_LIST.first { it.first == kindPref }.second val url = "$apiBaseUrl/video/V/2/itemsPerPage/$POPULAR_ITEMS_PER_PAGE/level/0/videoKind/$kind/sortParam/desc/pageNumber/${page - 1}" - println(url) return GET(url, headers) } @@ -291,7 +290,6 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() { .addQueryParameter("orderby", browseResultSort) .build() - println(url) val resp = client.newCall(GET(url, headers)).execute() // Todo: remove SAnimeWithInfo data class if no longer needed val animeListWithInfo = resp.asModel(SAnimeWithInfoDeserializer) @@ -317,10 +315,8 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() { .build() } - println(url) val resp = client.newCall(GET(url, headers)).execute() val animeList = resp.asModelList(SAnimeDeserializer) - println("search has next page: ${animeList.size} == $SEARCH_ITEMS_PER_PAGE ${animeList.size == SEARCH_ITEMS_PER_PAGE}") return AnimesPage(animeList, animeList.size == SEARCH_ITEMS_PER_PAGE) } } From 1926ce834c47f5227502c995f09763cfa337f6ac Mon Sep 17 00:00:00 2001 From: hasanpasha Date: Sat, 22 Feb 2025 18:45:33 +0300 Subject: [PATCH 4/4] bump version to 2 --- src/all/shabakatycinemana/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/all/shabakatycinemana/build.gradle b/src/all/shabakatycinemana/build.gradle index f9455ea1..f01ac7ca 100644 --- a/src/all/shabakatycinemana/build.gradle +++ b/src/all/shabakatycinemana/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'ShabakatyCinemana' extClass = '.ShabakatyCinemana' - extVersionCode = 1 + extVersionCode = 2 isNsfw = false }