From c4a3d0c39e50db607fd3c64a13b51326bae696e8 Mon Sep 17 00:00:00 2001 From: Aurel <68382673+Nyantad@users.noreply.github.com> Date: Sun, 19 Jan 2025 08:14:49 +0100 Subject: [PATCH] Madara: Improve French relative date parsing (#7161) Enhance date parsing for "jour" format in Madara library --- lib-multisrc/madara/build.gradle.kts | 2 +- .../madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib-multisrc/madara/build.gradle.kts b/lib-multisrc/madara/build.gradle.kts index 5ee898f4c..aaff0557f 100644 --- a/lib-multisrc/madara/build.gradle.kts +++ b/lib-multisrc/madara/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("lib-multisrc") } -baseVersionCode = 37 +baseVersionCode = 38 dependencies { api(project(":lib:cryptoaes")) diff --git a/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt b/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt index 7bb5e2f7e..adbcab7dd 100644 --- a/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt +++ b/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt @@ -920,6 +920,10 @@ abstract class Madara( WordSet("hace").startsWith(date) -> { parseRelativeDate(date) } + // Handle "jour" with a number before it + date.contains(Regex("""\b\d+ jour""")) -> { + parseRelativeDate(date) + } date.contains(Regex("""\d(st|nd|rd|th)""")) -> { // Clean date (e.g. 5th December 2019 to 5 December 2019) before parsing it date.split(" ").map {