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

Fix long names in manga names. Readmanga/Mintmanga (#1847) 

Fix long names in manga names. Readmanga/Mintmanga
This commit is contained in:
Pavka 2019-12-04 02:43:15 +03:00 committed by arkon
parent e4e9c3b8f0
commit 03ee1ea829
4 changed files with 78 additions and 12 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 = 13
extVersionCode = 14
libVersion = '1.2'
}

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

@ -2,11 +2,14 @@ package eu.kanade.tachiyomi.extension.ru.mintmanga
import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.source.model.*
import eu.kanade.tachiyomi.source.online.ParsedHttpSource
import eu.kanade.tachiyomi.util.asJsoup
import okhttp3.*
import org.jsoup.nodes.Document
import org.jsoup.nodes.Element
import rx.Observable
import java.text.ParseException
import java.text.SimpleDateFormat
import java.util.*
@ -115,19 +118,45 @@ class Mintmanga : ParsedHttpSource() {
}
}
override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
return if (manga.status != SManga.LICENSED) {
client.newCall(chapterListRequest(manga))
.asObservableSuccess()
.map { response ->
chapterListParse(response, manga)
}
} else {
Observable.error(java.lang.Exception("Licensed - No chapters to show"))
}
}
private fun chapterListParse(response: Response, manga: SManga): List<SChapter> {
val document = response.asJsoup()
return document.select(chapterListSelector()).map { chapterFromElement(it, manga) }
}
override fun chapterListSelector() = "div.chapters-link > table > tbody > tr:has(td > a)"
override fun chapterFromElement(element: Element): SChapter {
private fun chapterFromElement(element: Element, manga: SManga): SChapter {
val urlElement = element.select("a").first()
val urlText = urlElement.text()
val chapter = SChapter.create()
chapter.setUrlWithoutDomain(urlElement.attr("href") + "?mtr=1")
if (urlText.endsWith(" новое")) {
chapter.name = urlText.dropLast(6)
} else {
chapter.name = urlText
chapter.name = urlText.removeSuffix(" новое").trim()
if (manga.title.length > 25) {
for (word in manga.title.split(' ')) {
chapter.name = chapter.name.removePrefix(word).trim()
}
}
val dots = chapter.name.indexOf("…")
val numbers = chapter.name.findAnyOf(IntRange(0, 9).map { it.toString() })!!.first
if (dots in 0 until numbers) {
chapter.name = chapter.name.substringAfter("…").trim()
}
chapter.date_upload = element.select("td.hidden-xxs").last()?.text()?.let {
try {
SimpleDateFormat("dd.MM.yy", Locale.US).parse(it).time
@ -138,6 +167,10 @@ class Mintmanga : ParsedHttpSource() {
return chapter
}
override fun chapterFromElement(element: Element): SChapter {
throw Exception("Not used")
}
override fun prepareNewChapter(chapter: SChapter, manga: SManga) {
val basic = Regex("""\s*([0-9]+)(\s-\s)([0-9]+)\s*""")
val extra = Regex("""\s*([0-9]+\sЭкстра)\s*""")

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

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

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

@ -2,11 +2,14 @@ package eu.kanade.tachiyomi.extension.ru.readmanga
import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.source.model.*
import eu.kanade.tachiyomi.source.online.ParsedHttpSource
import eu.kanade.tachiyomi.util.asJsoup
import okhttp3.*
import org.jsoup.nodes.Document
import org.jsoup.nodes.Element
import rx.Observable
import java.text.ParseException
import java.text.SimpleDateFormat
import java.util.*
@ -115,19 +118,45 @@ class Readmanga : ParsedHttpSource() {
}
}
override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
return if (manga.status != SManga.LICENSED) {
client.newCall(chapterListRequest(manga))
.asObservableSuccess()
.map { response ->
chapterListParse(response, manga)
}
} else {
Observable.error(java.lang.Exception("Licensed - No chapters to show"))
}
}
private fun chapterListParse(response: Response, manga: SManga): List<SChapter> {
val document = response.asJsoup()
return document.select(chapterListSelector()).map { chapterFromElement(it, manga) }
}
override fun chapterListSelector() = "div.chapters-link > table > tbody > tr:has(td > a)"
override fun chapterFromElement(element: Element): SChapter {
private fun chapterFromElement(element: Element, manga: SManga): SChapter {
val urlElement = element.select("a").first()
val urlText = urlElement.text()
val chapter = SChapter.create()
chapter.setUrlWithoutDomain(urlElement.attr("href") + "?mtr=1")
if (urlText.endsWith(" новое")) {
chapter.name = urlText.dropLast(6)
} else {
chapter.name = urlText
chapter.name = urlText.removeSuffix(" новое").trim()
if (manga.title.length > 25) {
for (word in manga.title.split(' ')) {
chapter.name = chapter.name.removePrefix(word).trim()
}
}
val dots = chapter.name.indexOf("…")
val numbers = chapter.name.findAnyOf(IntRange(0, 9).map { it.toString() })!!.first
if (dots in 0 until numbers) {
chapter.name = chapter.name.substringAfter("…").trim()
}
chapter.date_upload = element.select("td.hidden-xxs").last()?.text()?.let {
try {
SimpleDateFormat("dd.MM.yy", Locale.US).parse(it).time
@ -138,6 +167,10 @@ class Readmanga : ParsedHttpSource() {
return chapter
}
override fun chapterFromElement(element: Element): SChapter {
throw Exception("Not used")
}
override fun prepareNewChapter(chapter: SChapter, manga: SManga) {
val basic = Regex("""\s*([0-9]+)(\s-\s)([0-9]+)\s*""")
val extra = Regex("""\s*([0-9]+\sЭкстра)\s*""")