diff --git a/src/es/tumangaonline/build.gradle b/src/es/tumangaonline/build.gradle
deleted file mode 100755
index 2ebebce8b..000000000
--- a/src/es/tumangaonline/build.gradle
+++ /dev/null
@@ -1,20 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-
-ext {
- appName = 'Tachiyomi: TuMangaOnline'
- pkgNameSuffix = 'es.tumangaonline'
- extClass = '.TuMangaOnline'
- extVersionCode = 24
- libVersion = '1.2'
-}
-
-dependencies {
- implementation project(':lib-ratelimit')
- compileOnly project(':preference-stub')
- compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440'
- compileOnly 'com.google.code.gson:gson:2.8.5'
- compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0'
-}
-
-apply from: "$rootDir/common.gradle"
diff --git a/src/es/tumangaonline/res/mipmap-hdpi/ic_launcher.png b/src/es/tumangaonline/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100755
index 9b90ad753..000000000
Binary files a/src/es/tumangaonline/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/tumangaonline/res/mipmap-mdpi/ic_launcher.png b/src/es/tumangaonline/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100755
index 46b23e86c..000000000
Binary files a/src/es/tumangaonline/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/tumangaonline/res/mipmap-xhdpi/ic_launcher.png b/src/es/tumangaonline/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100755
index bc084f08f..000000000
Binary files a/src/es/tumangaonline/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/tumangaonline/res/mipmap-xxhdpi/ic_launcher.png b/src/es/tumangaonline/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100755
index 04fc3ae88..000000000
Binary files a/src/es/tumangaonline/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/tumangaonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/tumangaonline/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100755
index d77b493d7..000000000
Binary files a/src/es/tumangaonline/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt b/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt
deleted file mode 100755
index 44107c44e..000000000
--- a/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt
+++ /dev/null
@@ -1,512 +0,0 @@
-package eu.kanade.tachiyomi.extension.es.tumangaonline
-
-import android.app.Application
-import android.content.SharedPreferences
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
-import android.util.Log
-import okhttp3.*
-import java.util.*
-import org.jsoup.nodes.Element
-import org.jsoup.nodes.Document
-import java.text.SimpleDateFormat
-import java.util.concurrent.TimeUnit
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.source.model.*
-import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
-import eu.kanade.tachiyomi.source.ConfigurableSource
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-
-class TuMangaOnline : ConfigurableSource, ParsedHttpSource() {
-
- //Basic Info
- override val name = "TuMangaOnline"
- override val baseUrl = "https://tmofans.com"
- override val lang = "es"
- override val supportsLatest = true
-
- //Network
- private val rateLimitInterceptor = RateLimitInterceptor(2)
-
- override val client: OkHttpClient = network.cloudflareClient.newBuilder()
- .addNetworkInterceptor(rateLimitInterceptor)
- .connectTimeout(1, TimeUnit.MINUTES)
- .readTimeout(1, TimeUnit.MINUTES)
- .retryOnConnectionFailure(true)
- .followRedirects(true)
- .build()!!
-
- private val userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.87 Safari/537.36" //last updated 2020/02/04
-
- override fun headersBuilder(): Headers.Builder {
- return Headers.Builder()
- .add("User-Agent", userAgent)
- .add("Referer", "$baseUrl/")
- .add("Cache-mode", "no-cache")
- }
-
- //Process Chapter Redirect
- private fun getBuilder(url: String, headers: Headers, formBody: FormBody?, method: String): String {
- val req = Request.Builder()
- .headers(headers)
- .url(url)
- .method(method,formBody)
- .build()
-
- return client.newCall(req)
- .execute()
- .request()
- .url()
- .toString()
- }
-
- private val preferences: SharedPreferences by lazy {
- Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
- }
-
- //Popular Latest and Search
-
- override fun popularMangaSelector() = "div.element"
-
- override fun latestUpdatesSelector() = "div.upload-file-row"
- //override fun latestUpdatesSelector() = popularMangaSelector()
-
- override fun popularMangaRequest(page: Int) = GET("$baseUrl/library?order_item=likes_count&order_dir=desc&filter_by=title&_title=search&page=$page", headers)
-
- //override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/library?order_item=creation&order_dir=desc&type=&filter_by=title&page=$page", headers)
- override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/latest_uploads?page=$page&uploads_mode=thumbnail", headers)
-
- override fun popularMangaFromElement(element: Element) = SManga.create().apply {
- element.select("div.element > a").let {
- setUrlWithoutDomain(it.attr("href").substringAfter(" "))
- title = it.select("h4.text-truncate").text()
- thumbnail_url = it.select("style").toString().substringAfter("('").substringBeforeLast("')")
- }
- }
-
- override fun latestUpdatesParse(response: Response): MangasPage {
- val document = response.asJsoup()
- val mangas = document.select(latestUpdatesSelector())
- .distinctBy { it.select("div.thumbnail-title > h4.text-truncate").text().trim() }
- .map { latestUpdatesFromElement(it) }
- val hasNextPage = latestUpdatesNextPageSelector().let { selector ->
- document.select(selector).first()
- } != null
- return MangasPage(mangas, hasNextPage)
- }
-
- override fun latestUpdatesFromElement(element: Element) = SManga.create().apply {
- element.select("div.upload-file-row > a").let {
- setUrlWithoutDomain(it.attr("href"))
- title = it.select("div.thumbnail-title > h4.text-truncate").text()
- thumbnail_url = it.select("div.thumbnail > style").toString().substringAfter("url('").substringBefore("');")
- }
- }
-
- override fun mangaDetailsParse(document: Document) = SManga.create().apply {
- document.select("h5.card-title").let {
- author = it?.first()?.attr("title")?.substringAfter(", ")
- artist = it?.last()?.attr("title")?.substringAfter(", ")
- }
-
- genre = document.select("a.py-2").joinToString(", ") {
- it.text()
- }
-
- description = document.select("p.element-description")?.text()
- status = parseStatus(document.select("span.book-status")?.text().orEmpty())
- thumbnail_url = document.select(".book-thumbnail").attr("src")
- }
-
- private fun parseStatus(status: String) = when {
- status.contains("Publicándose") -> SManga.ONGOING
- status.contains("Finalizado") -> SManga.COMPLETED
- else -> SManga.UNKNOWN
- }
-
- override fun popularMangaNextPageSelector() = "a.page-link"
-
- override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()
-
- override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
- val url = HttpUrl.parse("$baseUrl/library")!!.newBuilder()
-
- url.addQueryParameter("title", query)
- url.addQueryParameter("page", page.toString())
- url.addQueryParameter("_title", "search")
-
- filters.forEach { filter ->
- when (filter) {
- is Types -> {
- url.addQueryParameter("type", filter.toUriPart())
- }
- is Demography -> {
- url.addQueryParameter("demography", filter.toUriPart())
- }
- is FilterBy -> {
- url.addQueryParameter("filter_by", filter.toUriPart())
- }
- is OrderBy -> {
- url.addQueryParameter("order_item", filter.toUriPart())
- }
- is OrderDir -> {
- url.addQueryParameter("order_dir", filter.toUriPart())
- }
- is WebcomicFilter -> {
- url.addQueryParameter("webcomic", when (filter.state) {
- Filter.TriState.STATE_INCLUDE -> "true"
- Filter.TriState.STATE_EXCLUDE -> "false"
- else -> ""
- })
- }
- is FourKomaFilter -> {
- url.addQueryParameter("yonkoma", when (filter.state) {
- Filter.TriState.STATE_INCLUDE -> "true"
- Filter.TriState.STATE_EXCLUDE -> "false"
- else -> ""
- })
- }
- is AmateurFilter -> {
- url.addQueryParameter("amateur", when (filter.state) {
- Filter.TriState.STATE_INCLUDE -> "true"
- Filter.TriState.STATE_EXCLUDE -> "false"
- else -> ""
- })
- }
- is EroticFilter -> {
- url.addQueryParameter("erotic", when (filter.state) {
- Filter.TriState.STATE_INCLUDE -> "true"
- Filter.TriState.STATE_EXCLUDE -> "false"
- else -> ""
- })
- }
- is GenreList -> {
- filter.state
- .filter { genre -> genre.state }
- .forEach { genre -> url.addQueryParameter("genders[]", genre.id) }
- }
- }
- }
-
- return GET(url.build().toString(), headers)
- }
-
- override fun searchMangaSelector() = popularMangaSelector()
-
- override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)
-
- override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
-
- //Chapters
-
- override fun chapterListParse(response: Response): List<SChapter> {
- val document = response.asJsoup()
- val chapterurl = response.request().url().toString()
- val chapteridselector = ""
- // One-shot
- if (document.select("div.chapters").isEmpty()) {
- return document.select(oneShotChapterListSelector()).map { oneShotChapterFromElement(it, chapterurl, chapteridselector) }
- }
-
- // Regular list of chapters
- val chapters = mutableListOf<SChapter>()
- document.select(regularChapterListSelector()).forEach { chapelement ->
- val chapternumber = chapelement.select("a.btn-collapse").text().substringBefore(":").substringAfter("Capítulo").trim().toFloat()
- val chaptername = chapelement.select("div.col-10.text-truncate").text()
- val scanelement = chapelement.select("ul.chapter-list > li")
- val dupselect = getduppref()!!
- if (dupselect=="one") {
- scanelement.first { chapters.add(regularChapterFromElement(it, chaptername, chapternumber, chapterurl, chapteridselector)) }
- }
- else {
- scanelement.forEach { chapters.add(regularChapterFromElement(it, chaptername, chapternumber, chapterurl, chapteridselector)) }
- }
- }
- return chapters
- }
-
- override fun chapterListSelector() = throw UnsupportedOperationException("Not used")
- override fun chapterFromElement(element: Element) = throw UnsupportedOperationException("Not used")
-
- private fun oneShotChapterListSelector() = "div.chapter-list-element > ul.list-group li.list-group-item"
-
- private fun oneShotChapterFromElement(element: Element, chapterurl: String, chapteridselector: String) = SChapter.create().apply {
- url = "$chapterurl#${element.select("div.row > .text-right > form").attr("id")}"
- name = "One Shot"
- scanlator = element.select("div.col-md-6.text-truncate")?.text()
- date_upload = element.select("span.badge.badge-primary.p-2").first()?.text()?.let { parseChapterDate(it) } ?: 0
- }
-
- private fun regularChapterListSelector() = "div.chapters > ul.list-group li.p-0.list-group-item"
-
- private fun regularChapterFromElement(element: Element, chname: String, number: Float, chapterurl: String, chapteridselector: String) = SChapter.create().apply {
- url = "$chapterurl#${element.select("div.row > .text-right > form").attr("id")}"
- name = chname
- chapter_number = number
- scanlator = element.select("div.col-md-6.text-truncate")?.text()
- date_upload = element.select("span.badge.badge-primary.p-2").first()?.text()?.let { parseChapterDate(it) } ?: 0
- }
-
- private fun parseChapterDate(date: String): Long = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(date).time
- private fun serverTime() :String {
- val formatter = SimpleDateFormat("'?'s'='yyyy-MM-dd'T'kk:mm:ss.SSS'Z'", Locale.US) //URL String + ISO Time
- formatter.timeZone = TimeZone.getTimeZone("GMT") //ISO Time
- return formatter.format(Date())
- }
-
- //Pages and Images
-
- override fun pageListRequest(chapter: SChapter): Request {
- val (chapterURL, chapterID) = chapter.url.split("#")
- val response = client.newCall(GET(chapterURL, headers)).execute() //Get chapter page for current token
- val document = response.asJsoup()
- val geturl = document.select("form#$chapterID").attr("action")+serverTime() //Get redirect URL
- val token = document.select("form#$chapterID input").attr("value") //Get token
- val method = document.select("form#$chapterID").attr("method") //Check POST or GET
-
- val getHeaders = headersBuilder()
- .add("User-Agent", userAgent)
- .add("Referer", chapterURL)
- .add("Content-Type", "application/x-www-form-urlencoded")
- .build()
-
- val formBody = when (method) {
- "GET" -> null
- "POST" -> FormBody.Builder()
- .add("_token", token)
- .build()
- else -> throw UnsupportedOperationException("Unknown method. Open GitHub issue")
- }
-
- val url = getBuilder(geturl,getHeaders,formBody,method).substringBeforeLast("/") + "/${getPageMethod()}"
-
- val headers = headersBuilder()
- .add("User-Agent", userAgent)
- .add("Referer", chapterURL)
- .build()
-
- return GET(url, headers)
- }
-
- override fun pageListParse(document: Document): List<Page> = mutableListOf<Page>().apply {
- if (getPageMethod()=="cascade") { // Get /cascade instead of /paginate to get all pages at once
- val style = document.select("style:containsData(height)").html()
- document.select( " .img-container > .viewer-img").filterNot { it.attr("id") in style }.forEach {
- add(Page(size, "", it.attr("src")))
- }
- } else { //If they mess with cascade, paginate is a backup
- val pageList = document.select("#viewer-pages-select").first().select("option").map { it.attr("value").toInt() }
- val url = document.baseUri()
- pageList.forEach {
- add(Page(it, "$url/$it"))
- }
- }
- }
-
- override fun imageUrlParse(document: Document): String = document.select("div.viewer-container > div.img-container > img.viewer-image").attr("src")
-
- private class Types : UriPartFilter("Tipo", arrayOf(
- Pair("Ver todo", ""),
- Pair("Manga", "manga"),
- Pair("Manhua", "manhua"),
- Pair("Manhwa", "manhwa"),
- Pair("Novela", "novel"),
- Pair("One shot", "one_shot"),
- Pair("Doujinshi", "doujinshi"),
- Pair("Oel", "oel")
- ))
-
- private class Demography : UriPartFilter("Demografía", arrayOf(
- Pair("Ver todo", ""),
- Pair("Seinen", "seinen"),
- Pair("Shoujo", "shoujo"),
- Pair("Shounen", "shounen"),
- Pair("Josei", "josei"),
- Pair("Kodomo", "kodomo")
- ))
-
- private class FilterBy : UriPartFilter("Ordenar por", arrayOf(
- Pair("Título", "title"),
- Pair("Autor", "author"),
- Pair("Compañia", "company")
- ))
-
- private class OrderBy : UriPartFilter("Ordenar por", arrayOf(
- Pair("Me gusta", "likes_count"),
- Pair("Alfabético", "alphabetically"),
- Pair("Puntuación", "score"),
- Pair("Creación", "creation"),
- Pair("Fecha estreno", "release_date")
- ))
-
- private class OrderDir : UriPartFilter("Ordenar por", arrayOf(
- Pair("ASC", "asc"),
- Pair("DESC", "desc")
- ))
-
- private class WebcomicFilter : Filter.TriState("Webcomic")
- private class FourKomaFilter : Filter.TriState("Yonkoma")
- private class AmateurFilter : Filter.TriState("Amateur")
- private class EroticFilter : Filter.TriState("Erótico")
-
- private class Genre(name: String, val id: String) : Filter.CheckBox(name)
- private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Géneros", genres)
-
- override fun getFilterList() = FilterList(
- Types(),
- Demography(),
- Filter.Separator(),
- FilterBy(),
- OrderBy(),
- OrderDir(),
- Filter.Separator(),
- WebcomicFilter(),
- FourKomaFilter(),
- AmateurFilter(),
- EroticFilter(),
- GenreList(getGenreList())
- )
-
- // Array.from(document.querySelectorAll('#books-genders .col-auto .custom-control')).map(a => `Genre("${a.querySelector('label').innerText}", "${a.querySelector('input').value}")`).join(',\n')
- // on https://tumangaonline.me/library
- private fun getGenreList() = listOf(
- Genre("Acción", "1"),
- Genre("Aventura", "2"),
- Genre("Comedia", "3"),
- Genre("Drama", "4"),
- Genre("Recuentos de la vida", "5"),
- Genre("Ecchi", "6"),
- Genre("Fantasia", "7"),
- Genre("Magia", "8"),
- Genre("Sobrenatural", "9"),
- Genre("Horror", "10"),
- Genre("Misterio", "11"),
- Genre("Psicológico", "12"),
- Genre("Romance", "13"),
- Genre("Ciencia Ficción", "14"),
- Genre("Thriller", "15"),
- Genre("Deporte", "16"),
- Genre("Girls Love", "17"),
- Genre("Boys Love", "18"),
- Genre("Harem", "19"),
- Genre("Mecha", "20"),
- Genre("Supervivencia", "21"),
- Genre("Reencarnación", "22"),
- Genre("Gore", "23"),
- Genre("Apocalíptico", "24"),
- Genre("Tragedia", "25"),
- Genre("Vida Escolar", "26"),
- Genre("Historia", "27"),
- Genre("Militar", "28"),
- Genre("Policiaco", "29"),
- Genre("Crimen", "30"),
- Genre("Superpoderes", "31"),
- Genre("Vampiros", "32"),
- Genre("Artes Marciales", "33"),
- Genre("Samurái", "34"),
- Genre("Género Bender", "35"),
- Genre("Realidad Virtual", "36"),
- Genre("Ciberpunk", "37"),
- Genre("Musica", "38"),
- Genre("Parodia", "39"),
- Genre("Animación", "40"),
- Genre("Demonios", "41"),
- Genre("Familia", "42"),
- Genre("Extranjero", "43"),
- Genre("Niños", "44"),
- Genre("Realidad", "45"),
- Genre("Telenovela", "46"),
- Genre("Guerra", "47"),
- Genre("Oeste", "48")
- )
-
- private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
- Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
- fun toUriPart() = vals[state].second
- }
-
- // Preferences Code
-
- override fun setupPreferenceScreen(screen: androidx.preference.PreferenceScreen) {
- val deduppref = androidx.preference.ListPreference(screen.context).apply {
- key = DEDUP_PREF_Title
- title = DEDUP_PREF_Title
- entries = arrayOf("All scanlators", "One scanlator per chapter")
- entryValues = arrayOf("all", "one")
- summary = "%s"
-
- setOnPreferenceChangeListener { _, newValue ->
- val selected = newValue as String
- val index = this.findIndexOfValue(selected)
- val entry = entryValues.get(index) as String
- preferences.edit().putString(DEDUP_PREF, entry).commit()
- }
- }
-
- val pageMethod = androidx.preference.ListPreference(screen.context).apply {
- key = PAGEGET_PREF_Title
- title = PAGEGET_PREF_Title
- entries = arrayOf("Cascada", "Paginada")
- entryValues = arrayOf("cascade", "paginated")
- summary = "%s"
-
- setOnPreferenceChangeListener { _, newValue ->
- val selected = newValue as String
- val index = this.findIndexOfValue(selected)
- val entry = entryValues.get(index) as String
- preferences.edit().putString(PAGEGET_PREF, entry).commit()
- }
- }
- screen.addPreference(deduppref)
- screen.addPreference(pageMethod)
- }
-
- override fun setupPreferenceScreen(screen: PreferenceScreen) {
- val deduppref = ListPreference(screen.context).apply {
- key = DEDUP_PREF_Title
- title = DEDUP_PREF_Title
- entries = arrayOf("All scanlators", "One scanlator per chapter")
- entryValues = arrayOf("all", "one")
- summary = "%s"
-
- setOnPreferenceChangeListener { _, newValue ->
- val selected = newValue as String
- val index = this.findIndexOfValue(selected)
- val entry = entryValues.get(index) as String
- preferences.edit().putString(DEDUP_PREF, entry).commit()
- }
- }
-
- val pageMethod = ListPreference(screen.context).apply {
- key = PAGEGET_PREF_Title
- title = PAGEGET_PREF_Title
- entries = arrayOf("Cascada", "Paginada")
- entryValues = arrayOf("cascade", "paginated")
- summary = "%s"
-
- setOnPreferenceChangeListener { _, newValue ->
- val selected = newValue as String
- val index = this.findIndexOfValue(selected)
- val entry = entryValues.get(index) as String
- preferences.edit().putString(PAGEGET_PREF, entry).commit()
- }
- }
- screen.addPreference(deduppref)
- screen.addPreference(pageMethod)
-
- }
-
- private fun getduppref() = preferences.getString(DEDUP_PREF, "all")
- private fun getPageMethod() = preferences.getString(PAGEGET_PREF, "cascade")
-
-
- companion object {
- private const val DEDUP_PREF_Title = "Chapter List Scanlator Preference"
- private const val DEDUP_PREF = "deduppref"
- private const val PAGEGET_PREF_Title = "Método para obtener imágenes"
- private const val PAGEGET_PREF = "pagemethodpref"
- }
-}