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

Fix statuses on readmanga/mintmanga (#1406) 

Fix statuses on readmanga/mintmanga
This commit is contained in:
Taumer 2019-08-22 00:34:23 +03:00 committed by Eugene
parent 43ad2d268d
commit c2f6da0e0b
4 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ru/mintmanga/build.gradle
View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: Mintmanga'
pkgNameSuffix = 'ru.mintmanga'
extClass = '.Mintmanga'
extVersionCode = 12
extVersionCode = 13
libVersion = '1.2'
}

28
src/ru/mintmanga/src/eu/kanade/tachiyomi/extension/ru/mintmanga/Mintmanga.kt
View File

@ -93,16 +93,26 @@ class Mintmanga : ParsedHttpSource() {
manga.artist = infoElement.select("span.elem_illustrator").first()?.text()
manga.genre = infoElement.select("span.elem_genre").text().replace(" ,", ",")
manga.description = infoElement.select("div.manga-description").text()
manga.status = parseStatus(infoElement.html())
manga.status = parseStatus(infoElement)
manga.thumbnail_url = infoElement.select("img").attr("data-full")
return manga
}
private fun parseStatus(element: String): Int = when {
element.contains("<h3>Запрещена публикация произведения по копирайту</h3>") -> SManga.LICENSED
element.contains("<h1 class=\"names\"> Сингл") || element.contains("<b>Перевод:</b> завершен") -> SManga.COMPLETED
element.contains("<b>Перевод:</b> продолжается") -> SManga.ONGOING
else -> SManga.UNKNOWN
private fun parseStatus(element: Element): Int {
val hiddenWarningMessage = element.select("span.hide > h3").first()
val html = element.html()
return if (hiddenWarningMessage != null) {
when {
html.contains("<b>Перевод:</b> продолжается") -> SManga.ONGOING
html.contains("<h1 class=\"names\"> Сингл") || html.contains("<b>Перевод:</b> завершен") -> SManga.COMPLETED
else -> SManga.UNKNOWN
}
} else {
when {
html.contains("<h3>Запрещена публикация произведения по копирайту</h3>") -> SManga.LICENSED
else -> SManga.UNKNOWN
}
}
}
override fun chapterListSelector() = "div.chapters-link > table > tbody > tr:has(td > a)"
@ -120,9 +130,9 @@ class Mintmanga : ParsedHttpSource() {
}
chapter.date_upload = element.select("td.hidden-xxs").last()?.text()?.let {
try {
SimpleDateFormat("dd/MM/yy", Locale.US).parse(it).time
} catch (e: ParseException) {
SimpleDateFormat("dd.MM.yy", Locale.US).parse(it).time
} catch (e: ParseException) {
SimpleDateFormat("dd/MM/yy", Locale.US).parse(it).time
}
} ?: 0
return chapter
@ -257,4 +267,4 @@ class Mintmanga : ParsedHttpSource() {
Genre("юри", "el_1315"),
Genre("яой", "el_1336")
)
}
}

2
src/ru/readmanga/build.gradle
View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: Readmanga'
pkgNameSuffix = 'ru.readmanga'
extClass = '.Readmanga'
extVersionCode = 12
extVersionCode = 13
libVersion = '1.2'
}

28
src/ru/readmanga/src/eu/kanade/tachiyomi/extension/ru/readmanga/Readmanga.kt
View File

@ -93,16 +93,26 @@ class Readmanga : ParsedHttpSource() {
manga.artist = infoElement.select("span.elem_illustrator").first()?.text()
manga.genre = infoElement.select("span.elem_genre").text().replace(" ,", ",")
manga.description = infoElement.select("div.manga-description").text()
manga.status = parseStatus(infoElement.html())
manga.status = parseStatus(infoElement)
manga.thumbnail_url = infoElement.select("img").attr("data-full")
return manga
}
private fun parseStatus(element: String): Int = when {
element.contains("<h3>Запрещена публикация произведения по копирайту</h3>") -> SManga.LICENSED
element.contains("<h1 class=\"names\"> Сингл") || element.contains("<b>Перевод:</b> завершен") -> SManga.COMPLETED
element.contains("<b>Перевод:</b> продолжается") -> SManga.ONGOING
else -> SManga.UNKNOWN
private fun parseStatus(element: Element): Int {
val hiddenWarningMessage = element.select("span.hide > h3").first()
val html = element.html()
return if (hiddenWarningMessage != null) {
when {
html.contains("<b>Перевод:</b> продолжается") -> SManga.ONGOING
html.contains("<h1 class=\"names\"> Сингл") || html.contains("<b>Перевод:</b> завершен") -> SManga.COMPLETED
else -> SManga.UNKNOWN
}
} else {
when {
html.contains("<h3>Запрещена публикация произведения по копирайту</h3>") -> SManga.LICENSED
else -> SManga.UNKNOWN
}
}
}
override fun chapterListSelector() = "div.chapters-link > table > tbody > tr:has(td > a)"
@ -120,9 +130,9 @@ class Readmanga : ParsedHttpSource() {
}
chapter.date_upload = element.select("td.hidden-xxs").last()?.text()?.let {
try {
SimpleDateFormat("dd/MM/yy", Locale.US).parse(it).time
} catch (e: ParseException) {
SimpleDateFormat("dd.MM.yy", Locale.US).parse(it).time
} catch (e: ParseException) {
SimpleDateFormat("dd/MM/yy", Locale.US).parse(it).time
}
} ?: 0
return chapter
@ -253,4 +263,4 @@ class Readmanga : ParsedHttpSource() {
Genre("этти", "el_2149"),
Genre("юри", "el_2123")
)
}
}