From c43dc72a78c6a53a5a6cd3d19ad06bd94a143229 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 09:19:26 +0000 Subject: [PATCH 1/2] Bump apache.maven.plugins.version from 3.2.3 to 3.2.5 Bumps `apache.maven.plugins.version` from 3.2.3 to 3.2.5. Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.2.3 to 3.2.5 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.3...surefire-3.2.5) Updates `org.apache.maven.plugins:maven-failsafe-plugin` from 3.2.3 to 3.2.5 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.3...surefire-3.2.5) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6121b73..f6b2913 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 2.0 fr.jais.scraper.ScraperKt 5.10.1 - 3.2.3 + 3.2.5 From 59e55584c6377475154e16d1303c2e0289403422 Mon Sep 17 00:00:00 2001 From: Ziedelth Date: Wed, 10 Jan 2024 11:48:12 +0100 Subject: [PATCH 2/2] Fix ADN Genre #2 --- .../AnimationDigitalNetworkConverter.kt | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/fr/jais/scraper/converters/AnimationDigitalNetworkConverter.kt b/src/main/kotlin/fr/jais/scraper/converters/AnimationDigitalNetworkConverter.kt index 34b0b12..e5df1fc 100644 --- a/src/main/kotlin/fr/jais/scraper/converters/AnimationDigitalNetworkConverter.kt +++ b/src/main/kotlin/fr/jais/scraper/converters/AnimationDigitalNetworkConverter.kt @@ -55,21 +55,24 @@ class AnimationDigitalNetworkConverter(private val platform: AnimationDigitalNet val genres = showJson.getAsJsonArray("genres")?.mapNotNull { it.asString() } ?: emptyList() Logger.config("Genres: ${genres.joinToString(", ")}") + val contains = whitelistAnimes.contains(name) + + if ((!genres.any { it.startsWith("Animation ", true) }) && !contains) throw NotJapaneseAnimeException("Show is not an anime") + // ----- SIMULCAST ----- Logger.info("Checking if anime is simulcasted...") - val simulcasted = - showJson["simulcast"]?.asBoolean == true || showJson["firstReleaseYear"]?.asString == calendar.getYear() + var simulcasted = + showJson["simulcast"]?.asBoolean == true || showJson["firstReleaseYear"]?.asString == calendar.getYear() || contains Logger.config("Simulcasted: $simulcasted") - val descriptionLowercase = description?.lowercase() - val isAlternativeSimulcast = - (whitelistAnimes.contains(name) || genres.any { it.startsWith("Animation ", true) }) || - (descriptionLowercase?.startsWith("(Premier épisode ".lowercase()) == true || - descriptionLowercase?.startsWith("(Diffusion des ".lowercase()) == true || - descriptionLowercase?.startsWith("(Diffusion du premier épisode".lowercase()) == true || - descriptionLowercase?.startsWith("(Diffusion de l'épisode 1 le".lowercase()) == true) + val descriptionLowercase = description?.lowercase() ?: "" + + simulcasted = simulcasted || descriptionLowercase.startsWith("(premier épisode ") || + descriptionLowercase.startsWith("(diffusion des ") || + descriptionLowercase.startsWith("(diffusion du premier épisode") || + descriptionLowercase.startsWith("(diffusion de l'épisode 1 le") - if (!simulcasted && !isAlternativeSimulcast) throw NotSimulcastAnimeException("Anime is not simulcasted") + if (!simulcasted) throw NotSimulcastAnimeException("Anime is not simulcasted") return Anime(checkedCountry.getCountry(), name, image, description, genres) }