From 13f4e346c3cb7b701e4b0147caab1fe2d04d43a0 Mon Sep 17 00:00:00 2001 From: KirinRaikage Date: Tue, 4 Jul 2023 01:56:23 +0200 Subject: [PATCH] Fix date parsing for Hentai Scantrad and Scan Hentai Menu (#17000) * Fix date parsing for Hentai Scantrad and Scan Hentai Menu * Update selector status for Hentai Scantrad * Update ongoingStatusList to reflect status for Hentai Scantrad --- .../madara/hentaiscantrad/src/HentaiScantrad.kt | 9 +++++++++ .../madara/scanhentaimenu/src/ScanHentaiMenu.kt | 7 +++++++ .../java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt | 2 +- .../kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt | 4 ++-- 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 multisrc/overrides/madara/hentaiscantrad/src/HentaiScantrad.kt create mode 100644 multisrc/overrides/madara/scanhentaimenu/src/ScanHentaiMenu.kt diff --git a/multisrc/overrides/madara/hentaiscantrad/src/HentaiScantrad.kt b/multisrc/overrides/madara/hentaiscantrad/src/HentaiScantrad.kt new file mode 100644 index 0000000000..9dfb3f1f28 --- /dev/null +++ b/multisrc/overrides/madara/hentaiscantrad/src/HentaiScantrad.kt @@ -0,0 +1,9 @@ +package eu.kanade.tachiyomi.extension.fr.hentaiscantrad + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.text.SimpleDateFormat +import java.util.Locale + +class HentaiScantrad : Madara("Hentai-Scantrad", "https://hentai.scantrad-vf.cc", "fr", dateFormat = SimpleDateFormat("d MMMM, yyyy", Locale.FRENCH)) { + override val mangaDetailsSelectorStatus = "div.summary-heading:contains(État) + .summary-content" +} diff --git a/multisrc/overrides/madara/scanhentaimenu/src/ScanHentaiMenu.kt b/multisrc/overrides/madara/scanhentaimenu/src/ScanHentaiMenu.kt new file mode 100644 index 0000000000..6b3d89984b --- /dev/null +++ b/multisrc/overrides/madara/scanhentaimenu/src/ScanHentaiMenu.kt @@ -0,0 +1,7 @@ +package eu.kanade.tachiyomi.extension.fr.scanhentaimenu + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.text.SimpleDateFormat +import java.util.Locale + +class ScanHentaiMenu : Madara("Scan Hentai Menu", "https://scan.hentai.menu", "fr", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.FRENCH)) 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 bd85da7813..4c002d15a2 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 @@ -544,7 +544,7 @@ abstract class Madara( protected val ongoingStatusList: Array = arrayOf( "OnGoing", "Продолжается", "Updating", "Em Lançamento", "Em lançamento", "Em andamento", - "Em Andamento", "En cours", "En cours de publication", "Ativo", "Lançando", "Đang Tiến Hành", "Devam Ediyor", + "Em Andamento", "En cours", "En Cours", "En cours de publication", "Ativo", "Lançando", "Đang Tiến Hành", "Devam Ediyor", "Devam ediyor", "In Corso", "In Arrivo", "مستمرة", "مستمر", "En Curso", "En curso", "Emision", "Curso", "En marcha", "Publicandose", "En emision", "连载中", ) 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 227b584312..30b4452ffb 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 @@ -131,7 +131,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Hentai Teca", "https://hentaiteca.net", "pt-BR", isNsfw = true, overrideVersionCode = 1), SingleLang("Hentai20", "https://hentai20.io", "en", isNsfw = true, overrideVersionCode = 3), SingleLang("HentaiRead", "https://hentairead.com", "en", isNsfw = true, className = "Hentairead", overrideVersionCode = 3), - SingleLang("Hentai-Scantrad", "https://hentai.scantrad-vf.cc", "fr", isNsfw = true, className = "HentaiScantrad"), + SingleLang("Hentai-Scantrad", "https://hentai.scantrad-vf.cc", "fr", isNsfw = true, className = "HentaiScantrad", overrideVersionCode = 1), SingleLang("HentaiWebtoon", "https://hentaiwebtoon.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("HentaiXComic", "https://hentaixcomic.com", "en", isNsfw = true), SingleLang("HentaiXYuri", "https://hentaixyuri.com", "en", isNsfw = true), @@ -377,7 +377,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("SamuraiScan", "https://samuraiscan.com", "es", overrideVersionCode = 1), SingleLang("Sawamics", "https://sawamics.com", "en"), SingleLang("ScamberTraslator", "https://scambertraslator.com", "es", overrideVersionCode = 3), - SingleLang("Scan Hentai Menu", "https://scan.hentai.menu", "fr", isNsfw = true), + SingleLang("Scan Hentai Menu", "https://scan.hentai.menu", "fr", isNsfw = true, overrideVersionCode = 1), SingleLang("Scans Raw", "https://scansraw.com", "en", overrideVersionCode = 1), SingleLang("Scantrad-VF", "https://scantrad-vf.co", "fr", className = "ScantradVF"), SingleLang("Sdl scans", "https://sdlscans.com", "es", className = "SdlScans"),