From 66ca51cc73809181b159a99696d985b519557508 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sun, 5 Jul 2020 17:04:24 +0300 Subject: [PATCH] Fix MangaTown endless search --- app/build.gradle | 2 +- .../koitharu/kotatsu/core/parser/site/ChanRepository.kt | 2 +- .../kotatsu/core/parser/site/MangaTownRepository.kt | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6d1d97bc2..f15df6bdb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,7 @@ android { minSdkVersion 21 targetSdkVersion 29 versionCode gitCommits - versionName '0.5-b2' + versionName '0.5-rc1' kapt { arguments { diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt index 4a37b0b73..14c7cd15d 100644 --- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt +++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt @@ -23,7 +23,7 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe ): List { val domain = conf.getDomain(defaultDomain) val url = when { - query != null -> { + !query.isNullOrEmpty() -> { if (offset != 0) { return emptyList() } diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt index c9f1e0c2e..5493939a2 100644 --- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt +++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt @@ -37,7 +37,12 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposi } val page = (offset / 30) + 1 val url = when { - !query.isNullOrEmpty() -> "$scheme://$domain/search?name=${query.urlEncoded()}" + !query.isNullOrEmpty() -> { + if (offset != 0) { + return emptyList() + } + "$scheme://$domain/search?name=${query.urlEncoded()}" + } tag != null -> "$scheme://$domain/directory/${tag.key}/$page.htm$sortKey" else -> "$scheme://$domain/directory/$page.htm$sortKey" }