From 5966e7db616f7d1e1cc4fbd16a65544834bfa7a3 Mon Sep 17 00:00:00 2001 From: e-shl <35057681+e-shl@users.noreply.github.com> Date: Fri, 10 Dec 2021 23:22:10 +0500 Subject: [PATCH] [RU]Comx fix filters (#10069) --- src/ru/comx/build.gradle | 2 +- .../tachiyomi/extension/ru/comx/ComX.kt | 137 ++++++++++-------- 2 files changed, 77 insertions(+), 62 deletions(-) diff --git a/src/ru/comx/build.gradle b/src/ru/comx/build.gradle index bfde6eff4..f6a6373d1 100644 --- a/src/ru/comx/build.gradle +++ b/src/ru/comx/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'ComX' pkgNameSuffix = 'ru.comx' extClass = '.ComX' - extVersionCode = 10 + extVersionCode = 11 } dependencies { diff --git a/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt b/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt index 1e3c471df..860f5a997 100644 --- a/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt +++ b/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt @@ -109,7 +109,7 @@ class ComX : ParsedHttpSource() { } is PubList -> filter.state.forEach { publisher -> if (publisher.state) { - url.addQueryParameter("field[publisher][${publisher.id}]", 1.toString()) + url.addQueryParameter("subCat[]", publisher.id) } } is GenreList -> filter.state.forEach { genre -> @@ -246,7 +246,7 @@ class ComX : ParsedHttpSource() { private class CheckFilter(name: String, val id: String) : Filter.CheckBox(name) private class TypeList(types: List) : Filter.Group("Тип выпуска", types) - private class PubList(publishers: List) : Filter.Group("Издатели", publishers) + private class PubList(publishers: List) : Filter.Group("Разделы", publishers) private class GenreList(genres: List) : Filter.Group("Жанры", genres) override fun getFilterList() = FilterList( @@ -263,67 +263,82 @@ class ComX : ParsedHttpSource() { ) private fun getPubList() = listOf( - CheckFilter("Amalgam Comics", "1"), - CheckFilter("Avatar Press", "2"), - CheckFilter("Bongo", "3"), - CheckFilter("Boom! Studios", "4"), - CheckFilter("DC Comics", "5"), - CheckFilter("DC/WildStorm", "6"), - CheckFilter("Dark Horse Comics", "7"), - CheckFilter("Disney", "8"), - CheckFilter("Dynamite Entertainment", "9"), - CheckFilter("IDW Publishing", "10"), - CheckFilter("Icon Comics", "11"), - CheckFilter("Image Comics", "12"), - CheckFilter("Marvel Comics", "13"), - CheckFilter("Marvel Knights", "14"), - CheckFilter("Max", "15"), - CheckFilter("Mirage", "16"), - CheckFilter("Oni Press", "17"), - CheckFilter("ShadowLine", "18"), - CheckFilter("Titan Comics", "19"), - CheckFilter("Top Cow", "20"), - CheckFilter("Ubisoft Entertainment", "21"), - CheckFilter("Valiant Comics", "22"), - CheckFilter("Vertigo", "23"), - CheckFilter("Viper Comics", "24"), - CheckFilter("Vortex", "25"), - CheckFilter("WildStorm", "26"), - CheckFilter("Zenescope Entertainment", "27"), + CheckFilter("Marvel", "2"), + CheckFilter("DC Comics", "14"), + CheckFilter("Dark Horse", "7"), + CheckFilter("IDW Publishing", "6"), + CheckFilter("Image", "4"), + CheckFilter("Vertigo", "8"), + CheckFilter("Dynamite Entertainment", "10"), + CheckFilter("Wildstorm", "5"), + CheckFilter("Avatar Press", "11"), + CheckFilter("Boom! Studios", "12"), + CheckFilter("Top Cow", "9"), + CheckFilter("Oni Press", "13"), + CheckFilter("Valiant", "15"), + CheckFilter("Icon Comics", "16"), + CheckFilter("Manga", "3"), + CheckFilter("Manhua", "45"), + CheckFilter("Manhwa", "44"), + CheckFilter("Разные комиксы", "18") ) private fun getGenreList() = listOf( - CheckFilter("Антиутопия", "1"), - CheckFilter("Бандитский ситком", "2"), - CheckFilter("Боевик", "3"), - CheckFilter("Вестерн", "4"), - CheckFilter("Детектив", "5"), - CheckFilter("Драма", "6"), - CheckFilter("История", "7"), - CheckFilter("Киберпанк", "8"), - CheckFilter("Комедия", "9"), - CheckFilter("Космоопера", "10"), - CheckFilter("Криминал", "11"), - CheckFilter("МелоДрама", "12"), - CheckFilter("Мистика", "13"), - CheckFilter("Нуар", "14"), - CheckFilter("Постапокалиптика", "15"), - CheckFilter("Приключения", "16"), - CheckFilter("Сверхъестественное", "17"), - CheckFilter("Сказка", "18"), - CheckFilter("Спорт", "19"), - CheckFilter("Стимпанк", "20"), - CheckFilter("Триллер", "21"), - CheckFilter("Ужасы", "22"), - CheckFilter("Фантастика", "23"), - CheckFilter("Фэнтези", "24"), - CheckFilter("Черный юмор", "25"), - CheckFilter("Экшн", "26"), - CheckFilter("Боевые искусства", "27"), - CheckFilter("Научная Фантастика", "28"), - CheckFilter("Психоделика", "29"), - CheckFilter("Психология", "30"), - CheckFilter("Романтика", "31"), - CheckFilter("Трагедия", "32"), + CheckFilter("Sci-Fi", "2"), + CheckFilter("Антиутопия", "3"), + CheckFilter("Апокалипсис", "4"), + CheckFilter("Боевик", "5"), + CheckFilter("Боевые искусства", "6"), + CheckFilter("Вампиры", "7"), + CheckFilter("Вестерн", "8"), + CheckFilter("Военный", "9"), + CheckFilter("Детектив", "10"), + CheckFilter("Драма", "11"), + CheckFilter("Зомби", "12"), + CheckFilter("Игры", "13"), + CheckFilter("Исекай", "14"), + CheckFilter("Исторический", "15"), + CheckFilter("Киберпанк", "16"), + CheckFilter("Комедия", "17"), + CheckFilter("Космоопера", "18"), + CheckFilter("Космос", "19"), + CheckFilter("Криминал", "20"), + CheckFilter("МелоДрама", "21"), + CheckFilter("Мистика", "22"), + CheckFilter("Научная Фантастика", "23"), + CheckFilter("Неотвратимость", "24"), + CheckFilter("Нуар", "25"), + CheckFilter("Паника", "26"), + CheckFilter("Пародия", "27"), + CheckFilter("Повседневность", "28"), + CheckFilter("Постапокалиптика", "29"), + CheckFilter("ПредательСредиНас", "30"), + CheckFilter("Приключения", "31"), + CheckFilter("Путешествия во времени", "32"), + CheckFilter("Сверхъестественное", "33"), + CheckFilter("Слэшер", "34"), + CheckFilter("Смерть", "35"), + CheckFilter("Супергерои", "36"), + CheckFilter("Супергероика", "37"), + CheckFilter("Сёнен", "38"), + CheckFilter("Тревога", "39"), + CheckFilter("Триллер", "40"), + CheckFilter("Ужасы", "41"), + CheckFilter("Фантасмагория", "42"), + CheckFilter("Фантастика", "43"), + CheckFilter("Фэнтези", "44"), + CheckFilter("Экшен", "45"), + CheckFilter("Экшн", "46"), + CheckFilter("Эротика", "47"), + CheckFilter("сэйнэн", "66"), + CheckFilter("сёдзё", "67"), + CheckFilter("сёнэн", "68"), + CheckFilter("сёнэн-ай", "69"), + CheckFilter("трагедия", "70"), + CheckFilter("фэнтези", "73"), + CheckFilter("школа", "74"), + CheckFilter("этти", "76"), + CheckFilter("яой", "77"), + ) }