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

FMReader: fix KissLove and Manga-TR (#5710)

This commit is contained in:
scb261 2021-02-09 00:49:53 +02:00 committed by GitHub
parent 0ce4416f09
commit 975b311637
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ ext {
extName = 'FMReader (multiple aggregators)' extName = 'FMReader (multiple aggregators)'
pkgNameSuffix = 'all.fmreader' pkgNameSuffix = 'all.fmreader'
extClass = '.FMReaderFactory' extClass = '.FMReaderFactory'
extVersionCode = 27 extVersionCode = 28
libVersion = '1.2' libVersion = '1.2'
containsNsfw = true containsNsfw = true
} }

11
src/all/fmreader/src/eu/kanade/tachiyomi/extension/all/fmreader/FMReader.kt
View File

@ -279,10 +279,13 @@ abstract class FMReader(
protected fun base64PageListParse(document: Document): List<Page> { protected fun base64PageListParse(document: Document): List<Page> {
fun Element.decoded(): String { fun Element.decoded(): String {
val attr = val attr =
if (this.hasAttr("data-original")) "data-original" when {
else if (this.hasAttr("data-src")) "data-src" this.hasAttr("data-original") -> "data-original"
else if (this.hasAttr("data-srcset")) "data-srcset" this.hasAttr("data-src") -> "data-src"
else "src" this.hasAttr("data-srcset") -> "data-srcset"
this.hasAttr("data-aload") -> "data-aload"
else -> "src"
}
return if (!this.attr(attr).contains(".")) { return if (!this.attr(attr).contains(".")) {
Base64.decode(this.attr(attr), Base64.DEFAULT).toString(Charset.defaultCharset()) Base64.decode(this.attr(attr), Base64.DEFAULT).toString(Charset.defaultCharset())
} else { } else {

4
src/all/fmreader/src/eu/kanade/tachiyomi/extension/all/fmreader/FMReaderFactory.kt
View File

@ -12,6 +12,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.util.asJsoup import eu.kanade.tachiyomi.util.asJsoup
import okhttp3.FormBody import okhttp3.FormBody
import okhttp3.Headers
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
import okhttp3.Response import okhttp3.Response
@ -106,6 +107,9 @@ class EighteenLHPlus : FMReader("18LHPlus", "https://18lhplus.com", "en") {
} }
class MangaTR : FMReader("Manga-TR", "https://manga-tr.com", "tr") { class MangaTR : FMReader("Manga-TR", "https://manga-tr.com", "tr") {
override fun headersBuilder() = Headers.Builder().apply {
add("User-Agent", "Mozilla/5.0 (Windows NT 6.3; WOW64)")
}
override fun popularMangaNextPageSelector() = "div.btn-group:not(div.btn-block) button.btn-info" override fun popularMangaNextPageSelector() = "div.btn-group:not(div.btn-block) button.btn-info"
// TODO: genre search possible but a bit of a pain // TODO: genre search possible but a bit of a pain
override fun getFilterList() = FilterList() override fun getFilterList() = FilterList()