From 506f6555c2cb4b1b20cf48b0c214d4aa4038f5ea Mon Sep 17 00:00:00 2001 From: Johannes Joens <34899572+jopejoe1@users.noreply.github.com> Date: Thu, 8 Apr 2021 03:19:34 +1200 Subject: [PATCH] Small fix for webtoons backward compabilty (#6460) * Update WebtoonsGenerator.kt * Update WebtoonsFactory.kt --- .../webtoons/webtoons/src/WebtoonsFactory.kt | 12 ++++++------ .../tachiyomi/multisrc/webtoons/WebtoonsGenerator.kt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/multisrc/overrides/webtoons/webtoons/src/WebtoonsFactory.kt b/multisrc/overrides/webtoons/webtoons/src/WebtoonsFactory.kt index 8be433150..85ba1fb0c 100644 --- a/multisrc/overrides/webtoons/webtoons/src/WebtoonsFactory.kt +++ b/multisrc/overrides/webtoons/webtoons/src/WebtoonsFactory.kt @@ -19,8 +19,8 @@ class WebtoonsFactory : SourceFactory { ) } -class WebtoonsEN : Webtoons("Webtoons", "https://www.webtoons.com", "en") -class WebtoonsID : Webtoons("Webtoons", "https://www.webtoons.com", "id") { +class WebtoonsEN : Webtoons("Webtoons.com", "https://www.webtoons.com", "en") +class WebtoonsID : Webtoons("Webtoons.com", "https://www.webtoons.com", "id") { // Override ID as part of the name was removed to be more consiten with other enteries override val id: Long = 8749627068478740298 @@ -37,8 +37,8 @@ class WebtoonsID : Webtoons("Webtoons", "https://www.webtoons.com", "id") { return GregorianCalendar(year.toInt(), monthIndex, day.toInt()).time.time } } -class WebtoonsTH : Webtoons("Webtoons", "https://www.webtoons.com", "th", dateFormat = SimpleDateFormat("d MMM yyyy", Locale("th"))) -class WebtoonsES : Webtoons("Webtoons", "https://www.webtoons.com", "es") { +class WebtoonsTH : Webtoons("Webtoons.com", "https://www.webtoons.com", "th", dateFormat = SimpleDateFormat("d MMM yyyy", Locale("th"))) +class WebtoonsES : Webtoons("Webtoons.com", "https://www.webtoons.com", "es") { // Android seems to be unable to parse es dates like Indonesian; we'll use a short hard-coded table // instead. private val dateMap: Array = arrayOf( @@ -52,5 +52,5 @@ class WebtoonsES : Webtoons("Webtoons", "https://www.webtoons.com", "es") { return GregorianCalendar(year.toInt(), monthIndex, day.toInt()).time.time } } -class WebtoonsFR : Webtoons("Webtoons", "https://www.webtoons.com", "fr", dateFormat = SimpleDateFormat("d MMM yyyy", Locale.FRENCH)) -class WebtoonsZH : Webtoons("Webtoons", "https://www.webtoons.com", "zh", "zh-hant", "zh_TW", SimpleDateFormat("yyyy/MM/dd", Locale.TRADITIONAL_CHINESE)) +class WebtoonsFR : Webtoons("Webtoons.com", "https://www.webtoons.com", "fr", dateFormat = SimpleDateFormat("d MMM yyyy", Locale.FRENCH)) +class WebtoonsZH : Webtoons("Webtoons.com", "https://www.webtoons.com", "zh", "zh-hant", "zh_TW", SimpleDateFormat("yyyy/MM/dd", Locale.TRADITIONAL_CHINESE)) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsGenerator.kt index 07159bf77..26d2e741d 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsGenerator.kt @@ -13,7 +13,7 @@ class WebtoonsGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 1 override val sources = listOf( - MultiLang("Webtoons.com", "https://www.webtoons.com", listOf("en", "fr", "es", "id", "th", "zh"), className = "WebtoonsFactory", pkgName = "webtoons", overrideVersionCode = 26), + MultiLang("Webtoons.com", "https://www.webtoons.com", listOf("en", "fr", "es", "id", "th", "zh"), className = "WebtoonsFactory", pkgName = "webtoons", overrideVersionCode = 27), SingleLang("Dongman Manhua", "https://www.dongmanmanhua.cn", "zh") )