diff --git a/src/all/kavita/build.gradle b/src/all/kavita/build.gradle index b9296fad..ecf80205 100644 --- a/src/all/kavita/build.gradle +++ b/src/all/kavita/build.gradle @@ -2,7 +2,7 @@ ext { kmkVersionCode = 1 extName = 'Kavita' extClass = '.KavitaFactory' - extVersionCode = 33 + extVersionCode = 34 isNsfw = false } diff --git a/src/all/kavita/src/eu/kanade/tachiyomi/extension/all/kavita/Kavita.kt b/src/all/kavita/src/eu/kanade/tachiyomi/extension/all/kavita/Kavita.kt index a9cb9237..44e5b7ed 100644 --- a/src/all/kavita/src/eu/kanade/tachiyomi/extension/all/kavita/Kavita.kt +++ b/src/all/kavita/src/eu/kanade/tachiyomi/extension/all/kavita/Kavita.kt @@ -2030,7 +2030,7 @@ class Kavita(private val suffix: String = "") : ConfigurableSource, UnmeteredSou } val mangaList = filteredSeries.map { helper.createSeriesDto(it, apiUrl, apiKey) } - MangasPage(mangaList, false) + MangasPage(mangaList, helper.hasNextPage(response, result.size)) } catch (e: Exception) { Log.e(LOG_TAG, "Error parsing search results", e) throw IOException(intl["check_version"], e) diff --git a/src/all/kavita/src/eu/kanade/tachiyomi/extension/all/kavita/KavitaHelper.kt b/src/all/kavita/src/eu/kanade/tachiyomi/extension/all/kavita/KavitaHelper.kt index ccd71a64..2e23899c 100644 --- a/src/all/kavita/src/eu/kanade/tachiyomi/extension/all/kavita/KavitaHelper.kt +++ b/src/all/kavita/src/eu/kanade/tachiyomi/extension/all/kavita/KavitaHelper.kt @@ -45,14 +45,14 @@ class KavitaHelper { val seriesMap = SeriesMapper() - fun hasNextPage(response: Response): Boolean { + fun hasNextPage(response: Response, itemCount: Int? = null, pageSize: Int = 20): Boolean { val paginationHeader = response.header("Pagination") - var hasNextPage = false if (!paginationHeader.isNullOrEmpty()) { val paginationInfo = json.decodeFromString(paginationHeader) - hasNextPage = paginationInfo.currentPage < paginationInfo.totalPages + return paginationInfo.currentPage < paginationInfo.totalPages } - return hasNextPage + + return itemCount != null && itemCount >= pageSize } fun getIdFromUrl(url: String): Int {