diff --git a/src/pt/wickedwitchscannovo/build.gradle b/src/pt/wickedwitchscannovo/build.gradle
deleted file mode 100644
index ecce230da..000000000
--- a/src/pt/wickedwitchscannovo/build.gradle
+++ /dev/null
@@ -1,10 +0,0 @@
-ext {
- extName = 'Wicked Witch Scan'
- extClass = '.WickedWitchScan'
- themePkg = 'peachscan'
- baseUrl = 'https://wicked-witch-scan.com'
- overrideVersionCode = 1
- isNsfw = false
-}
-
-apply from: "$rootDir/common.gradle"
diff --git a/src/pt/wickedwitchscannovo/res/mipmap-hdpi/ic_launcher.png b/src/pt/wickedwitchscannovo/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 124bb4637..000000000
Binary files a/src/pt/wickedwitchscannovo/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/wickedwitchscannovo/res/mipmap-mdpi/ic_launcher.png b/src/pt/wickedwitchscannovo/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index b00cdb197..000000000
Binary files a/src/pt/wickedwitchscannovo/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/wickedwitchscannovo/res/mipmap-xhdpi/ic_launcher.png b/src/pt/wickedwitchscannovo/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index e7cf48d6c..000000000
Binary files a/src/pt/wickedwitchscannovo/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/wickedwitchscannovo/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/wickedwitchscannovo/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 02fbf16b8..000000000
Binary files a/src/pt/wickedwitchscannovo/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/wickedwitchscannovo/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/wickedwitchscannovo/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index f536697f6..000000000
Binary files a/src/pt/wickedwitchscannovo/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/pt/wickedwitchscannovo/src/eu/kanade/tachiyomi/extension/pt/wickedwitchscannovo/WickedWitchScan.kt b/src/pt/wickedwitchscannovo/src/eu/kanade/tachiyomi/extension/pt/wickedwitchscannovo/WickedWitchScan.kt
deleted file mode 100644
index 076a2ed1f..000000000
--- a/src/pt/wickedwitchscannovo/src/eu/kanade/tachiyomi/extension/pt/wickedwitchscannovo/WickedWitchScan.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package eu.kanade.tachiyomi.extension.pt.wickedwitchscannovo
-
-import eu.kanade.tachiyomi.multisrc.peachscan.PeachScan
-import eu.kanade.tachiyomi.network.interceptor.rateLimit
-import java.util.concurrent.TimeUnit
-
-class WickedWitchScan : PeachScan("Wicked Witch Scan", "https://wicked-witch-scan.com", "pt-BR") {
- // Source changed from Madara to PeachScan
- override val versionId = 2
-
- override val client = super.client.newBuilder()
- .rateLimit(1, 2, TimeUnit.SECONDS)
- .build()
-}
diff --git a/src/ru/mangabook/build.gradle b/src/ru/mangabook/build.gradle
deleted file mode 100644
index b9f479ca0..000000000
--- a/src/ru/mangabook/build.gradle
+++ /dev/null
@@ -1,7 +0,0 @@
-ext {
- extName = 'MangaBook'
- extClass = '.MangaBook'
- extVersionCode = 5
-}
-
-apply from: "$rootDir/common.gradle"
diff --git a/src/ru/mangabook/res/mipmap-hdpi/ic_launcher.png b/src/ru/mangabook/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 9e3bffe85..000000000
Binary files a/src/ru/mangabook/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/ru/mangabook/res/mipmap-mdpi/ic_launcher.png b/src/ru/mangabook/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 5a2af815a..000000000
Binary files a/src/ru/mangabook/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/ru/mangabook/res/mipmap-xhdpi/ic_launcher.png b/src/ru/mangabook/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index fe0a8b015..000000000
Binary files a/src/ru/mangabook/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/ru/mangabook/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/mangabook/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 5bfb27579..000000000
Binary files a/src/ru/mangabook/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/ru/mangabook/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/mangabook/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index e18139346..000000000
Binary files a/src/ru/mangabook/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/ru/mangabook/src/eu/kanade/tachiyomi/extension/ru/mangabook/MangaBook.kt b/src/ru/mangabook/src/eu/kanade/tachiyomi/extension/ru/mangabook/MangaBook.kt
deleted file mode 100644
index 2f844c090..000000000
--- a/src/ru/mangabook/src/eu/kanade/tachiyomi/extension/ru/mangabook/MangaBook.kt
+++ /dev/null
@@ -1,297 +0,0 @@
-package eu.kanade.tachiyomi.extension.ru.mangabook
-
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.source.model.Filter
-import eu.kanade.tachiyomi.source.model.FilterList
-import eu.kanade.tachiyomi.source.model.MangasPage
-import eu.kanade.tachiyomi.source.model.Page
-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.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import java.text.SimpleDateFormat
-import java.util.Locale
-
-class MangaBook : ParsedHttpSource() {
- // Info
- override val name = "MangaBook"
- override val baseUrl = "https://mangabook.org"
- override val lang = "ru"
- override val supportsLatest = true
- override val client: OkHttpClient = network.cloudflareClient
- private val userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36"
- override fun headersBuilder(): Headers.Builder = Headers.Builder()
- .add("User-Agent", userAgent)
- .add("Accept", "image/webp,*/*;q=0.8")
- .add("Referer", baseUrl)
-
- // Popular
- override fun popularMangaRequest(page: Int): Request =
- GET("$baseUrl/filterList?page=$page&ftype[]=0&status[]=0&sortBy=views", headers)
- override fun popularMangaNextPageSelector() = "a.page-link[rel=next]"
- override fun popularMangaSelector() = "article.short:not(.shnews) .short-in"
- override fun popularMangaFromElement(element: Element): SManga {
- return SManga.create().apply {
- element.select(".sh-desc a").first()!!.let {
- setUrlWithoutDomain(it.attr("href"))
- title = it.select("div.sh-title").text().split(" / ").min()
- }
- thumbnail_url = element.select(".short-poster.img-box > img").attr("src")
- }
- }
-
- // Latest
- override fun latestUpdatesRequest(page: Int) = GET(baseUrl, headers)
- override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()
- override fun latestUpdatesSelector() = popularMangaSelector()
- override fun latestUpdatesFromElement(element: Element): SManga = popularMangaFromElement(element)
-
- // Search
- override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
- val url = if (query.isNotBlank()) {
- "$baseUrl/dosearch?query=$query&page=$page"
- } else {
- val url = "$baseUrl/filterList?page=$page&ftype[]=0&status[]=0".toHttpUrl().newBuilder()
- (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
- when (filter) {
- is OrderBy -> {
- val ord = arrayOf("views", "rate", "name", "created_at")[filter.state]
- url.addQueryParameter("sortBy", ord)
- }
- is CategoryList -> {
- if (filter.state > 0) {
- val catQ = getCategoryList()[filter.state].query
- url.addQueryParameter("cat", catQ)
- }
- }
- is StatusList -> filter.state.forEach { status ->
- if (status.state) {
- url.addQueryParameter("status[]", status.id)
- }
- }
- is FormatList -> filter.state.forEach { forma ->
- if (forma.state) {
- url.addQueryParameter("ftype[]", forma.id)
- }
- }
- else -> {}
- }
- }
- return GET(url.build(), headers)
- }
- return GET(url, headers)
- }
-
- override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
- override fun searchMangaSelector(): String = popularMangaSelector()
- override fun searchMangaFromElement(element: Element): SManga {
- return SManga.create().apply {
- element.select(".flist.row a").first()!!.let {
- setUrlWithoutDomain(it.attr("href"))
- title = it.select("h4 strong").text().split(" / ").min()
- }
- thumbnail_url = element.select(".sposter img.img-responsive").attr("src")
- }
- }
-
- override fun searchMangaParse(response: Response): MangasPage {
- if (!response.request.url.toString().contains("dosearch")) {
- return popularMangaParse(response)
- }
- val document = response.asJsoup()
- val mangas = document.select(".manga-list li:not(.vis )").map { element ->
- searchMangaFromElement(element)
- }
- return MangasPage(mangas, false)
- }
-
- // Details
- override fun mangaDetailsParse(document: Document): SManga {
- val infoElement = document.select("article.full .fmid").first()!!
- val manga = SManga.create()
- val titlestr = document.select(".fheader h1").text().split(" / ").sorted()
- manga.title = titlestr.first()
- manga.thumbnail_url = infoElement.select("img.img-responsive").first()!!.attr("src")
- manga.author = infoElement.select(".vis:contains(Автор) > a").text()
- manga.artist = infoElement.select(".vis:contains(Художник) > a").text()
- manga.status = if (document.select(".fheader h2").text() == "Чтение заблокировано") {
- SManga.LICENSED
- } else {
- when (infoElement.select(".vis:contains(Статус) span.label").text()) {
- "Сейчас издаётся" -> SManga.ONGOING
- "Изданное" -> SManga.COMPLETED
- else -> SManga.UNKNOWN
- }
- }
-
- val rawCategory = infoElement.select(".vis:contains(Жанр (вид)) span.label").text()
- val category = when {
- rawCategory == "Веб-Манхва" -> "Манхва"
- rawCategory.isNotBlank() -> rawCategory
- else -> "Манхва"
- }
- manga.genre = infoElement.select(".vis:contains(Категории) > a").map { it.text() }.plusElement(category).joinToString { it.trim() }
- val ratingValue = infoElement.select(".rating").text().substringAfter("Рейтинг ").substringBefore("/").toFloat() * 2
- val ratingVotes = infoElement.select(".rating").text().substringAfter("голосов: ").substringBefore(" ")
- val ratingStar = when {
- ratingValue > 9.5 -> "★★★★★"
- ratingValue > 8.5 -> "★★★★✬"
- ratingValue > 7.5 -> "★★★★☆"
- ratingValue > 6.5 -> "★★★✬☆"
- ratingValue > 5.5 -> "★★★☆☆"
- ratingValue > 4.5 -> "★★✬☆☆"
- ratingValue > 3.5 -> "★★☆☆☆"
- ratingValue > 2.5 -> "★✬☆☆☆"
- ratingValue > 1.5 -> "★☆☆☆☆"
- ratingValue > 0.5 -> "✬☆☆☆☆"
- else -> "☆☆☆☆☆"
- }
- val altSelector = document.select(".vis:contains(Другие названия) span")
- var altName = ""
- if (altSelector.isNotEmpty()) {
- altName = "Альтернативные названия:\n" + altSelector.last()!!.text() + "\n\n"
- }
- manga.description = titlestr.last() + "\n" + ratingStar + " " + ratingValue + " (голосов: " + ratingVotes + ")\n" + altName + infoElement.select(".fdesc.slice-this").text()
- return manga
- }
-
- // Chapters
- override fun chapterListSelector(): String = ".chapters li:not(.volume )"
- override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply {
- val link = element.select("h5 a")
- name = element.attr("class").substringAfter("volume-") + ". " + link.text()
- chapter_number = name.substringAfter("Глава №").substringBefore(":").toFloat()
- setUrlWithoutDomain(link.attr("href") + "/1")
- date_upload = parseDate(element.select(".date-chapter-title-rtl").text().trim())
- }
- private fun parseDate(date: String): Long {
- return SimpleDateFormat("dd.MM.yyyy", Locale.US).parse(date)?.time ?: 0
- }
-
- // Pages
- override fun pageListParse(document: Document): List<Page> {
- return document.select(".reader-images img.img-responsive:not(.scan-page)").mapIndexed { i, img ->
- Page(i, "", img.attr("data-src").trim())
- }
- }
-
- override fun imageUrlParse(document: Document) = throw UnsupportedOperationException()
-
- // Filters
- private class CheckFilter(name: String, val id: String) : Filter.CheckBox(name)
-
- private class FormatList(formas: List<CheckFilter>) : Filter.Group<CheckFilter>("Тип", formas)
- private class StatusList(statuses: List<CheckFilter>) : Filter.Group<CheckFilter>("Статус", statuses)
-
- override fun getFilterList() = FilterList(
- OrderBy(),
- CategoryList(categoriesName),
- StatusList(getStatusList()),
- FormatList(getFormatList()),
- )
-
- private class OrderBy : Filter.Select<String>(
- "Сортировка",
- arrayOf("По популярности", "По рейтингу", "По алфавиту", "По дате выхода"),
- )
- private fun getFormatList() = listOf(
- CheckFilter("Манга", "1"),
- CheckFilter("Манхва", "2"),
- CheckFilter("Веб Манхва", "4"),
- CheckFilter("Маньхуа", "3"),
- )
-
- private fun getStatusList() = listOf(
- CheckFilter("Сейчас издаётся", "1"),
- CheckFilter("Анонсировано", "3"),
- CheckFilter("Изданное", "2"),
- )
-
- private class CategoryList(categories: Array<String>) : Filter.Select<String>("Категории", categories)
- private data class CatUnit(val name: String, val query: String)
- private val categoriesName = getCategoryList().map {
- it.name
- }.toTypedArray()
-
- private fun getCategoryList() = listOf(
- CatUnit("Без категории", "not"),
- CatUnit("16+", "16+"),
- CatUnit("Арт", "art"),
- CatUnit("Бара", "bara"),
- CatUnit("Боевик", "action"),
- CatUnit("Боевые искусства", "combatskill"),
- CatUnit("В цвете", "vcvete"),
- CatUnit("Вампиры", "vampaires"),
- CatUnit("Веб", "web"),
- CatUnit("Вестерн", "western"),
- CatUnit("Гарем", "harem"),
- CatUnit("Гендерная интрига", "genderintrigue"),
- CatUnit("Героическое фэнтези", "heroic_fantasy"),
- CatUnit("Детектив", "detective"),
- CatUnit("Дзёсэй", "josei"),
- CatUnit("Додзинси", "doujinshi"),
- CatUnit("Драма", "drama"),
- CatUnit("Ёнкома", "yonkoma"),
- CatUnit("Есси", "18+"),
- CatUnit("Зомби", "zombie"),
- CatUnit("Игра", "games"),
- CatUnit("Инцест", "incest"),
- CatUnit("Исекай", "isekai"),
- CatUnit("Искусство", "iskusstvo"),
- CatUnit("Исторический", "historical"),
- CatUnit("Киберпанк", "cyberpunk"),
- CatUnit("Кодомо", "kodomo"),
- CatUnit("Комедия", "comedy"),
- CatUnit("Культовое", "iconic"),
- CatUnit("литРПГ", "litrpg"),
- CatUnit("Любовь", "love"),
- CatUnit("Махо-сёдзё", "maho-shojo"),
- CatUnit("Меха", "robots"),
- CatUnit("Мистика", "mystery"),
- CatUnit("Мужская беременность", "male-pregnancy"),
- CatUnit("Музыка", "music"),
- CatUnit("Научная фантастика", "sciencefiction"),
- CatUnit("Новинки", "new"),
- CatUnit("Омегаверс", "omegavers"),
- CatUnit("Перерождение", "newlife"),
- CatUnit("Повседневность", "humdrum"),
- CatUnit("Постапокалиптика", "postapocalyptic"),
- CatUnit("Приключения", "adventure"),
- CatUnit("Психология", "psychology"),
- CatUnit("Романтика", "romance"),
- CatUnit("Самураи", "samurai"),
- CatUnit("Сборник", "compilation"),
- CatUnit("Сверхъестественное", "supernatural"),
- CatUnit("Сёдзё", "shojo"),
- CatUnit("Сёдзё-ай", "maho-shojo"),
- CatUnit("Сёнэн", "senen"),
- CatUnit("Сёнэн-ай", "shonen-ai"),
- CatUnit("Сетакон", "setakon"),
- CatUnit("Сингл", "singl"),
- CatUnit("Сказка", "fable"),
- CatUnit("Сорс", "bdsm"),
- CatUnit("Спорт", "sport"),
- CatUnit("Супергерои", "superheroes"),
- CatUnit("Сэйнэн", "seinen"),
- CatUnit("Танцы", "dancing"),
- CatUnit("Трагедия", "tragedy"),
- CatUnit("Триллер", "thriller"),
- CatUnit("Ужасы", "horror"),
- CatUnit("Фантастика", "fantastic"),
- CatUnit("Фурри", "furri"),
- CatUnit("Фэнтези", "fantasy"),
- CatUnit("Школа", "school"),
- CatUnit("Эротика", "erotica"),
- CatUnit("Этти", "etty"),
- CatUnit("Юмор", "humor"),
- CatUnit("Юри", "yuri"),
- CatUnit("Яой", "yaoi"),
- )
-}