Draff
/
Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong date parsing at Neox. (#3512) 

Fix wrong date parsing at Neox
This commit is contained in:
Alessandro Jean 2020-06-12 18:56:31 -03:00 committed by GitHub
parent a45c879f2c
commit 5a9a96f761
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/madara/build.gradle
View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: Madara (multiple sources)' appName = 'Tachiyomi: Madara (multiple sources)'
pkgNameSuffix = "all.madara" pkgNameSuffix = "all.madara"
extClass = '.MadaraFactory' extClass = '.MadaraFactory'
extVersionCode = 107 extVersionCode = 108
libVersion = '1.2' libVersion = '1.2'
} }

12
src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/Madara.kt
View File

@ -418,6 +418,10 @@ abstract class Madara(
date.endsWith(" ago", ignoreCase = true) -> { date.endsWith(" ago", ignoreCase = true) -> {
parseRelativeDate(date) parseRelativeDate(date)
} }
// Handle translated 'ago' in Portuguese.
date.endsWith(" atrás", ignoreCase = true) -> {
parseRelativeDate(date)
}
// Handle 'yesterday' and 'today', using midnight // Handle 'yesterday' and 'today', using midnight
date.startsWith("year", ignoreCase = true) -> { date.startsWith("year", ignoreCase = true) -> {
Calendar.getInstance().apply { Calendar.getInstance().apply {
@ -456,18 +460,18 @@ abstract class Madara(
private fun parseRelativeDate(date: String): Long { private fun parseRelativeDate(date: String): Long {
val trimmedDate = date.split(" ") val trimmedDate = date.split(" ")
val number = trimmedDate[0].toIntOrNull() val number = trimmedDate[0].toIntOrNull()
val isRelative = trimmedDate[2] == "ago" || trimmedDate[2] == "atrás"
/** /**
* Size check is for Arabic language, would sometimes break if we don't check * Size check is for Arabic language, would sometimes break if we don't check
* Take that in to consideration if adding support for parsing Arabic dates * Take that in to consideration if adding support for parsing Arabic dates
*/ */
return if (trimmedDate.size == 3 && trimmedDate[2] == "ago" && number is Int) { return if (trimmedDate.size == 3 && isRelative && number is Int) {
val cal = Calendar.getInstance() val cal = Calendar.getInstance()
// Map English and other language units to Java units // Map English and other language units to Java units
when (trimmedDate[1].removeSuffix("s")) { when (trimmedDate[1].removeSuffix("s")) {
"jour", "día", "day" -> cal.apply { add(Calendar.DAY_OF_MONTH, -number) }.timeInMillis "jour", "día", "dia", "day" -> cal.apply { add(Calendar.DAY_OF_MONTH, -number) }.timeInMillis
"heure", "hora", "hour" -> cal.apply { add(Calendar.HOUR, -number) }.timeInMillis "heure", "hora", "hour" -> cal.apply { add(Calendar.HOUR, -number) }.timeInMillis
"min", "minute" -> cal.apply { add(Calendar.MINUTE, -number) }.timeInMillis "min", "minute", "minuto" -> cal.apply { add(Calendar.MINUTE, -number) }.timeInMillis
"segundo", "second" -> cal.apply { add(Calendar.SECOND, -number) }.timeInMillis "segundo", "second" -> cal.apply { add(Calendar.SECOND, -number) }.timeInMillis
else -> 0 else -> 0
} }

2
src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt
View File

@ -652,7 +652,7 @@ class MangaStream : Madara("MangaStream", "https://www.mangastream.cc", "en") {
) )
} }
class NeoxScanlator : Madara("Neox Scanlator", "https://neoxscans.com", "pt-BR", SimpleDateFormat("dd 'de' MMM 'de' yyyy", Locale("pt", "BR"))) { class NeoxScanlator : Madara("Neox Scanlator", "https://neoxscans.com", "pt-BR", SimpleDateFormat("dd/MM/yyyy", Locale("pt", "BR"))) {
override fun headersBuilder(): Headers.Builder = Headers.Builder() override fun headersBuilder(): Headers.Builder = Headers.Builder()
.add("User-Agent", USER_AGENT) .add("User-Agent", USER_AGENT)
.add("Referer", baseUrl) .add("Referer", baseUrl)