diff --git a/src/en/mangaeden/build.gradle b/src/en/mangaeden/build.gradle index 3454e7366..01011b4c8 100644 --- a/src/en/mangaeden/build.gradle +++ b/src/en/mangaeden/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: Mangaeden' pkgNameSuffix = 'en.mangaeden' extClass = '.Mangaeden' - extVersionCode = 4 + extVersionCode = 5 libVersion = '1.2' } diff --git a/src/en/mangaeden/src/eu/kanade/tachiyomi/extension/en/mangaeden/Mangaeden.kt b/src/en/mangaeden/src/eu/kanade/tachiyomi/extension/en/mangaeden/Mangaeden.kt index 0aa3c92aa..d8daf8b0c 100644 --- a/src/en/mangaeden/src/eu/kanade/tachiyomi/extension/en/mangaeden/Mangaeden.kt +++ b/src/en/mangaeden/src/eu/kanade/tachiyomi/extension/en/mangaeden/Mangaeden.kt @@ -20,7 +20,7 @@ class Mangaeden : ParsedHttpSource() { override val name = "Manga Eden" - override val baseUrl = "https://www.mangaeden.com" + override val baseUrl = "https://www2.mangaeden.com" override val lang = "en" diff --git a/src/it/itascan/build.gradle b/src/it/itascan/build.gradle deleted file mode 100644 index b0fb2cbd2..000000000 --- a/src/it/itascan/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' - -ext { - appName = 'Tachiyomi: ItaScan' - pkgNameSuffix = 'it.itascan' - extClass = '.ItaScan' - extVersionCode = 1 - libVersion = '1.2' -} - -dependencies { - compileOnly 'com.google.code.gson:gson:2.8.2' - compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' -} - -apply from: "$rootDir/common.gradle" diff --git a/src/it/itascan/res/mipmap-hdpi/ic_launcher.png b/src/it/itascan/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 7a3140770..000000000 Binary files a/src/it/itascan/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/src/it/itascan/res/mipmap-mdpi/ic_launcher.png b/src/it/itascan/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index b88c46920..000000000 Binary files a/src/it/itascan/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/src/it/itascan/res/mipmap-xhdpi/ic_launcher.png b/src/it/itascan/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 85ac21bc6..000000000 Binary files a/src/it/itascan/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/src/it/itascan/res/mipmap-xxhdpi/ic_launcher.png b/src/it/itascan/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 3813bb66f..000000000 Binary files a/src/it/itascan/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/src/it/itascan/res/mipmap-xxxhdpi/ic_launcher.png b/src/it/itascan/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index a79a1648c..000000000 Binary files a/src/it/itascan/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/src/it/itascan/res/web_hi_res_512.png b/src/it/itascan/res/web_hi_res_512.png deleted file mode 100644 index ccb5a7c31..000000000 Binary files a/src/it/itascan/res/web_hi_res_512.png and /dev/null differ diff --git a/src/it/itascan/src/eu/kanade/tachiyomi/extension/it/itascan/ItaScan.kt b/src/it/itascan/src/eu/kanade/tachiyomi/extension/it/itascan/ItaScan.kt deleted file mode 100644 index 8b8d43e8b..000000000 --- a/src/it/itascan/src/eu/kanade/tachiyomi/extension/it/itascan/ItaScan.kt +++ /dev/null @@ -1,150 +0,0 @@ -package eu.kanade.tachiyomi.extension.it.itascan - -import com.github.salomonbrys.kotson.fromJson -import com.github.salomonbrys.kotson.get -import com.google.gson.Gson -import com.google.gson.JsonObject -import eu.kanade.tachiyomi.network.GET -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.OkHttpClient -import okhttp3.Request -import okhttp3.Response -import org.jsoup.nodes.Document -import org.jsoup.nodes.Element - -class ItaScan : ParsedHttpSource() { - - override val name = "ItaScan" - - override val baseUrl = "https://itascan.info" - - override val lang = "it" - - override val supportsLatest = true - - override val client: OkHttpClient = network.cloudflareClient - - override fun headersBuilder(): Headers.Builder = super.headersBuilder() - .add("Referer", baseUrl) - - // Popular - - override fun popularMangaRequest(page: Int): Request { - return GET("$baseUrl/directory/?&page=$page", headers) - } - - override fun popularMangaSelector() = "div.col-xs-12 div.col-xs-6" - - override fun popularMangaFromElement(element: Element): SManga { - return SManga.create().apply { - element.select("h4 a").let { - title = it.text() - setUrlWithoutDomain(it.attr("href")) - } - thumbnail_url = element.select("img").attr("abs:src") - } - } - - override fun popularMangaNextPageSelector() = "ul.pagination a.next" - - // Latest - - override fun latestUpdatesRequest(page: Int): Request { - return GET(baseUrl, headers) - } - - override fun latestUpdatesParse(response: Response): MangasPage { - val mangas = response.asJsoup().select(latestUpdatesSelector()).map { latestUpdatesFromElement(it) } - .distinctBy { it.url } - - return MangasPage(mangas, false) - } - - override fun latestUpdatesSelector() = "table.table-last tbody tr:has(a)" - - override fun latestUpdatesFromElement(element: Element): SManga { - return SManga.create().apply { - element.select("a.index_tooltip").let { - title = it.text() - setUrlWithoutDomain(it.attr("href")) - } - } - } - - override fun latestUpdatesNextPageSelector(): String? = null - - // Search - - override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { - return GET("$baseUrl/directory/?searchManga=$query&page=$page", headers) - } - - override fun searchMangaSelector() = popularMangaSelector() - - override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element) - - override fun searchMangaNextPageSelector() = popularMangaNextPageSelector() - - // Details - - override fun mangaDetailsParse(document: Document): SManga { - return SManga.create().apply { - document.select("div[role=main] > div.row > div.col-xs-12").let { info -> - title = info.select("h3").text() - author = info.select("strong:contains(Autore:) + a").text() - thumbnail_url = info.select("img[alt]").attr("abs:src") - description = info.select("div.col-xs-12.col-md-12.hspace10").text() - info.select("div.col-md-8").first().let { - artist = it.select("strong:contains(Disegnatore:)").firstOrNull()?.nextSibling()?.toString() - genre = it.select("strong:contains(Genere:)").firstOrNull()?.nextSibling()?.toString() - status = it.select("strong:contains(Stato pubblicazione:)").firstOrNull()?.nextSibling()?.toString().toStatus() - } - } - } - } - - private fun String?.toStatus() = when { - this == null -> SManga.UNKNOWN - this.contains("Concluso", ignoreCase = true) -> SManga.COMPLETED - this.contains("In Corso", ignoreCase = true) -> SManga.ONGOING - else -> SManga.UNKNOWN - } - - // Chapters - - override fun chapterListSelector() = "table.table-last tbody tr:has(a)" - - override fun chapterFromElement(element: Element): SChapter { - return SChapter.create().apply { - element.select("td:first-child a").let { - name = it.text() - setUrlWithoutDomain(it.attr("href")) - } - scanlator = element.select("td:nth-child(3)").text() - } - } - - // Pages - - private val gson by lazy { Gson() } - - override fun pageListParse(document: Document): List { - return document.select("script:containsData(site_url)").first().data() - .substringAfter("pages =").substringBefore("title").trim().removeSuffix(",").let { jsonObject -> - gson.fromJson(jsonObject)["source"].asJsonArray.mapIndexed { i, json -> - Page(i, "", "https:" + json["image"].asString.replace("\\", "")) - } - } - } - - override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used") - - override fun getFilterList() = FilterList() -} diff --git a/src/it/mangaeden/build.gradle b/src/it/mangaeden/build.gradle index fbf0fbe49..3df53884a 100644 --- a/src/it/mangaeden/build.gradle +++ b/src/it/mangaeden/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: Mangaeden' pkgNameSuffix = 'it.mangaeden' extClass = '.Mangaeden' - extVersionCode = 4 + extVersionCode = 5 libVersion = '1.2' } diff --git a/src/it/mangaeden/src/eu/kanade/tachiyomi/extension/it/mangaeden/Mangaeden.kt b/src/it/mangaeden/src/eu/kanade/tachiyomi/extension/it/mangaeden/Mangaeden.kt index 5ac0d05d0..eeb5e682e 100644 --- a/src/it/mangaeden/src/eu/kanade/tachiyomi/extension/it/mangaeden/Mangaeden.kt +++ b/src/it/mangaeden/src/eu/kanade/tachiyomi/extension/it/mangaeden/Mangaeden.kt @@ -20,7 +20,7 @@ class Mangaeden : ParsedHttpSource() { override val name = "Manga Eden" - override val baseUrl = "https://www.mangaeden.com" + override val baseUrl = "https://www2.mangaeden.com" override val lang = "it"