Koushoku: Added more filters (#12582)

src/en/koushoku/build.gradle

@@ -5,7 +5,7 @@ ext {
     extName = 'Koushoku'
     pkgNameSuffix = 'en.koushoku'
     extClass = '.Koushoku'
-    extVersionCode = 4
+    extVersionCode = 5
     isNsfw = true
 }
 

src/en/koushoku/src/eu/kanade/tachiyomi/extension/en/koushoku/Koushoku.kt

@@ -11,6 +11,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -75,17 +76,26 @@ class Koushoku : ParsedHttpSource() {
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("page", page.toString())
-            .addQueryParameter("q", query)
 
         val filterList = if (filters.isEmpty()) getFilterList() else filters
-        filterList.findInstance<SortFilter>()?.let {
+        filterList.findInstance<SortFilter>()?.addQueryParameter(url)
-            url.addQueryParameter("sort", it.toUriPart())
+        url.addQueryParameter("q", buildAdvQuery(query, filterList))
-        }
+        println(url)
-        filterList.findInstance<OrderFilter>()?.let {
+        return GET(url.toString(), headers)
-            url.addQueryParameter("order", it.toUriPart())
     }
 
-        return GET(url.toString(), headers)
+    private fun buildAdvQuery(query: String, filterList: FilterList): String {
+        val title = "title*:$query"
+        val filters: List<String> = filterList.filterIsInstance<Filter.Text>().map { filter ->
+            val included = mutableListOf<String>()
+            val excluded = mutableListOf<String>()
+            val name = if (filter.name.lowercase().contentEquals("tags")) "tag" else filter.name.lowercase()
+            filter.state.split(",").map(String::trim).filterNot(String::isBlank).forEach { entry ->
+                if (entry.startsWith("-")) excluded.add(entry) else included.add(entry)
+            }
+            "$name*:${included.joinToString(",")} -$name*:${excluded.joinToString(",")}"
+        }
+        return "$title ${filters.joinToString(" ")}"
     }
 
     override fun searchMangaSelector() = latestUpdatesSelector()
@@ -150,34 +160,58 @@ class Koushoku : ParsedHttpSource() {
     override fun imageUrlParse(document: Document) = throw UnsupportedOperationException("Not used")
 
     override fun getFilterList() = FilterList(
-        SortFilter(),
+        SortFilter(
-        OrderFilter()
-    )
-
-    private class SortFilter : UriPartFilter(
             "Sort",
             arrayOf(
-            Pair("Created Date", "created_at"),
+                Sortable("ID", "id"),
-            Pair("ID", "id"),
+                Sortable("Title", "title"),
-            Pair("Title", "title"),
+                Sortable("Created Date", "created_at"),
-            Pair("Published Date", "published_at")
+                Sortable("Uploaded Date", "published_at"),
+                Sortable("Pages", "pages"),
             )
+        ),
+        Filter.Header("Separate tags with commas (,)"),
+        Filter.Header("Prepend with dash (-) to exclude"),
+        ArtistFilter(),
+        CircleFilter(),
+        MagazineFilter(),
+        ParodyFilter(),
+        TagFilter(),
+        PagesFilter()
     )
 
-    private class OrderFilter : UriPartFilter(
+    // Adapted from Mangadex ext
-        "Order",
+    class SortFilter(displayName: String, private val sortables: Array<Sortable>) :
-        arrayOf(
+        Filter.Sort(
-            Pair("Descending", "desc"),
+            displayName,
-            Pair("Ascending", "asc"),
+            sortables.map(Sortable::title).toTypedArray(),
-        )
+            Selection(2, false)
-    )
+        ) {
-
+        fun addQueryParameter(url: HttpUrl.Builder) {
-    // Taken from nhentai ext
+            if (state != null) {
-    private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+                val sort = sortables[state!!.index].value
-        Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+                val order = when (state!!.ascending) {
-        fun toUriPart() = vals[state].second
+                    true -> "asc"
+                    false -> "desc"
                 }
 
+                url.addQueryParameter("sort", sort)
+                url.addQueryParameter("order", order)
+            }
+        }
+    }
+
+    data class Sortable(val title: String, val value: String) {
+        override fun toString(): String = title
+    }
+
+    class ArtistFilter : Filter.Text("Artist")
+    class CircleFilter : Filter.Text("Circle")
+    class MagazineFilter : Filter.Text("Magazine")
+    class ParodyFilter : Filter.Text("Parody")
+    class TagFilter : Filter.Text("Tags")
+    class PagesFilter : Filter.Text("Pages")
+
     // Taken from nhentai ext
     private inline fun <reified T> Iterable<*>.findInstance() = find { it is T } as? T