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

Fix missing titles in Viz Shonen Jump. (#13516)

This commit is contained in:
Alessandro Jean 2022-09-19 16:27:36 -03:00 committed by GitHub
parent 5d8b98f369
commit ad7c766be2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ ext {
extName = 'VIZ Shonen Jump' extName = 'VIZ Shonen Jump'
pkgNameSuffix = 'en.vizshonenjump' pkgNameSuffix = 'en.vizshonenjump'
extClass = '.VizShonenJump' extClass = '.VizShonenJump'
extVersionCode = 13 extVersionCode = 14
} }
dependencies { dependencies {

43
src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/VizShonenJump.kt
View File

@ -27,7 +27,6 @@ import org.jsoup.nodes.Document
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import rx.Observable import rx.Observable
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
import java.text.ParseException
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Locale import java.util.Locale
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@ -65,14 +64,19 @@ class VizShonenJump : ParsedHttpSource() {
.set("Referer", baseUrl) .set("Referer", baseUrl)
.build() .build()
return GET("$baseUrl/shonenjump", newHeaders, CacheControl.FORCE_NETWORK) return GET(
url = "$baseUrl/read/shonenjump/section/free-chapters",
headers = newHeaders,
cache = CacheControl.FORCE_NETWORK
)
} }
override fun popularMangaParse(response: Response): MangasPage { override fun popularMangaParse(response: Response): MangasPage {
val mangasPage = super.popularMangaParse(response) if (!response.request.url.toString().contains("section/free-chapters")) {
if (mangasPage.mangas.isEmpty())
throw Exception(COUNTRY_NOT_SUPPORTED) throw Exception(COUNTRY_NOT_SUPPORTED)
}
val mangasPage = super.popularMangaParse(response)
mangaList = mangasPage.mangas.sortedBy { it.title } mangaList = mangasPage.mangas.sortedBy { it.title }
@ -83,8 +87,8 @@ class VizShonenJump : ParsedHttpSource() {
"section.section_chapters div.o_sort_container div.o_sortable > a.o_chapters-link" "section.section_chapters div.o_sort_container div.o_sortable > a.o_chapters-link"
override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply { override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply {
title = element.select("div.pad-x-rg").first().text() title = element.selectFirst("div.pad-x-rg").text()
thumbnail_url = element.select("div.pos-r img.disp-bl").first() thumbnail_url = element.selectFirst("div.pos-r img.disp-bl")
?.attr("data-original") ?.attr("data-original")
url = element.attr("href") url = element.attr("href")
} }
@ -94,10 +98,11 @@ class VizShonenJump : ParsedHttpSource() {
override fun latestUpdatesRequest(page: Int): Request = popularMangaRequest(page) override fun latestUpdatesRequest(page: Int): Request = popularMangaRequest(page)
override fun latestUpdatesParse(response: Response): MangasPage { override fun latestUpdatesParse(response: Response): MangasPage {
val mangasPage = super.latestUpdatesParse(response) if (!response.request.url.toString().contains("section/free-chapters")) {
if (mangasPage.mangas.isEmpty())
throw Exception(COUNTRY_NOT_SUPPORTED) throw Exception(COUNTRY_NOT_SUPPORTED)
}
val mangasPage = super.latestUpdatesParse(response)
mangaList = mangasPage.mangas.sortedBy { it.title } mangaList = mangasPage.mangas.sortedBy { it.title }
@ -123,12 +128,11 @@ class VizShonenJump : ParsedHttpSource() {
popularMangaRequest(page) popularMangaRequest(page)
override fun searchMangaParse(response: Response): MangasPage { override fun searchMangaParse(response: Response): MangasPage {
val mangasPage = super.searchMangaParse(response) if (!response.request.url.toString().contains("section/free-chapters")) {
if (mangasPage.mangas.isEmpty())
throw Exception(COUNTRY_NOT_SUPPORTED) throw Exception(COUNTRY_NOT_SUPPORTED)
}
return mangasPage return super.searchMangaParse(response)
} }
override fun searchMangaSelector() = popularMangaSelector() override fun searchMangaSelector() = popularMangaSelector()
@ -321,7 +325,7 @@ class VizShonenJump : ParsedHttpSource() {
.toString() .toString()
val authCheckRequest = GET(authCheckUrl, authCheckHeaders) val authCheckRequest = GET(authCheckUrl, authCheckHeaders)
val authCheckResponse = chain.proceed(authCheckRequest) val authCheckResponse = chain.proceed(authCheckRequest)
val authCheckJson = Json.parseToJsonElement(authCheckResponse.body!!.string()).jsonObject val authCheckJson = json.parseToJsonElement(authCheckResponse.body!!.string()).jsonObject
authCheckResponse.close() authCheckResponse.close()
@ -354,17 +358,14 @@ class VizShonenJump : ParsedHttpSource() {
} }
private fun String.toDate(): Long { private fun String.toDate(): Long {
return try { return runCatching { DATE_FORMATTER.parse(this)?.time }
DATE_FORMATTER.parse(this)!!.time .getOrNull() ?: 0L
} catch (e: ParseException) {
0L
}
} }
companion object { companion object {
private const val ACCEPT_JSON = "application/json, text/javascript, */*; q=0.01" private const val ACCEPT_JSON = "application/json, text/javascript, */*; q=0.01"
private const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " + private const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.63 Safari/537.36" "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36"
private val DATE_FORMATTER by lazy { private val DATE_FORMATTER by lazy {
SimpleDateFormat("MMMM d, yyyy", Locale.ENGLISH) SimpleDateFormat("MMMM d, yyyy", Locale.ENGLISH)