HocVienTruyenTranh - Fix Referer (#2486)

HocVienTruyenTranh - Fix Referer

src/vi/academyvn/build.gradle

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

src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/HocVienTruyenTranh.kt

@@ -1,14 +1,19 @@
 package eu.kanade.tachiyomi.extension.vi.academyvn
 
 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 okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import java.util.*
+import java.util.Calendar
 
 class HocVienTruyenTranh : ParsedHttpSource() {
 
@@ -22,6 +27,8 @@ class HocVienTruyenTranh : ParsedHttpSource() {
 
     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 latestUpdatesSelector() = "table.table.table-hover > tbody > tr"
@@ -88,7 +95,7 @@ class HocVienTruyenTranh : ParsedHttpSource() {
         return manga
     }
 
-    fun parseStatus(status: String) = when {
+    private fun parseStatus(status: String) = when {
         status.contains("Đang tiến hành") -> SManga.ONGOING
         status.contains("Đã hoàn thành") -> SManga.COMPLETED
         else -> SManga.UNKNOWN
@@ -101,7 +108,8 @@ class HocVienTruyenTranh : ParsedHttpSource() {
         val chapter = SChapter.create()
         chapter.setUrlWithoutDomain(urlElement.attr("href"))
         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
     }
 
@@ -110,19 +118,26 @@ class HocVienTruyenTranh : ParsedHttpSource() {
         if (dateWords.size == 3) {
             val timeAgo = Integer.parseInt(dateWords[0])
             val dates: Calendar = Calendar.getInstance()
-            if (dateWords[1].contains("minute")) {
+            when {
+                dateWords[1].contains("minute") -> {
                     dates.add(Calendar.MINUTE, -timeAgo)
-            } else if (dateWords[1].contains("hour")) {
+                }
+                dateWords[1].contains("hour") -> {
                     dates.add(Calendar.HOUR_OF_DAY, -timeAgo)
-            } else if (dateWords[1].contains("day")) {
+                }
+                dateWords[1].contains("day") -> {
                     dates.add(Calendar.DAY_OF_YEAR, -timeAgo)
-            } else if (dateWords[1].contains("week")) {
+                }
+                dateWords[1].contains("week") -> {
                     dates.add(Calendar.WEEK_OF_YEAR, -timeAgo)
-            } else if (dateWords[1].contains("month")) {
+                }
+                dateWords[1].contains("month") -> {
                     dates.add(Calendar.MONTH, -timeAgo)
-            } else if (dateWords[1].contains("year")) {
+                }
+                dateWords[1].contains("year") -> {
                     dates.add(Calendar.YEAR, -timeAgo)
                 }
+            }
             return dates.timeInMillis
         }
         return 0L
@@ -138,17 +153,10 @@ class HocVienTruyenTranh : ParsedHttpSource() {
         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 Status : Filter.Select<String>("Status", arrayOf("Ngưng", "Đang tiến hành", "Đã hoàn thành", "Tất cả"))