FMReader: Fallback to absolute date if relative date fails (#7980)

* use parseAbsoluteDate as fallback

* bump

* long

lib-multisrc/fmreader/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 9
+baseVersionCode = 10

lib-multisrc/fmreader/src/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt

@@ -19,6 +19,7 @@ import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import org.jsoup.select.Elements
 import java.nio.charset.Charset
+import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
@@ -246,7 +247,13 @@ abstract class FMReader(
                     name = element.attr(chapterNameAttrSelector).substringAfter("$mangaTitle ")
                 }
             }
-            date_upload = element.select(chapterTimeSelector).let { if (it.hasText()) parseRelativeDate(it.text()) else 0 }
+            date_upload = element.select(chapterTimeSelector).let { dateElement ->
+                if (dateElement.hasText()) {
+                    parseRelativeDate(dateElement.text()).takeIf { it != 0L } ?: parseAbsoluteDate(dateElement.text())
+                } else {
+                    0L
+                }
+            }
         }
     }
 
@@ -257,6 +264,7 @@ abstract class FMReader(
     open val dateWordIndex = 1
 
     open fun parseRelativeDate(date: String): Long {
+        try {
             val value = date.split(' ')[dateValueIndex].toInt()
             val dateWord = date.split(' ')[dateWordIndex].let {
                 if (it.contains("(")) {
@@ -299,13 +307,20 @@ abstract class FMReader(
                     set(Calendar.MILLISECOND, 0)
                 }.timeInMillis
                 else -> {
-                return 0
+                    return 0L
                 }
             }
+        } catch (_: Exception) {
+            return 0L
         }
+    }
+
     open fun parseAbsoluteDate(dateStr: String): Long {
-        return runCatching { dateFormat.parse(dateStr)?.time }
+        return try {
-            .getOrNull() ?: 0L
+            dateFormat.parse(dateStr)?.time ?: 0L
+        } catch (_: ParseException) {
+            0L
+        }
     }
 
     open val pageListImageSelector = "img.chapter-img"

src/en/holymanga/src/eu/kanade/tachiyomi/extension/en/holymanga/HolyManga.kt

@@ -1,8 +1,6 @@
 package eu.kanade.tachiyomi.extension.en.holymanga
 
 import eu.kanade.tachiyomi.multisrc.fmreader.FMReader
-import eu.kanade.tachiyomi.source.model.SChapter
-import org.jsoup.nodes.Element
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -15,10 +13,4 @@ class HolyManga : FMReader(
     override val versionId = 2
 
     override val chapterUrlSelector = ""
-
-    override fun chapterFromElement(element: Element, mangaTitle: String): SChapter {
-        return super.chapterFromElement(element, mangaTitle).apply {
-            date_upload = element.select(chapterTimeSelector).text().let { parseAbsoluteDate(it) }
-        }
-    }
 }