ZManga: fix/add Sekte Komik (#13466)

* reorder

* ZManga: add/fix Sekte Komik

- Move Sekte Komik from WPMangaThemesia to Zmanga theme
- reorder ZMangaGenerator

closes #13408

* add space

* rerun1

multisrc/overrides/mangathemesia/sektekomik/src/SekteKomik.kt

@@ -1,39 +0,0 @@
-package eu.kanade.tachiyomi.extension.id.sektekomik
-
-import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.interceptor.rateLimit
-import eu.kanade.tachiyomi.source.model.Page
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import java.text.SimpleDateFormat
-import java.util.Locale
-import java.util.concurrent.TimeUnit
-
-class SekteKomik : MangaThemesia("Sekte Komik", "https://sektekomik.com", "id", dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("id"))) {
-    // Formerly "Sekte Komik (WP Manga Stream)"
-    override val id = 7866629035053218469
-
-    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
-        .connectTimeout(10, TimeUnit.SECONDS)
-        .readTimeout(30, TimeUnit.SECONDS)
-        .rateLimit(4)
-        .build()
-
-    override fun headersBuilder(): Headers.Builder = Headers.Builder()
-        .add("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9")
-        .add("Accept-language", "en-US,en;q=0.9")
-        .add("Referer", baseUrl)
-
-    override fun imageRequest(page: Page): Request {
-        val newHeaders = headersBuilder()
-            .set("Accept", "image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8")
-            .set("Referer", baseUrl)
-            .build()
-
-        return GET(page.imageUrl!!, newHeaders)
-    }
-
-    override val hasProjectPage = true
-}

multisrc/overrides/zmanga/sektekomik/src/SekteKomik.kt

@@ -0,0 +1,100 @@
+package eu.kanade.tachiyomi.extension.id.sektekomik
+
+import eu.kanade.tachiyomi.multisrc.zmanga.ZManga
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
+import eu.kanade.tachiyomi.source.model.Filter
+import eu.kanade.tachiyomi.source.model.FilterList
+import eu.kanade.tachiyomi.source.model.SManga
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.jsoup.nodes.Element
+import java.util.concurrent.TimeUnit
+
+class SekteKomik : ZManga("Sekte Komik", "https://sektekomik.com", "id") {
+    // Formerly "Sekte Komik (WP Manga Stream)"
+    override val id = 7866629035053218469
+
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
+        .connectTimeout(10, TimeUnit.SECONDS)
+        .readTimeout(30, TimeUnit.SECONDS)
+        .rateLimit(3)
+        .build()
+
+    // popular
+    override fun popularMangaRequest(page: Int): Request {
+        return GET("$baseUrl")
+    }
+
+    override fun popularMangaSelector() = "div.flexbox-item"
+
+    override fun popularMangaFromElement(element: Element): SManga {
+        return SManga.create().apply {
+            setUrlWithoutDomain(element.select("a").attr("href"))
+            title = element.select("a").attr("title")
+            thumbnail_url = element.select("img").attr("abs:src")
+        }
+    }
+
+    override fun popularMangaNextPageSelector() = "Not used"
+
+    // latest
+    override fun latestUpdatesRequest(page: Int): Request {
+        return GET("$baseUrl/page/$page")
+    }
+
+    override fun latestUpdatesSelector() = "div.flexbox4-item"
+
+    override fun latestUpdatesFromElement(element: Element): SManga {
+        return SManga.create().apply {
+            setUrlWithoutDomain(element.select("div.flexbox4-content a").attr("href"))
+            title = element.select("div.flexbox4-side .title").first().text()
+            thumbnail_url = element.select("img").attr("abs:src")
+        }
+    }
+
+    override fun latestUpdatesNextPageSelector() = "div.pagination .next"
+
+    // search
+    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
+        var url = "$baseUrl/${pagePathSegment(page)}".toHttpUrlOrNull()!!.newBuilder()
+        url.addQueryParameter("s", query)
+        (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
+            when (filter) {
+                // if site has project page, default value "hasProjectPage" = false
+                is ProjectFilter -> {
+                    if (filter.toUriPart() == "project-filter-on") {
+                        url = "$baseUrl$projectPageString/${pagePathSegment(page)}".toHttpUrlOrNull()!!.newBuilder()
+                    }
+                }
+            }
+        }
+        return GET(url.toString(), headers)
+    }
+
+    override fun searchMangaSelector() = "div.flexbox2-item"
+
+    override fun searchMangaFromElement(element: Element): SManga {
+        return SManga.create().apply {
+            setUrlWithoutDomain(element.select("div.flexbox2-content a").attr("href"))
+            title = element.select("div.flexbox2-title > span").first().text()
+            thumbnail_url = element.select("img").attr("abs:src")
+        }
+    }
+
+    override fun searchMangaNextPageSelector() = latestUpdatesNextPageSelector()
+
+    // filter
+    override val hasProjectPage = true
+
+    override fun getFilterList(): FilterList {
+        val filters = mutableListOf<Filter<*>>(
+            Filter.Separator(),
+            Filter.Header("NOTE: cant be used with search!"),
+            Filter.Header("$name Project List page"),
+            ProjectFilter(),
+        )
+        return FilterList(filters)
+    }
+}

multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt

@@ -92,7 +92,6 @@ class MangaThemesiaGenerator : ThemeSourceGenerator {
         SingleLang("Sekaikomik", "https://www.sekaikomik.live", "id", isNsfw = true, overrideVersionCode = 9),
         SingleLang("Sekaikomik", "https://www.sekaikomik.site", "id", isNsfw = true, overrideVersionCode = 8),
         SingleLang("Sekte Doujin", "https://sektedoujin.club", "id", isNsfw = true, overrideVersionCode = 3),
-        SingleLang("Sekte Komik", "https://sektekomik.com", "id", overrideVersionCode = 4),
         SingleLang("Senpai Ediciones", "http://senpaiediciones.com", "es"),
         SingleLang("Shadow Mangas", "https://shadowmangas.com", "es"),
         SingleLang("Shea Manga", "https://sheakomik.com", "id", overrideVersionCode = 4),

multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zmanga/ZManga.kt

@@ -46,12 +46,12 @@ abstract class ZManga(
     override fun popularMangaNextPageSelector() = "div.pagination .next"
 
     // latest
-    override fun latestUpdatesSelector() = popularMangaSelector()
-
     override fun latestUpdatesRequest(page: Int): Request {
         return GET("$baseUrl/advanced-search/${pagePathSegment(page)}?order=update")
     }
 
+    override fun latestUpdatesSelector() = popularMangaSelector()
+
     override fun latestUpdatesFromElement(element: Element): SManga = popularMangaFromElement(element)
 
     override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()

multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zmanga/ZMangaGenerator.kt

@@ -12,9 +12,10 @@ class ZMangaGenerator : ThemeSourceGenerator {
     override val baseVersionCode: Int = 1
 
     override val sources = listOf(
-        SingleLang("Maid - Manga", "https://www.maid.my.id", "id", overrideVersionCode = 10, className = "MaidManga"),
-        SingleLang("KomikPlay", "https://komikplay.com", "id", overrideVersionCode = 1),
         SingleLang("Komikita", "https://komikita.org", "id"),
+        SingleLang("KomikPlay", "https://komikplay.com", "id", overrideVersionCode = 1),
+        SingleLang("Maid - Manga", "https://www.maid.my.id", "id", overrideVersionCode = 10, className = "MaidManga"),
+        SingleLang("Sekte Komik", "https://sektekomik.com", "id", overrideVersionCode = 25),
     )
 
     companion object {