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

Fix issue parsing chapter list (#8417)

Browse Source
This commit is contained in:
Arraiment 2021-08-06 18:09:08 +08:00 committed by GitHub
parent 792734c22f
commit 714c773714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/en/mangaowl/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'MangaOwl' extName = 'MangaOwl'
pkgNameSuffix = 'en.mangaowl' pkgNameSuffix = 'en.mangaowl'
extClass = '.MangaOwl' extClass = '.MangaOwl'
extVersionCode = 18 extVersionCode = 19
libVersion = '1.2' libVersion = '1.2'
} }

19
src/en/mangaowl/src/eu/kanade/tachiyomi/extension/en/mangaowl/MangaOwl.kt
View File

@ -8,7 +8,6 @@ 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.source.online.ParsedHttpSource import eu.kanade.tachiyomi.source.online.ParsedHttpSource
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import okhttp3.Headers
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
import org.jsoup.nodes.Document import org.jsoup.nodes.Document
@ -79,10 +78,10 @@ class MangaOwl : ParsedHttpSource() {
is SortFilter -> url.addQueryParameter("sort", filter.toUriPart()) is SortFilter -> url.addQueryParameter("sort", filter.toUriPart())
is StatusFilter -> url.addQueryParameter("completed", filter.toUriPart()) is StatusFilter -> url.addQueryParameter("completed", filter.toUriPart())
is GenreFilter -> { is GenreFilter -> {
val genres = filter.state val genres = filter.state
.filter { it.state } .filter { it.state }
.joinToString(".") { it.uriPart } .joinToString(".") { it.uriPart }
url.addQueryParameter("genres", genres) url.addQueryParameter("genres", genres)
} }
} }
} }
@ -122,14 +121,15 @@ class MangaOwl : ParsedHttpSource() {
// Chapters // Chapters
override fun chapterListSelector() = "div.table-chapter-list ul li" // Only selects chapter elements with links, since sometimes chapter lists have unlinked chapters
override fun chapterListSelector() = "div.table-chapter-list ul li:has(a)"
override fun chapterFromElement(element: Element): SChapter { override fun chapterFromElement(element: Element): SChapter {
val chapter = SChapter.create() val chapter = SChapter.create()
element.select("a").let { element.select("a").let {
// They replace some URLs with a different host getting a path of domain.com/reader/reader/, fix to make usable on baseUrl // They replace some URLs with a different host getting a path of domain.com/reader/reader/, fix to make usable on baseUrl
chapter.setUrlWithoutDomain(it.attr("href").replace("/reader/reader/", "/reader/")) chapter.setUrlWithoutDomain(it.attr("href").replace("/reader/reader/", "/reader/"))
chapter.name = it.select("label")[0].text() chapter.name = it.select("label").first().text()
} }
chapter.date_upload = parseChapterDate(element.select("small:last-of-type").text()) chapter.date_upload = parseChapterDate(element.select("small:last-of-type").text())
@ -160,7 +160,6 @@ class MangaOwl : ParsedHttpSource() {
override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used") override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used")
// Filters // Filters
override fun getFilterList() = FilterList( override fun getFilterList() = FilterList(
@ -169,12 +168,12 @@ class MangaOwl : ParsedHttpSource() {
StatusFilter(), StatusFilter(),
GenreFilter(getGenreList()) GenreFilter(getGenreList())
) )
private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) : private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) { Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
fun toUriPart() = vals[state].second fun toUriPart() = vals[state].second
} }
private class SearchFilter : UriPartFilter( private class SearchFilter : UriPartFilter(
"Search in", "Search in",
arrayOf( arrayOf(