From d444cb1365a8284b0acb74dcd47de647c1a22740 Mon Sep 17 00:00:00 2001 From: Rolando Lecca <90949336+bapeey@users.noreply.github.com> Date: Fri, 26 May 2023 15:48:31 -0500 Subject: [PATCH] Fix ScamberTraslator (#16559) Fix Scamber --- .../scambertraslator/src/ScamberTraslator.kt | 45 +------------------ .../tachiyomi/multisrc/madara/Madara.kt | 2 +- .../multisrc/madara/MadaraGenerator.kt | 2 +- 3 files changed, 3 insertions(+), 46 deletions(-) diff --git a/multisrc/overrides/madara/scambertraslator/src/ScamberTraslator.kt b/multisrc/overrides/madara/scambertraslator/src/ScamberTraslator.kt index 04c821917..7894775e8 100644 --- a/multisrc/overrides/madara/scambertraslator/src/ScamberTraslator.kt +++ b/multisrc/overrides/madara/scambertraslator/src/ScamberTraslator.kt @@ -1,9 +1,6 @@ package eu.kanade.tachiyomi.extension.es.scambertraslator import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.source.model.SChapter -import eu.kanade.tachiyomi.source.model.SManga -import org.jsoup.nodes.Element import java.text.SimpleDateFormat import java.util.Locale @@ -11,47 +8,7 @@ class ScamberTraslator : Madara( "ScamberTraslator", "https://scambertraslator.com", "es", - dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("es")), + dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale("es")), ) { override val useNewChapterEndpoint = true - - override val popularMangaUrlSelector = "div.item-thumb-slime a" - override fun chapterListSelector() = "li.wp-manga-chapter:has(a[href*=$baseUrl])" // The source has hidden links to external sites by default - - override val mangaDetailsSelectorGenre = "div.genres-container-slime-slime a" - override val mangaDetailsSelectorThumbnail = "div.thumb-half-slime img" - override val mangaDetailsSelectorStatus = "div.status-slime" - - override fun popularMangaFromElement(element: Element): SManga { - val manga = SManga.create() - - with(element) { - select(popularMangaUrlSelector).first()?.let { - manga.setUrlWithoutDomain(it.attr("abs:href")) - manga.title = it.attr("title") - } - - select("img").first()?.let { - manga.thumbnail_url = imageFromElement(it) - } - } - - return manga - } - - override fun chapterFromElement(element: Element): SChapter { - val chapter = SChapter.create() - - with(element) { - select(chapterUrlSelector).first()?.let { urlElement -> - chapter.url = urlElement.attr("abs:href").let { - it.substringBefore("?style=paged") + if (!it.endsWith(chapterUrlSuffix)) chapterUrlSuffix else "" - } - chapter.name = urlElement.select("span.chapternum").text() - chapter.date_upload = parseChapterDate(select("span.chapterdate").text()) - } - } - - return chapter - } } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt index 8e6346db8..d82a085a7 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt @@ -545,7 +545,7 @@ abstract class Madara( "OnGoing", "Продолжается", "Updating", "Em Lançamento", "Em lançamento", "Em andamento", "Em Andamento", "En cours", "Ativo", "Lançando", "Đang Tiến Hành", "Devam Ediyor", "Devam ediyor", "In Corso", "In Arrivo", "مستمرة", "مستمر", "En Curso", "En curso", "Emision", - "En marcha", "Publicandose", "En emision", "连载中", + "Curso", "En marcha", "Publicandose", "En emision", "连载中", ) protected val hiatusStatusList: Array = arrayOf( diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt index 1f9611e3b..92bb88f34 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt @@ -372,7 +372,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Sagrado Império da Britannia", "https://imperiodabritannia.com", "pt-BR", className = "ImperioDaBritannia"), SingleLang("SamuraiScan", "https://samuraiscan.com", "es", overrideVersionCode = 1), SingleLang("Sawamics", "https://sawamics.com", "en"), - SingleLang("ScamberTraslator", "https://scambertraslator.com", "es", overrideVersionCode = 2), + SingleLang("ScamberTraslator", "https://scambertraslator.com", "es", overrideVersionCode = 3), SingleLang("Scans Raw", "https://scansraw.com", "en", overrideVersionCode = 1), SingleLang("Sdl scans", "https://sdlscans.com", "es", className = "SdlScans"), SingleLang("Sensaina Yuri", "https://sensainayuri.dropescan.com", "pt-BR", isNsfw = true, overrideVersionCode = 2),