From 406992a6c996952482bc86b5876c991ad8a23178 Mon Sep 17 00:00:00 2001 From: dragonx943 Date: Sun, 14 Sep 2025 03:50:26 +0700 Subject: [PATCH] DragonTranslation.org: Add source + Fix warns --- .github/summary.yaml | 2 +- .../parsers/site/en/{MTL => mtl}/MTLParser.kt | 13 +++---------- .../kotatsu/parsers/site/en/{MTL => mtl}/SnowMTL.kt | 7 ++++--- .../parsers/site/en/{MTL => mtl}/SolarMTL.kt | 7 ++++--- .../parsers/site/madara/es/DragonTranslationOrg.kt | 12 ++++++++++++ .../kotatsu/parsers/site/mangareader/ar/Normoyun.kt | 3 ++- .../parsers/site/mangareader/es/TuManhwas.kt | 3 ++- 7 files changed, 28 insertions(+), 19 deletions(-) rename src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/{MTL => mtl}/MTLParser.kt (94%) rename src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/{MTL => mtl}/SnowMTL.kt (78%) rename src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/{MTL => mtl}/SolarMTL.kt (77%) create mode 100644 src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/DragonTranslationOrg.kt diff --git a/.github/summary.yaml b/.github/summary.yaml index 72b28d31..08a3a37f 100644 --- a/.github/summary.yaml +++ b/.github/summary.yaml @@ -1 +1 @@ -total: 1251 \ No newline at end of file +total: 1252 \ No newline at end of file diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MTL/MTLParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/mtl/MTLParser.kt similarity index 94% rename from src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MTL/MTLParser.kt rename to src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/mtl/MTLParser.kt index df539f9a..93709d89 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MTL/MTLParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/mtl/MTLParser.kt @@ -1,10 +1,9 @@ -package org.koitharu.kotatsu.parsers.site.en.MTL +package org.koitharu.kotatsu.parsers.site.en.mtl import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.model.search.MangaSearchQuery import org.koitharu.kotatsu.parsers.model.search.MangaSearchQueryCapabilities -import org.koitharu.kotatsu.parsers.model.search.SearchCapability import org.koitharu.kotatsu.parsers.model.search.SearchableField import org.koitharu.kotatsu.parsers.model.search.QueryCriteria.* import org.koitharu.kotatsu.parsers.util.* @@ -30,13 +29,7 @@ internal abstract class MTLParser( override suspend fun getFilterOptions(): MangaListFilterOptions = MangaListFilterOptions() - override val searchQueryCapabilities = MangaSearchQueryCapabilities( - SearchCapability( - field = SearchableField.TITLE_NAME, - criteriaTypes = setOf(Match::class), - isMultiple = false, - ), - ) + override val searchQueryCapabilities = MangaSearchQueryCapabilities() override suspend fun getListPage(query: MangaSearchQuery, page: Int): List { val url = buildString { @@ -190,7 +183,7 @@ internal abstract class MTLParser( val sdf = SimpleDateFormat("dd MMMM yyyy", Locale.ENGLISH) sdf.timeZone = TimeZone.getTimeZone("UTC") sdf.parse(dateString)?.time ?: 0L - } catch (e: Exception) { + } catch (_: Exception) { 0L } } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MTL/SnowMTL.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/mtl/SnowMTL.kt similarity index 78% rename from src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MTL/SnowMTL.kt rename to src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/mtl/SnowMTL.kt index 48d3d47f..53594502 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MTL/SnowMTL.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/mtl/SnowMTL.kt @@ -1,11 +1,12 @@ -package org.koitharu.kotatsu.parsers.site.en.MTL +package org.koitharu.kotatsu.parsers.site.en.mtl +import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaParserSource import org.koitharu.kotatsu.parsers.model.ContentType -import org.koitharu.kotatsu.parsers.site.en.MTL.MTLParser +@Broken @MangaSourceParser("SNOWMTL", "SnowMTL", "en", type = ContentType.OTHER) internal class SnowMTL(context: MangaLoaderContext): - MTLParser(context, source = MangaParserSource.SNOWMTL, "snowmtl.ru") \ No newline at end of file + MTLParser(context, source = MangaParserSource.SNOWMTL, "snowmtl.ru") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MTL/SolarMTL.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/mtl/SolarMTL.kt similarity index 77% rename from src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MTL/SolarMTL.kt rename to src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/mtl/SolarMTL.kt index 34e91c3a..e0898cb8 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MTL/SolarMTL.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/mtl/SolarMTL.kt @@ -1,11 +1,12 @@ -package org.koitharu.kotatsu.parsers.site.en.MTL +package org.koitharu.kotatsu.parsers.site.en.mtl +import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaParserSource import org.koitharu.kotatsu.parsers.model.ContentType -import org.koitharu.kotatsu.parsers.site.en.MTL.MTLParser +@Broken @MangaSourceParser("SOLARMTL", "SolarMTL", "en", type = ContentType.MANGA) internal class SolarMTL(context: MangaLoaderContext): - MTLParser(context, source = MangaParserSource.SOLARMTL, "solarmtl.com") \ No newline at end of file + MTLParser(context, source = MangaParserSource.SOLARMTL, "solarmtl.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/DragonTranslationOrg.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/DragonTranslationOrg.kt new file mode 100644 index 00000000..21dbd0ee --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/es/DragonTranslationOrg.kt @@ -0,0 +1,12 @@ +package org.koitharu.kotatsu.parsers.site.madara.es + +import org.koitharu.kotatsu.parsers.MangaLoaderContext +import org.koitharu.kotatsu.parsers.MangaSourceParser +import org.koitharu.kotatsu.parsers.model.MangaParserSource +import org.koitharu.kotatsu.parsers.site.madara.MadaraParser + +@MangaSourceParser("DRAGONTRANSLATIONORG", "DragonTranslation.org", "es") +internal class DragonTranslationOrg(context: MangaLoaderContext) : + MadaraParser(context, MangaParserSource.DRAGONTRANSLATIONORG, "dragontranslation.org", 16) { + override val datePattern = "dd/MM/yyyy" +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/Normoyun.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/Normoyun.kt index 007e429f..cbef2d8a 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/Normoyun.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ar/Normoyun.kt @@ -4,6 +4,7 @@ import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.* +import org.koitharu.kotatsu.parsers.model.ContentRating import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser import org.koitharu.kotatsu.parsers.util.* import java.text.SimpleDateFormat @@ -111,7 +112,7 @@ internal class Normoyun(context: MangaLoaderContext) : description = docs.selectFirst("span.desc")?.html(), state = mangaState, authors = setOfNotNull(author), - contentRating = if (manga.isNsfw || nsfw) { + contentRating = if (manga.contentRating == ContentRating.ADULT || nsfw) { ContentRating.ADULT } else { ContentRating.SAFE diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/TuManhwas.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/TuManhwas.kt index 8360221b..f31eaaf8 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/TuManhwas.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/es/TuManhwas.kt @@ -4,6 +4,7 @@ import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.* +import org.koitharu.kotatsu.parsers.model.ContentRating import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser import org.koitharu.kotatsu.parsers.util.* import java.text.DateFormat @@ -93,7 +94,7 @@ internal class TuManhwas(context: MangaLoaderContext) : return manga.copy( description = docs.selectFirst("div.entry-content")?.html(), state = mangaState, - contentRating = if (manga.isNsfw || nsfw) { + contentRating = if (manga.contentRating == ContentRating.ADULT || nsfw) { ContentRating.ADULT } else { ContentRating.SAFE