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

Compare commits

base: Draff:2ff510b3d518b9dac0ed9fa4172b63314917541d
Branches Tags
Draff:master
Draff:repo
Draff:orig-archive
..
compare: Draff:55d4ae23c55b2590ad4224c278bcc840514b694b
Branches Tags
Draff:repo
Draff:master
Draff:orig-archive

No commits in common. "2ff510b3d518b9dac0ed9fa4172b63314917541d" and "55d4ae23c55b2590ad4224c278bcc840514b694b" have entirely different histories.
2ff510b3d5 ... 55d4ae23c5

9 changed files with 26 additions and 24 deletions
Show Stats Expand all files Collapse all files

2
multisrc/overrides/wpcomics/nettruyen/src/NetTruyen.kt
View File

@ -9,7 +9,7 @@ import okhttp3.Request
import java.text.SimpleDateFormat
import java.util.Locale
class NetTruyen : WPComics("NetTruyen", "https://www.nettruyenclub.com", "vi", SimpleDateFormat("dd/MM/yy", Locale.getDefault()), null) {
class NetTruyen : WPComics("NetTruyen", "https://www.nettruyenbing.com", "vi", SimpleDateFormat("dd/MM/yy", Locale.getDefault()), null) {
override fun headersBuilder(): Headers.Builder = Headers.Builder()
override fun imageRequest(page: Page): Request = GET(page.imageUrl!!, headersBuilder().add("Referer", baseUrl).build())
override fun getFilterList(): FilterList {

2
multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpcomics/WPComicsGenerator.kt
View File

@ -12,7 +12,7 @@ class WPComicsGenerator : ThemeSourceGenerator {
override val baseVersionCode: Int = 2
override val sources = listOf(
SingleLang("NetTruyen", "https://www.nettruyenclub.com", "vi", overrideVersionCode = 21),
SingleLang("NetTruyen", "https://www.nettruyenbing.com", "vi", overrideVersionCode = 20),
SingleLang("NhatTruyen", "https://nhattruyenmax.com", "vi", overrideVersionCode = 13),
SingleLang("TruyenChon", "http://truyenchon.com", "vi", overrideVersionCode = 3),
SingleLang("XOXO Comics", "https://xoxocomic.com", "en", className = "XoxoComics", overrideVersionCode = 3),

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

@ -6,7 +6,7 @@ ext {
extName = 'Dynasty'
pkgNameSuffix = 'en.dynasty'
extClass = '.DynastyFactory'
extVersionCode = 22
extVersionCode = 21
}
apply from: "$rootDir/common.gradle"

4
src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyAnthologies.kt
View File

@ -12,9 +12,7 @@ class DynastyAnthologies : DynastyScans() {
override val searchPrefix = "anthologies"
override val categoryPrefix = "Anthology"
override fun popularMangaInitialUrl() = ""
override fun popularMangaInitialUrl() = "$baseUrl/anthologies?view=cover"
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
return GET("$baseUrl/search?q=$query&classes%5B%5D=Anthology&sort=&page=$page", headers)

10
src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyChapters.kt
View File

@ -13,9 +13,9 @@ import org.jsoup.nodes.Element
class DynastyChapters : DynastyScans() {
override val name = "Dynasty-Chapters"
override val searchPrefix = "chapters"
override val categoryPrefix = "Chapter"
override fun popularMangaInitialUrl() = ""
private fun popularMangaInitialUrl(page: Int) = "$baseUrl/search?q=&classes%5B%5D=Chapter&page=$page=$&sort="
private fun latestUpdatesInitialUrl(page: Int) = "$baseUrl/search?q=&classes%5B%5D=Chapter&page=$page=$&sort=created_at"
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
@ -76,15 +76,23 @@ class DynastyChapters : DynastyScans() {
return chapter
}
override fun popularMangaRequest(page: Int): Request {
return GET(popularMangaInitialUrl(page), headers)
}
override fun latestUpdatesRequest(page: Int): Request {
return GET(latestUpdatesInitialUrl(page), headers)
}
override fun popularMangaNextPageSelector() = searchMangaNextPageSelector()
override fun latestUpdatesNextPageSelector() = searchMangaNextPageSelector()
override fun popularMangaSelector() = searchMangaSelector()
override fun latestUpdatesSelector() = searchMangaSelector()
override fun popularMangaFromElement(element: Element) = searchMangaFromElement(element)
override fun latestUpdatesFromElement(element: Element) = searchMangaFromElement(element)
override fun popularMangaParse(response: Response) = searchMangaParse(response)
override fun latestUpdatesParse(response: Response) = searchMangaParse(response)
}

5
src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyDoujins.kt
View File

@ -17,8 +17,7 @@ class DynastyDoujins : DynastyScans() {
override val searchPrefix = "doujins"
override val categoryPrefix = "Doujin"
override fun popularMangaInitialUrl() = ""
override fun popularMangaInitialUrl() = "$baseUrl/doujins?view=cover"
override fun popularMangaFromElement(element: Element): SManga {
return super.popularMangaFromElement(element).apply {
@ -52,7 +51,7 @@ class DynastyDoujins : DynastyScans() {
override fun chapterListParse(response: Response): List<SChapter> {
val document = response.asJsoup()
val chapters = try { document.select(chapterListSelector()).map { chapterFromElement(it) }.toMutableList() } catch (e: IndexOutOfBoundsException) { mutableListOf() }
val chapters = document.select(chapterListSelector()).map { chapterFromElement(it) }.toMutableList()
document.select("a.thumbnail img").let { images ->
if (images.isNotEmpty()) {

4
src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyIssues.kt
View File

@ -12,9 +12,7 @@ class DynastyIssues : DynastyScans() {
override val searchPrefix = "issues"
override val categoryPrefix = "Issue"
override fun popularMangaInitialUrl() = ""
override fun popularMangaInitialUrl() = "$baseUrl/issues?view=cover"
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
return GET("$baseUrl/search?q=$query&classes%5B%5D=Issue&sort=&page=$page", headers)

17
src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyScans.kt
View File

@ -39,8 +39,6 @@ abstract class DynastyScans : ParsedHttpSource() {
open val searchPrefix = ""
open val categoryPrefix = ""
private var parent: List<Node> = ArrayList()
private var list = InternalList(ArrayList(), "")
@ -51,13 +49,11 @@ abstract class DynastyScans : ParsedHttpSource() {
private val json: Json by injectLazy()
protected fun popularMangaInitialUrl(page: Int) = "$baseUrl/search?q=&classes%5B%5D=$categoryPrefix&page=$page=$&sort="
override fun popularMangaRequest(page: Int): Request {
return GET(popularMangaInitialUrl(page), headers)
return GET(popularMangaInitialUrl(), headers)
}
override fun popularMangaSelector() = searchMangaSelector()
override fun popularMangaSelector() = "ul.thumbnails > li.span2"
override fun popularMangaFromElement(element: Element): SManga {
val manga = SManga.create()
@ -66,7 +62,12 @@ abstract class DynastyScans : ParsedHttpSource() {
return manga
}
override fun popularMangaParse(response: Response) = searchMangaParse(response)
override fun popularMangaParse(response: Response): MangasPage {
val mangas = response.asJsoup().select(popularMangaSelector()).map { element ->
popularMangaFromElement(element)
}
return MangasPage(mangas, false)
}
override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable<MangasPage> {
if (query.startsWith("manga:")) {
@ -248,7 +249,7 @@ abstract class DynastyScans : ParsedHttpSource() {
data class Validate(val _isManga: Boolean, val _pos: Int)
override fun popularMangaNextPageSelector() = searchMangaNextPageSelector()
override fun popularMangaNextPageSelector() = ""
override fun latestUpdatesSelector() = ""
override fun latestUpdatesNextPageSelector() = ""
override fun imageUrlParse(document: Document): String = ""

4
src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastySeries.kt
View File

@ -14,9 +14,7 @@ class DynastySeries : DynastyScans() {
override val searchPrefix = "series"
override val categoryPrefix = "Series"
override fun popularMangaInitialUrl() = ""
override fun popularMangaInitialUrl() = "$baseUrl/series?view=cover"
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
return GET("$baseUrl/search?q=$query&classes%5B%5D=Series&sort=&page=$page", headers)