diff --git a/src/all/webtoons/build.gradle b/src/all/webtoons/build.gradle index 407578edb..312e3a36e 100644 --- a/src/all/webtoons/build.gradle +++ b/src/all/webtoons/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Webtoons' pkgNameSuffix = 'all.webtoons' extClass = '.WebtoonsFactory' - extVersionCode = 18 + extVersionCode = 19 libVersion = '1.2' } diff --git a/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/DongmanManhua.kt b/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/DongmanManhua.kt index 7bed512f8..0235c4eaf 100644 --- a/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/DongmanManhua.kt +++ b/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/DongmanManhua.kt @@ -13,7 +13,7 @@ import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element -class DongmanManhua : WebtoonsDefault("zh", "") { +class DongmanManhua : WebtoonsDefault("zh", "", dateFormat = SimpleDateFormat("yyyy-M-d", Locale.ENGLISH)) { override val baseUrl = "https://www.dongmanmanhua.cn" override val name = "Dongman Manhua" @@ -57,9 +57,5 @@ class DongmanManhua : WebtoonsDefault("zh", "") { } } - override fun chapterParseDate(date: String): Long { - return SimpleDateFormat("yyyy-M-d", Locale.ENGLISH).parse(date).time - } - override fun getFilterList(): FilterList = FilterList() } diff --git a/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/Webtoons.kt b/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/Webtoons.kt index 1ad121a48..d4ccfed73 100644 --- a/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/Webtoons.kt +++ b/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/Webtoons.kt @@ -68,7 +68,7 @@ abstract class Webtoons( override fun popularMangaSelector() = "not using" - override fun latestUpdatesSelector() = "div#dailyList > $day li > a:has(span:contains(UP))" + override fun latestUpdatesSelector() = "div#dailyList > $day li > a" override fun headersBuilder(): Headers.Builder = super.headersBuilder() .add("Referer", "https://www.webtoons.com/$langCode/") diff --git a/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsDefault.kt b/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsDefault.kt index 0f7b29541..b36f991ab 100644 --- a/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsDefault.kt +++ b/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsDefault.kt @@ -13,7 +13,8 @@ import org.jsoup.nodes.Element open class WebtoonsDefault( override val lang: String, override val langCode: String = lang, - override val localeForCookie: String = lang + override val localeForCookie: String = lang, + private val dateFormat: SimpleDateFormat = SimpleDateFormat("MMM d, yyyy", Locale.ENGLISH) ) : Webtoons(lang, langCode, lang) { override fun chapterListSelector() = "ul#_episodeList > li[id*=episode]" @@ -36,7 +37,7 @@ open class WebtoonsDefault( } open fun chapterParseDate(date: String): Long { - return SimpleDateFormat("MMM d, yyyy", Locale.ENGLISH).parse(date).time + return dateFormat.parse(date)?.time ?: 0 } override fun chapterListRequest(manga: SManga) = GET("https://m.webtoons.com" + manga.url, mobileHeaders) diff --git a/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsFactory.kt b/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsFactory.kt index c97f6615e..8cf4769bb 100644 --- a/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsFactory.kt +++ b/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsFactory.kt @@ -12,6 +12,7 @@ class WebtoonsFactory : SourceFactory { WebtoonsChineseTraditional(), WebtoonsIndonesian(), WebtoonsThai(), + WebtoonsFr(), DongmanManhua(), // Fan translations @@ -67,14 +68,8 @@ class WebtoonsIndonesian : WebtoonsDefault("in", "id") { } } -class WebtoonsThai : WebtoonsDefault("th") { - override fun chapterParseDate(date: String): Long { - return SimpleDateFormat("d MMM yyyy", Locale("th")).parse(date).time - } -} +class WebtoonsThai : WebtoonsDefault("th", dateFormat = SimpleDateFormat("d MMM yyyy", Locale("th"))) -class WebtoonsChineseTraditional : WebtoonsDefault("zh", "zh-hant", "zh_TW") { - override fun chapterParseDate(date: String): Long { - return SimpleDateFormat("yyyy/MM/dd", Locale.TRADITIONAL_CHINESE).parse(date).time - } -} +class WebtoonsChineseTraditional : WebtoonsDefault("zh", "zh-hant", "zh_TW", SimpleDateFormat("yyyy/MM/dd", Locale.TRADITIONAL_CHINESE)) + +class WebtoonsFr : WebtoonsDefault("fr", dateFormat = SimpleDateFormat("d MMM yyyy", Locale.FRENCH))