From a269ca31b95aac6ec0d69acd5a7a859119c6d9da Mon Sep 17 00:00:00 2001
From: happywillow0 <45346080+happywillow0@users.noreply.github.com>
Date: Tue, 2 Mar 2021 13:10:31 -0500
Subject: [PATCH] [WPMangaReader] Theme Update - Fixes Pagination (#6032)
* Fixes WPMangaReader Page URL
- Fixes page URLs
- Removed unnecessary Ngomik override
- Incremented version code
* Remove comment
---
multisrc/overrides/wpmangareader/ngomik/src/Ngomik.kt | 5 -----
.../tachiyomi/multisrc/wpmangareader/WPMangaReader.kt | 6 +++---
.../multisrc/wpmangareader/WPMangaReaderGenerator.kt | 2 +-
3 files changed, 4 insertions(+), 9 deletions(-)
delete mode 100644 multisrc/overrides/wpmangareader/ngomik/src/Ngomik.kt
diff --git a/multisrc/overrides/wpmangareader/ngomik/src/Ngomik.kt b/multisrc/overrides/wpmangareader/ngomik/src/Ngomik.kt
deleted file mode 100644
index 6a0a0cc6b..000000000
--- a/multisrc/overrides/wpmangareader/ngomik/src/Ngomik.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package eu.kanade.tachiyomi.extension.id.ngomik
-
-import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader
-
-class Ngomik : WPMangaReader("Ngomik", "https://ngomik.net", "id", "/all-komik")
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt
index 40d0093b5..524346ea7 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt
@@ -32,7 +32,7 @@ abstract class WPMangaReader(
// popular
override fun popularMangaSelector() = ".utao .uta .imgu, .listupd .bs .bsx "
- override fun popularMangaRequest(page: Int) = GET("$baseUrl$mangaUrlDirectory/?page/$page&order=popular", headers)
+ override fun popularMangaRequest(page: Int) = GET("$baseUrl$mangaUrlDirectory/?page=$page&order=popular", headers)
override fun popularMangaFromElement(element: Element) = SManga.create().apply {
thumbnail_url = element.select("img").attr("src")
@@ -45,7 +45,7 @@ abstract class WPMangaReader(
// latest
override fun latestUpdatesSelector() = popularMangaSelector()
- override fun latestUpdatesRequest(page: Int) = GET("$baseUrl$mangaUrlDirectory/?page/$page&order=update", headers)
+ override fun latestUpdatesRequest(page: Int) = GET("$baseUrl$mangaUrlDirectory/?page=$page&order=update", headers)
override fun latestUpdatesFromElement(element: Element) = popularMangaFromElement(element)
@@ -60,7 +60,7 @@ abstract class WPMangaReader(
val order = filters.findInstance<OrderByFilter>()?.toUriPart()
return when {
- order!!.isNotEmpty() -> GET("$baseUrl$mangaUrlDirectory/?page/$page&order=$order")
+ order!!.isNotEmpty() -> GET("$baseUrl$mangaUrlDirectory/?page=$page&order=$order")
genre!!.isNotEmpty() -> GET("$baseUrl/genres/$genre/page/$page/?s=$query")
else -> GET("$baseUrl/page/$page/?s=$query")
}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt
index fa9eb16a4..b8520cfbf 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt
@@ -9,7 +9,7 @@ class WPMangaReaderGenerator : ThemeSourceGenerator {
override val themeClass = "WPMangaReader"
- override val baseVersionCode: Int = 1
+ override val baseVersionCode: Int = 2
override val sources = listOf(
SingleLang("Hikari Scan", "https://hikariscan.com.br", "pt-BR", overrideVersionCode = 1),