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

Update domain and fix chapter list scraping (#8467)

This commit is contained in:
Arraiment 2021-08-08 23:37:59 +08:00 committed by GitHub
parent 029cf989b9
commit 5a0d513b94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ ext {
extName = 'Mangafreak' extName = 'Mangafreak'
pkgNameSuffix = 'en.mangafreak' pkgNameSuffix = 'en.mangafreak'
extClass = '.Mangafreak' extClass = '.Mangafreak'
extVersionCode = 3 extVersionCode = 4
libVersion = '1.2' libVersion = '1.2'
} }

18
src/en/mangafreak/src/eu/kanade/tachiyomi/extension/en/mangafreak/Mangafreak.kt
View File

@ -19,8 +19,11 @@ import java.util.concurrent.TimeUnit
class Mangafreak : ParsedHttpSource() { class Mangafreak : ParsedHttpSource() {
override val name: String = "Mangafreak" override val name: String = "Mangafreak"
override val lang: String = "en" override val lang: String = "en"
override val baseUrl: String = "https://w11.mangafreak.net"
override val baseUrl: String = "https://w12.mangafreak.net"
override val supportsLatest: Boolean = true override val supportsLatest: Boolean = true
override val client: OkHttpClient = network.cloudflareClient.newBuilder() override val client: OkHttpClient = network.cloudflareClient.newBuilder()
@ -28,7 +31,7 @@ class Mangafreak : ParsedHttpSource() {
.readTimeout(1, TimeUnit.MINUTES) .readTimeout(1, TimeUnit.MINUTES)
.retryOnConnectionFailure(true) .retryOnConnectionFailure(true)
.followRedirects(true) .followRedirects(true)
.build()!! .build()
private fun mangaFromElement(element: Element, urlSelector: String): SManga { private fun mangaFromElement(element: Element, urlSelector: String): SManga {
return SManga.create().apply { return SManga.create().apply {
@ -45,7 +48,7 @@ class Mangafreak : ParsedHttpSource() {
override fun popularMangaRequest(page: Int): Request { override fun popularMangaRequest(page: Int): Request {
return GET("$baseUrl/Genre/All/$page", headers) return GET("$baseUrl/Genre/All/$page", headers)
} }
override fun popularMangaNextPageSelector(): String? = "a.next_p" override fun popularMangaNextPageSelector(): String = "a.next_p"
override fun popularMangaSelector(): String = "div.ranking_item" override fun popularMangaSelector(): String = "div.ranking_item"
override fun popularMangaFromElement(element: Element): SManga = mangaFromElement(element, "a") override fun popularMangaFromElement(element: Element): SManga = mangaFromElement(element, "a")
@ -54,7 +57,7 @@ class Mangafreak : ParsedHttpSource() {
override fun latestUpdatesRequest(page: Int): Request { override fun latestUpdatesRequest(page: Int): Request {
return GET("$baseUrl/Latest_Releases/$page", headers) return GET("$baseUrl/Latest_Releases/$page", headers)
} }
override fun latestUpdatesNextPageSelector(): String? = popularMangaNextPageSelector() override fun latestUpdatesNextPageSelector(): String = popularMangaNextPageSelector()
override fun latestUpdatesSelector(): String = "div.latest_releases_item" override fun latestUpdatesSelector(): String = "div.latest_releases_item"
override fun latestUpdatesFromElement(element: Element): SManga = SManga.create().apply { override fun latestUpdatesFromElement(element: Element): SManga = SManga.create().apply {
thumbnail_url = element.select("img").attr("abs:src").replace("mini", "manga").substringBeforeLast("/") + ".jpg" thumbnail_url = element.select("img").attr("abs:src").replace("mini", "manga").substringBeforeLast("/") + ".jpg"
@ -68,7 +71,7 @@ class Mangafreak : ParsedHttpSource() {
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
val uri = Uri.parse(baseUrl).buildUpon() val uri = Uri.parse(baseUrl).buildUpon()
if (!query.isBlank()) { if (query.isNotBlank()) {
uri.appendPath("Search") uri.appendPath("Search")
.appendPath(query) .appendPath(query)
} }
@ -114,11 +117,12 @@ class Mangafreak : ParsedHttpSource() {
// Chapter // Chapter
override fun chapterListSelector(): String = "div.manga_series_list tbody tr" // HTML response does not actually include a tbody tag, must select tr directly
override fun chapterListSelector(): String = "div.manga_series_list tr:has(a)"
override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply {
name = element.select("td:eq(0)").text() name = element.select("td:eq(0)").text()
chapter_number = name.substringAfter("Chapter ").substringBefore(" -").toFloat() chapter_number = name.substringAfter("Chapter ").substringBefore(" -").toFloat()
url = element.select("a").attr("href") setUrlWithoutDomain(element.select("a").attr("href"))
date_upload = parseDate(element.select("td:eq(1)").text()) date_upload = parseDate(element.select("td:eq(1)").text())
} }
private fun parseDate(date: String): Long { private fun parseDate(date: String): Long {