diff --git a/.github/workflows/issue_moderator.yml b/.github/workflows/issue_moderator.yml index d934a865b..8ecb9271d 100644 --- a/.github/workflows/issue_moderator.yml +++ b/.github/workflows/issue_moderator.yml @@ -50,7 +50,7 @@ jobs: }, { "type": "both", - "regex": ".*(komiktap|gourmet\\s*scans|mangawow|hikari\\s*scans|knightnoscanlations|mangasy|nartag|xxx\\s*yaoi|luminous|hunters\\s*scan|reset(?:\\s*|-)scan|astra\\s*scans|manga(?:-|\\s*)pro|shinobiscans|plot ?twist ?no ?fansub(?: ?scans?)?|plot-twistnf-scans(?:\\.com)?|mhscans|aresmanga|realm ?scans?).*", + "regex": ".*(komiktap|gourmet\\s*scans|mangawow|hikari\\s*scans|knightnoscanlations|mangasy|nartag|xxx\\s*yaoi|luminous|hunters\\s*scan|reset(?:\\s*|-)scan|astra\\s*scans|manga(?:-|\\s*)pro|shinobiscans|plot ?twist ?no ?fansub(?: ?scans?)?|plot-twistnf-scans(?:\\.com)?|mhscans|aresmanga|realm ?scans?|mono ?manga).*", "ignoreCase": true, "labels": ["invalid"], "message": "{match} will not be added back as the scanlator team has requested it to be removed. Read [this](https://github.com/tachiyomiorg/tachiyomi-extensions/blob/master/REMOVED_SOURCES.md) for more information." diff --git a/REMOVED_SOURCES.md b/REMOVED_SOURCES.md index c7d936d16..b6cea8587 100644 --- a/REMOVED_SOURCES.md +++ b/REMOVED_SOURCES.md @@ -50,6 +50,7 @@ Here is a list of known sources that were removed. - MangaSY https://github.com/tachiyomiorg/tachiyomi-extensions/issues/12007 - Mangawow https://github.com/tachiyomiorg/tachiyomi-extensions/issues/5367 - MHScans https://github.com/tachiyomiorg/tachiyomi-extensions/issues/15319 +- Mono Manga https://github.com/tachiyomiorg/tachiyomi-extensions/issues/17634 - NarTag https://github.com/tachiyomiorg/tachiyomi-extensions/issues/8038 - Plot-twistnf-scans https://github.com/tachiyomiorg/tachiyomi-extensions/issues/4242 - Realm Scans https://github.com/tachiyomiorg/tachiyomi-extensions/issues/15586 diff --git a/multisrc/overrides/madara/monomanga/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/monomanga/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 1d728eaf1..000000000 Binary files a/multisrc/overrides/madara/monomanga/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/monomanga/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/monomanga/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index e1fe3c348..000000000 Binary files a/multisrc/overrides/madara/monomanga/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/monomanga/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/monomanga/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index aceac2d9c..000000000 Binary files a/multisrc/overrides/madara/monomanga/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/monomanga/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/monomanga/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 52df0f62d..000000000 Binary files a/multisrc/overrides/madara/monomanga/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/monomanga/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/monomanga/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index bc14f7a5b..000000000 Binary files a/multisrc/overrides/madara/monomanga/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/monomanga/res/web_hi_res_512.png b/multisrc/overrides/madara/monomanga/res/web_hi_res_512.png deleted file mode 100644 index 8b75c8b7d..000000000 Binary files a/multisrc/overrides/madara/monomanga/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/monomanga/src/MonoManga.kt b/multisrc/overrides/madara/monomanga/src/MonoManga.kt deleted file mode 100644 index 4664badf8..000000000 --- a/multisrc/overrides/madara/monomanga/src/MonoManga.kt +++ /dev/null @@ -1,16 +0,0 @@ -package eu.kanade.tachiyomi.extension.tr.monomanga - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import java.text.SimpleDateFormat -import java.util.Locale - -class MonoManga : Madara( - "Mono Manga", - "https://monomanga.com", - "tr", - dateFormat = SimpleDateFormat("d MMM yyyy", Locale("tr")), -) { - override val useNewChapterEndpoint = false - - override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/" -} diff --git a/multisrc/overrides/madara/templescanesp/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/templescanesp/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..aa68ca46e Binary files /dev/null and b/multisrc/overrides/madara/templescanesp/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/templescanesp/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/templescanesp/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..3be9c027a Binary files /dev/null and b/multisrc/overrides/madara/templescanesp/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/templescanesp/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/templescanesp/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..8d84cda9f Binary files /dev/null and b/multisrc/overrides/madara/templescanesp/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/templescanesp/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/templescanesp/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..c709dc5a3 Binary files /dev/null and b/multisrc/overrides/madara/templescanesp/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/templescanesp/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/templescanesp/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..b093413db Binary files /dev/null and b/multisrc/overrides/madara/templescanesp/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/templescanesp/res/web_hi_res_512.png b/multisrc/overrides/madara/templescanesp/res/web_hi_res_512.png new file mode 100644 index 000000000..b15248d65 Binary files /dev/null and b/multisrc/overrides/madara/templescanesp/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/templescanesp/src/TempleScanEsp.kt b/multisrc/overrides/madara/templescanesp/src/TempleScanEsp.kt new file mode 100644 index 000000000..e2dc551a4 --- /dev/null +++ b/multisrc/overrides/madara/templescanesp/src/TempleScanEsp.kt @@ -0,0 +1,42 @@ +package eu.kanade.tachiyomi.extension.es.templescanesp + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.source.model.SChapter +import org.jsoup.nodes.Element +import java.text.SimpleDateFormat +import java.util.Locale + +class TempleScanEsp : Madara( + "TempleScan", + "https://templescanesp.com", + "es", + SimpleDateFormat("dd.MM.yyyy", Locale("es")), +) { + override val mangaSubString = "series" + + override fun popularMangaSelector() = "div.tab-content-wrap div.loopcont > div" + override val popularMangaUrlSelector = "div#series-card a.series-link" + + override val mangaDetailsSelectorAuthor = "div.post-content_item:contains(Autor) div.summary-content" + override val mangaDetailsSelectorArtist = "div.post-content_item:contains(Artista) div.summary-content" + override val mangaDetailsSelectorStatus = "div.post-content_item:contains(Estado) div.summary-content" + + 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("p").text() + } + + chapter.date_upload = select("img:not(.thumb)").firstOrNull()?.attr("alt")?.let { parseRelativeDate(it) } + ?: select("span a").firstOrNull()?.attr("title")?.let { parseRelativeDate(it) } + ?: parseChapterDate(select(chapterDateSelector()).firstOrNull()?.text()) + } + + return chapter + } +} diff --git a/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..08728fdd4 Binary files /dev/null and b/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..c14c3fc3e Binary files /dev/null and b/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..75c19dac2 Binary files /dev/null and b/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..ffd393279 Binary files /dev/null and b/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..d661e5611 Binary files /dev/null and b/multisrc/overrides/madara/traduccionesmoonlight/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/traduccionesmoonlight/res/web_hi_res_512.png b/multisrc/overrides/madara/traduccionesmoonlight/res/web_hi_res_512.png new file mode 100644 index 000000000..bdfc28d88 Binary files /dev/null and b/multisrc/overrides/madara/traduccionesmoonlight/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/traduccionesmoonlight/src/TraduccionesMoonlight.kt b/multisrc/overrides/madara/traduccionesmoonlight/src/TraduccionesMoonlight.kt new file mode 100644 index 000000000..6d2040556 --- /dev/null +++ b/multisrc/overrides/madara/traduccionesmoonlight/src/TraduccionesMoonlight.kt @@ -0,0 +1,14 @@ +package eu.kanade.tachiyomi.extension.es.traduccionesmoonlight + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.text.SimpleDateFormat +import java.util.Locale + +class TraduccionesMoonlight : Madara( + "Traducciones Moonlight", + "https://traduccionesmoonlight.com", + "es", + SimpleDateFormat("dd 'de' MMMM 'de' yyyy", Locale("es")), +) { + override val useNewChapterEndpoint = true +} diff --git a/multisrc/overrides/madara/unitoonoficial/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/unitoonoficial/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..9197367c7 Binary files /dev/null and b/multisrc/overrides/madara/unitoonoficial/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/unitoonoficial/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/unitoonoficial/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..6fb6d4103 Binary files /dev/null and b/multisrc/overrides/madara/unitoonoficial/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/unitoonoficial/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/unitoonoficial/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..0d1d4ac36 Binary files /dev/null and b/multisrc/overrides/madara/unitoonoficial/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/unitoonoficial/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/unitoonoficial/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..21a2f11b0 Binary files /dev/null and b/multisrc/overrides/madara/unitoonoficial/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/unitoonoficial/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/unitoonoficial/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..35cd506f5 Binary files /dev/null and b/multisrc/overrides/madara/unitoonoficial/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/unitoonoficial/res/web_hi_res_512.png b/multisrc/overrides/madara/unitoonoficial/res/web_hi_res_512.png new file mode 100644 index 000000000..7bde7ec0e Binary files /dev/null and b/multisrc/overrides/madara/unitoonoficial/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/unitoonoficial/src/UnitoonOficial.kt b/multisrc/overrides/madara/unitoonoficial/src/UnitoonOficial.kt new file mode 100644 index 000000000..428f4f1c3 --- /dev/null +++ b/multisrc/overrides/madara/unitoonoficial/src/UnitoonOficial.kt @@ -0,0 +1,14 @@ +package eu.kanade.tachiyomi.extension.es.unitoonoficial + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.text.SimpleDateFormat +import java.util.Locale + +class UnitoonOficial : Madara( + "Unitoon Oficial", + "https://unitoonoficial.com", + "es", + SimpleDateFormat("dd/MM/yyyy", Locale("es")), +) { + override val useNewChapterEndpoint = true +} 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 fb9db37e1..c826d9706 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 @@ -381,7 +381,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("MMScans", "https://mm-scans.org", "en", overrideVersionCode = 7), SingleLang("Momo no Hana Scan", "https://momonohanascan.com", "pt-BR", className = "MomoNoHanaScan", overrideVersionCode = 1), SingleLang("MonarcaManga", "https://monarcamanga.com", "es"), - SingleLang("Mono Manga", "https://monomanga.com", "tr", isNsfw = false), SingleLang("Moon Witch In Love", "https://moonwitchinlovescan.com", "pt-BR"), SingleLang("MoonLovers Scan", "https://moonloversscan.com.br", "pt-BR", isNsfw = true), SingleLang("Mortals Groove", "https://mortalsgroove.com", "en", overrideVersionCode = 1), @@ -485,6 +484,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Taurus Fansub", "https://taurusfansub.com", "es"), SingleLang("Tecno Scan", "https://tecnoscann.com", "es"), SingleLang("TeenManhua", "https://teenmanhua.com", "en", overrideVersionCode = 1), + SingleLang("TempleScan", "https://templescanesp.com", "es", isNsfw = true, className = "TempleScanEsp"), SingleLang("The Beginning After The End", "https://www.thebeginningaftertheend.fr", "fr", overrideVersionCode = 1), SingleLang("The Guild", "https://theguildscans.com", "en"), SingleLang("The Sugar", "https://thesugarscan.com", "pt-BR"), @@ -500,6 +500,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("ToonMany", "https://toonmany.com", "en", isNsfw = true), SingleLang("Top Manhua", "https://topmanhua.com", "en", overrideVersionCode = 2), SingleLang("Tortuga Ceviri", "https://tortuga-ceviri.com", "tr"), + SingleLang("Traducciones Moonlight", "https://traduccionesmoonlight.com", "es"), SingleLang("Trap Scans", "https://trapscans.com", "en"), SingleLang("TreeManga", "https://treemanga.com", "en", overrideVersionCode = 1), SingleLang("TritiniaScans", "https://tritinia.org", "en", overrideVersionCode = 4), @@ -507,6 +508,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Tumangaonline.site", "https://tumangaonline.site", "es", isNsfw = true, className = "TumangaonlineSite", pkgName = "tumangaonlinesite"), SingleLang("Türkçe Manga", "https://turkcemanga.com", "tr", className = "TurkceManga", overrideVersionCode = 2), SingleLang("Unitoon", "https://lectorunitoon.com", "es"), + SingleLang("Unitoon Oficial", "https://unitoonoficial.com", "es"), SingleLang("Valkyrie Scan", "https://valkyriescan.com", "pt-BR", isNsfw = true), SingleLang("Ver Manhwas", "https://vermanhwa.es", "es", isNsfw = true, overrideVersionCode = 1), SingleLang("VinManga", "https://vinload.com", "en", isNsfw = true),