parent
bb75ae36e7
commit
8c7f09bc28
@ -5,7 +5,7 @@ ext {
|
|||||||
appName = 'Tachiyomi: Dragon Ball Multiverse'
|
appName = 'Tachiyomi: Dragon Ball Multiverse'
|
||||||
pkgNameSuffix = 'en.dragonball_multiverse'
|
pkgNameSuffix = 'en.dragonball_multiverse'
|
||||||
extClass = '.DbMultiverse'
|
extClass = '.DbMultiverse'
|
||||||
extVersionCode = 1
|
extVersionCode = 2
|
||||||
libVersion = '1.2'
|
libVersion = '1.2'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,7 +6,9 @@ import eu.kanade.tachiyomi.source.model.Page
|
|||||||
import eu.kanade.tachiyomi.source.model.SChapter
|
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 eu.kanade.tachiyomi.util.asJsoup
|
||||||
import okhttp3.Request
|
import okhttp3.Request
|
||||||
|
import okhttp3.Response
|
||||||
import org.jsoup.nodes.Document
|
import org.jsoup.nodes.Document
|
||||||
import org.jsoup.nodes.Element
|
import org.jsoup.nodes.Element
|
||||||
import rx.Observable
|
import rx.Observable
|
||||||
@ -18,16 +20,14 @@ open class DbMultiverse : ParsedHttpSource() {
|
|||||||
override val supportsLatest = false
|
override val supportsLatest = false
|
||||||
override val lang = "en"
|
override val lang = "en"
|
||||||
|
|
||||||
override fun chapterFromElement(element: Element): SChapter {
|
private fun chapterFromElement(element: Element, name: String): SChapter {
|
||||||
val chapterUrl = element.attr("href")
|
|
||||||
|
|
||||||
val chapter = SChapter.create()
|
val chapter = SChapter.create()
|
||||||
chapter.url = "/en/$chapterUrl"
|
chapter.setUrlWithoutDomain(element.attr("abs:href"))
|
||||||
chapter.name = element.text().let { name ->
|
chapter.name = name + element.text().let { num ->
|
||||||
if (name.contains("-")) {
|
if (num.contains("-")) {
|
||||||
"Pages $name"
|
"Pages $num"
|
||||||
} else {
|
} else {
|
||||||
"Page $name"
|
"Page $num"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return chapter
|
return chapter
|
||||||
@ -35,26 +35,43 @@ open class DbMultiverse : ParsedHttpSource() {
|
|||||||
|
|
||||||
override fun chapterListSelector(): String = "div.cadrelect.chapters a[href*=page-]"
|
override fun chapterListSelector(): String = "div.cadrelect.chapters a[href*=page-]"
|
||||||
|
|
||||||
|
override fun chapterListParse(response: Response): List<SChapter> {
|
||||||
|
val chapters = mutableListOf<SChapter>()
|
||||||
|
val document = response.asJsoup()
|
||||||
|
|
||||||
|
document.select("div[ch]").forEach { container ->
|
||||||
|
container.select(chapterListSelector()).mapIndexed { i, chapter ->
|
||||||
|
// Each page is its own chapter, add chapter name when a first page is mapped
|
||||||
|
val name = if (i == 0) container.select("h4").text() + " - " else ""
|
||||||
|
chapters.add(chapterFromElement(chapter, name))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return chapters.reversed()
|
||||||
|
}
|
||||||
|
|
||||||
override fun pageListParse(document: Document): List<Page> {
|
override fun pageListParse(document: Document): List<Page> {
|
||||||
return document.select("img[src*=/final/]").mapIndexed { index, element ->
|
return document.select("div#h_read img").mapIndexed { index, element ->
|
||||||
Page(index, "", baseUrl + element.attr("src"))
|
Page(index, "", element.attr("abs:src"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun mangaDetailsParse(document: Document): SManga = createManga()
|
override fun mangaDetailsParse(document: Document): SManga = createManga(document)
|
||||||
|
|
||||||
override fun fetchPopularManga(page: Int): Observable<MangasPage> {
|
override fun fetchPopularManga(page: Int): Observable<MangasPage> {
|
||||||
return Observable.just(MangasPage(listOf(createManga()), hasNextPage = false))
|
return Observable.just(MangasPage(listOf(createManga(null)), hasNextPage = false))
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun createManga() = SManga.create().apply {
|
private fun createManga(document: Document?) = SManga.create().apply {
|
||||||
title = name
|
title = name
|
||||||
status = SManga.ONGOING
|
status = SManga.ONGOING
|
||||||
url = "/en/chapters.html"
|
url = "/en/chapters.html"
|
||||||
description = "Dragon Ball Multiverse (DBM) is a free online comic, made by a whole team of fans. It's our personal sequel to DBZ."
|
description = "Dragon Ball Multiverse (DBM) is a free online comic, made by a whole team of fans. It's our personal sequel to DBZ."
|
||||||
thumbnail_url = "$baseUrl/en/pages/final/0000.jpg"
|
thumbnail_url = document?.select("div[ch=\"1\"] img")?.attr("abs:src")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun chapterFromElement(element: Element): SChapter = throw UnsupportedOperationException()
|
||||||
|
|
||||||
override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException()
|
override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException()
|
||||||
|
|
||||||
override fun popularMangaFromElement(element: Element): SManga = throw UnsupportedOperationException()
|
override fun popularMangaFromElement(element: Element): SManga = throw UnsupportedOperationException()
|
||||||
@ -82,4 +99,4 @@ open class DbMultiverse : ParsedHttpSource() {
|
|||||||
override fun latestUpdatesRequest(page: Int): Request = throw UnsupportedOperationException()
|
override fun latestUpdatesRequest(page: Int): Request = throw UnsupportedOperationException()
|
||||||
|
|
||||||
override fun latestUpdatesSelector(): String = throw UnsupportedOperationException()
|
override fun latestUpdatesSelector(): String = throw UnsupportedOperationException()
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user