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

HocVienTruyenTranh - Fix Referer (#2486) 

HocVienTruyenTranh - Fix Referer
This commit is contained in:
happywillow0 2020-03-23 16:44:27 -04:00 committed by GitHub
parent 5bad39943e
commit 0aabe51c88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 74 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vi/academyvn/build.gradle
View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: HocVienTruyenTranh' appName = 'Tachiyomi: HocVienTruyenTranh'
pkgNameSuffix = 'vi.academyvn' pkgNameSuffix = 'vi.academyvn'
extClass = '.HocVienTruyenTranh' extClass = '.HocVienTruyenTranh'
extVersionCode = 7 extVersionCode = 8
libVersion = '1.2' libVersion = '1.2'
} }

138
src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/HocVienTruyenTranh.kt
View File

@ -1,14 +1,19 @@
package eu.kanade.tachiyomi.extension.vi.academyvn package eu.kanade.tachiyomi.extension.vi.academyvn
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.source.model.* import eu.kanade.tachiyomi.source.model.Filter
import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.ParsedHttpSource import eu.kanade.tachiyomi.source.online.ParsedHttpSource
import okhttp3.Headers
import okhttp3.HttpUrl import okhttp3.HttpUrl
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
import org.jsoup.nodes.Document import org.jsoup.nodes.Document
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import java.util.* import java.util.Calendar
class HocVienTruyenTranh : ParsedHttpSource() { class HocVienTruyenTranh : ParsedHttpSource() {
@ -22,6 +27,8 @@ class HocVienTruyenTranh : ParsedHttpSource() {
override val client: OkHttpClient = network.cloudflareClient override val client: OkHttpClient = network.cloudflareClient
override fun headersBuilder(): Headers.Builder = super.headersBuilder().add("Referer", baseUrl)
override fun popularMangaSelector() = "table.table.table-hover > tbody > tr" override fun popularMangaSelector() = "table.table.table-hover > tbody > tr"
override fun latestUpdatesSelector() = "table.table.table-hover > tbody > tr" override fun latestUpdatesSelector() = "table.table.table-hover > tbody > tr"
@ -88,7 +95,7 @@ class HocVienTruyenTranh : ParsedHttpSource() {
return manga return manga
} }
fun parseStatus(status: String) = when { private fun parseStatus(status: String) = when {
status.contains("Đang tiến hành") -> SManga.ONGOING status.contains("Đang tiến hành") -> SManga.ONGOING
status.contains("Đã hoàn thành") -> SManga.COMPLETED status.contains("Đã hoàn thành") -> SManga.COMPLETED
else -> SManga.UNKNOWN else -> SManga.UNKNOWN
@ -101,7 +108,8 @@ class HocVienTruyenTranh : ParsedHttpSource() {
val chapter = SChapter.create() val chapter = SChapter.create()
chapter.setUrlWithoutDomain(urlElement.attr("href")) chapter.setUrlWithoutDomain(urlElement.attr("href"))
chapter.name = urlElement.attr("title") chapter.name = urlElement.attr("title")
chapter.date_upload = element.select("td.text-center").last()?.text()?.let { parseChapterDate(it) } ?: 0 chapter.date_upload = element.select("td.text-center").last()?.text()?.let { parseChapterDate(it) }
?: 0
return chapter return chapter
} }
@ -110,18 +118,25 @@ class HocVienTruyenTranh : ParsedHttpSource() {
if (dateWords.size == 3) { if (dateWords.size == 3) {
val timeAgo = Integer.parseInt(dateWords[0]) val timeAgo = Integer.parseInt(dateWords[0])
val dates: Calendar = Calendar.getInstance() val dates: Calendar = Calendar.getInstance()
if (dateWords[1].contains("minute")) { when {
dates.add(Calendar.MINUTE, -timeAgo) dateWords[1].contains("minute") -> {
} else if (dateWords[1].contains("hour")) { dates.add(Calendar.MINUTE, -timeAgo)
dates.add(Calendar.HOUR_OF_DAY, -timeAgo) }
} else if (dateWords[1].contains("day")) { dateWords[1].contains("hour") -> {
dates.add(Calendar.DAY_OF_YEAR, -timeAgo) dates.add(Calendar.HOUR_OF_DAY, -timeAgo)
} else if (dateWords[1].contains("week")) { }
dates.add(Calendar.WEEK_OF_YEAR, -timeAgo) dateWords[1].contains("day") -> {
} else if (dateWords[1].contains("month")) { dates.add(Calendar.DAY_OF_YEAR, -timeAgo)
dates.add(Calendar.MONTH, -timeAgo) }
} else if (dateWords[1].contains("year")) { dateWords[1].contains("week") -> {
dates.add(Calendar.YEAR, -timeAgo) dates.add(Calendar.WEEK_OF_YEAR, -timeAgo)
}
dateWords[1].contains("month") -> {
dates.add(Calendar.MONTH, -timeAgo)
}
dateWords[1].contains("year") -> {
dates.add(Calendar.YEAR, -timeAgo)
}
} }
return dates.timeInMillis return dates.timeInMillis
} }
@ -138,17 +153,10 @@ class HocVienTruyenTranh : ParsedHttpSource() {
return pages return pages
} }
override fun imageRequest(page: Page): Request { override fun imageUrlParse(document: Document): String = throw Exception("Not Used")
val imgHeaders = headersBuilder().add("Referer", page.url).build()
return GET(page.imageUrl!!, imgHeaders)
}
override fun imageUrlRequest(page: Page) = GET(page.url) private var type = arrayOf("Khác", "Manga", "Manhwa", "Manhua", "Tất cả")
private var status = arrayOf("Ngưng", "Đang tiến hành", "Đã hoàn thành", "Tất cả")
override fun imageUrlParse(document: Document) = ""
var type = arrayOf("Khác", "Manga", "Manhwa", "Manhua", "Tất cả")
var status = arrayOf("Ngưng", "Đang tiến hành", "Đã hoàn thành", "Tất cả")
private class Type : Filter.Select<String>("Type", arrayOf("Khác", "Manga", "Manhwa", "Manhua", "Tất cả")) private class Type : Filter.Select<String>("Type", arrayOf("Khác", "Manga", "Manhwa", "Manhua", "Tất cả"))
private class Status : Filter.Select<String>("Status", arrayOf("Ngưng", "Đang tiến hành", "Đã hoàn thành", "Tất cả")) private class Status : Filter.Select<String>("Status", arrayOf("Ngưng", "Đang tiến hành", "Đã hoàn thành", "Tất cả"))
@ -156,47 +164,47 @@ class HocVienTruyenTranh : ParsedHttpSource() {
private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Thể loại", genres) private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Thể loại", genres)
override fun getFilterList() = FilterList( override fun getFilterList() = FilterList(
Type(), Type(),
Status(), Status(),
GenreList(getGenreList()) GenreList(getGenreList())
) )
private fun getGenreList() = listOf( private fun getGenreList() = listOf(
Genre("Action"), Genre("Action"),
Genre("Adult"), Genre("Adult"),
Genre("Adventure"), Genre("Adventure"),
Genre("Comedy"), Genre("Comedy"),
Genre("Doujinshi"), Genre("Doujinshi"),
Genre("Drama"), Genre("Drama"),
Genre("Ecchi"), Genre("Ecchi"),
Genre("Fantasy"), Genre("Fantasy"),
Genre("Gender Bender"), Genre("Gender Bender"),
Genre("Harem"), Genre("Harem"),
Genre("Historical"), Genre("Historical"),
Genre("Horror"), Genre("Horror"),
Genre("Josei"), Genre("Josei"),
Genre("Martial Arts"), Genre("Martial Arts"),
Genre("Mature"), Genre("Mature"),
Genre("Mecha"), Genre("Mecha"),
Genre("Mystery"), Genre("Mystery"),
Genre("One shot"), Genre("One shot"),
Genre("Psychological"), Genre("Psychological"),
Genre("Romance"), Genre("Romance"),
Genre("School Life"), Genre("School Life"),
Genre("Sci-fi"), Genre("Sci-fi"),
Genre("Seinen"), Genre("Seinen"),
Genre("Shoujo"), Genre("Shoujo"),
Genre("Shoujo Ai"), Genre("Shoujo Ai"),
Genre("Shounen"), Genre("Shounen"),
Genre("Shounen Ai"), Genre("Shounen Ai"),
Genre("Slice of Life"), Genre("Slice of Life"),
Genre("Smut"), Genre("Smut"),
Genre("Sports"), Genre("Sports"),
Genre("Supernatural"), Genre("Supernatural"),
Genre("Tragedy"), Genre("Tragedy"),
Genre("Webtoon"), Genre("Webtoon"),
Genre("Yaoi"), Genre("Yaoi"),
Genre("Yuri"), Genre("Yuri"),
Genre("Hot") Genre("Hot")
) )
} }