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

Mangahub update (#966)

Browse Source 
* Mangahub update

* lint

* Constructor
This commit is contained in:
Mike 2024-02-03 22:12:06 -05:00 committed by Draff
parent 4856f0b89e
commit c286c4bc7a
13 changed files with 115 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
multisrc/overrides/mangahub/mangafoxfun/src/MangaFoxFun.kt Normal file
View File

@ -0,0 +1,5 @@
package eu.kanade.tachiyomi.extension.en.mangafoxfun
import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
class MangaFoxFun : MangaHub("MangaFox.fun", "https://mangafox.fun", "en", "mf01")

5
multisrc/overrides/mangahub/mangahereonl/src/MangaHereOnl.kt Normal file
View File

@ -0,0 +1,5 @@
package eu.kanade.tachiyomi.extension.en.mangahereonl
import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
class MangaHereOnl : MangaHub("MangaHere.onl", "https://mangahere.onl", "en", "mh01")

5
multisrc/overrides/mangahub/mangahubio/src/MangaHubIo.kt Normal file
View File

@ -0,0 +1,5 @@
package eu.kanade.tachiyomi.extension.en.mangahubio
import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
class MangaHubIo : MangaHub("MangaHub", "https://mangahub.io", "en", "m01")

5
multisrc/overrides/mangahub/mangakakalotfun/src/MangakakalotFun.kt Normal file
View File

@ -0,0 +1,5 @@
package eu.kanade.tachiyomi.extension.en.mangakakalotfun
import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
class MangakakalotFun : MangaHub("Mangakakalot.fun", "https://mangakakalot.fun", "en", "mn01")

5
multisrc/overrides/mangahub/manganel/src/MangaNel.kt Normal file
View File

@ -0,0 +1,5 @@
package eu.kanade.tachiyomi.extension.en.manganel
import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
class MangaNel : MangaHub("MangaNel", "https://manganel.me", "en", "mn05")

5
multisrc/overrides/mangahub/mangaonlinefun/src/MangaOnlineFun.kt Normal file
View File

@ -0,0 +1,5 @@
package eu.kanade.tachiyomi.extension.en.mangaonlinefun
import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
class MangaOnlineFun : MangaHub("MangaOnline.fun", "https://mangaonline.fun", "en", "m02")

5
multisrc/overrides/mangahub/mangapandaonl/src/MangaPandaOnl.kt Normal file
View File

@ -0,0 +1,5 @@
package eu.kanade.tachiyomi.extension.en.mangapandaonl
import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
class MangaPandaOnl : MangaHub("MangaPanda.onl", "https://mangapanda.onl", "en", "mr02")

5
multisrc/overrides/mangahub/mangareadersite/src/MangaReaderSite.kt Normal file
View File

@ -0,0 +1,5 @@
package eu.kanade.tachiyomi.extension.en.mangareadersite
import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
class MangaReaderSite : MangaHub("MangaReader.site", "https://mangareader.site", "en", "mr01")

5
multisrc/overrides/mangahub/mangatoday/src/MangaToday.kt Normal file
View File

@ -0,0 +1,5 @@
package eu.kanade.tachiyomi.extension.en.mangatoday
import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
class MangaToday : MangaHub("MangaToday", "https://mangatoday.fun", "en", "m03")

5
multisrc/overrides/mangahub/onemangaco/src/OneMangaCo.kt Normal file
View File

@ -0,0 +1,5 @@
package eu.kanade.tachiyomi.extension.en.onemangaco
import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
class OneMangaCo : MangaHub("1Manga.co", "https://1manga.co", "en", "mn03")

5
multisrc/overrides/mangahub/onemangainfo/src/OneMangaInfo.kt Normal file
View File

@ -0,0 +1,5 @@
package eu.kanade.tachiyomi.extension.en.onemangainfo
import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
class OneMangaInfo : MangaHub("OneManga.info", "https://onemanga.info", "en", "mh01")

88
multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangahub/MangaHub.kt
View File

@ -41,6 +41,7 @@ abstract class MangaHub(
override val name: String,
final override val baseUrl: String,
override val lang: String,
private val mangaSource: String,
private val dateFormat: SimpleDateFormat = SimpleDateFormat("MM-dd-yyyy", Locale.US),
) : ParsedHttpSource() {
@ -131,19 +132,57 @@ abstract class MangaHub(
client.newCall(request).execute()
}
data class SMangaDTO(
val url: String,
val title: String,
val thumbnailUrl: String,
val signature: String,
)
private fun Element.toSignature(): String {
val author = this.select("small").text()
val chNum = this.select(".col-sm-6 a:contains(#)").text()
val genres = this.select(".genre-label").joinToString { it.text() }
return author + chNum + genres
}
// popular
override fun popularMangaRequest(page: Int): Request {
return GET("$baseUrl/popular/page/$page", headers)
}
// often enough there will be nearly identical entries with slightly different
// titles, URLs, and image names. in order to cut these "duplicates" down,
// assign a "signature" based on author name, chapter number, and genres
// if all of those are the same, then it it's the same manga
override fun popularMangaParse(response: Response): MangasPage {
val doc = response.asJsoup()
val mangas = doc.select(popularMangaSelector())
.map {
SMangaDTO(
it.select("h4 a").attr("abs:href"),
it.select("h4 a").text(),
it.select("img").attr("abs:src"),
it.toSignature(),
)
}
.distinctBy { it.signature }
.map {
SManga.create().apply {
setUrlWithoutDomain(it.url)
title = it.title
thumbnail_url = it.thumbnailUrl
}
}
return MangasPage(mangas, doc.select(popularMangaNextPageSelector()).isNotEmpty())
}
override fun popularMangaSelector() = ".col-sm-6:not(:has(a:contains(Yaoi)))"
override fun popularMangaFromElement(element: Element): SManga {
return SManga.create().apply {
setUrlWithoutDomain(element.select("h4 a").attr("abs:href"))
title = element.select("h4 a").text()
thumbnail_url = element.select("img").attr("abs:src")
}
throw UnsupportedOperationException()
}
override fun popularMangaNextPageSelector() = "ul.pager li.next > a"
@ -153,10 +192,14 @@ abstract class MangaHub(
return GET("$baseUrl/updates/page/$page", headers)
}
override fun latestUpdatesParse(response: Response): MangasPage {
return popularMangaParse(response)
}
override fun latestUpdatesSelector() = popularMangaSelector()
override fun latestUpdatesFromElement(element: Element): SManga {
return popularMangaFromElement(element)
throw UnsupportedOperationException()
}
override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()
@ -184,34 +227,11 @@ abstract class MangaHub(
override fun searchMangaSelector() = popularMangaSelector()
override fun searchMangaFromElement(element: Element): SManga {
return popularMangaFromElement(element)
throw UnsupportedOperationException()
}
// not sure if this still works, some duplicates i found is also using different thumbnail_url
override fun searchMangaParse(response: Response): MangasPage {
val document = response.asJsoup()
/*
* To remove duplicates we group by the thumbnail_url, which is
* common between duplicates. The duplicates have a suffix in the
* url "-by-{name}". Here we select the shortest url, to avoid
* removing manga that has "by" in the title already.
* Example:
* /manga/tales-of-demons-and-gods (kept)
* /manga/tales-of-demons-and-gods-by-mad-snail (removed)
* /manga/leveling-up-by-only-eating (kept)
*/
val mangas = document.select(searchMangaSelector()).map { element ->
searchMangaFromElement(element)
}.groupBy { it.thumbnail_url }.mapValues { (_, values) ->
values.minByOrNull { it.url.length }!!
}.values.toList()
val hasNextPage = searchMangaNextPageSelector().let { selector ->
document.select(selector).first()
} != null
return MangasPage(mangas, hasNextPage)
return popularMangaParse(response)
}
override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
@ -326,12 +346,6 @@ abstract class MangaHub(
put(
"variables",
buildJsonObject {
val mangaSource = when (name) {
"MangaHub" -> "m01"
"MangaReader.site" -> "mr01"
"MangaPanda.onl" -> "mr02"
else -> null
}
val chapterUrl = chapter.url.split("/")
put("mangaSource", mangaSource)

20
multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangahub/MangaHubGenerator.kt
View File

@ -9,22 +9,20 @@ class MangaHubGenerator : ThemeSourceGenerator {
override val themeClass = "MangaHub"
override val baseVersionCode: Int = 25
override val baseVersionCode: Int = 26
override val sources = listOf(
// SingleLang("1Manga.co", "https://1manga.co", "en", isNsfw = true, className = "OneMangaCo"),
// SingleLang("MangaFox.fun", "https://mangafox.fun", "en", isNsfw = true, className = "MangaFoxFun"),
// SingleLang("MangaHere.onl", "https://mangahere.onl", "en", isNsfw = true, className = "MangaHereOnl"),
SingleLang("1Manga.co", "https://1manga.co", "en", isNsfw = true, className = "OneMangaCo"),
SingleLang("MangaFox.fun", "https://mangafox.fun", "en", isNsfw = true, className = "MangaFoxFun"),
SingleLang("MangaHere.onl", "https://mangahere.onl", "en", isNsfw = true, className = "MangaHereOnl"),
SingleLang("MangaHub", "https://mangahub.io", "en", isNsfw = true, overrideVersionCode = 10, className = "MangaHubIo"),
// SingleLang("Mangakakalot.fun", "https://mangakakalot.fun", "en", isNsfw = true, className = "MangakakalotFun"),
// SingleLang("MangaNel", "https://manganel.me", "en", isNsfw = true),
// SingleLang("MangaOnline.fun", "https://mangaonline.fun", "en", isNsfw = true, className = "MangaOnlineFun"),
SingleLang("Mangakakalot.fun", "https://mangakakalot.fun", "en", isNsfw = true, className = "MangakakalotFun"),
SingleLang("MangaNel", "https://manganel.me", "en", isNsfw = true),
SingleLang("MangaOnline.fun", "https://mangaonline.fun", "en", isNsfw = true, className = "MangaOnlineFun"),
SingleLang("MangaPanda.onl", "https://mangapanda.onl", "en", className = "MangaPandaOnl"),
SingleLang("MangaReader.site", "https://mangareader.site", "en", className = "MangaReaderSite"),
// SingleLang("MangaToday", "https://mangatoday.fun", "en", isNsfw = true),
// SingleLang("MangaTown (unoriginal)", "https://manga.town", "en", isNsfw = true, className = "MangaTownHub"),
// SingleLang("MF Read Online", "https://mangafreereadonline.com", "en", isNsfw = true), // different pageListParse logic
// SingleLang("OneManga.info", "https://onemanga.info", "en", isNsfw = true, className = "OneMangaInfo"), // Some chapters link to 1manga.co, hard to filter
SingleLang("MangaToday", "https://mangatoday.fun", "en", isNsfw = true),
SingleLang("OneManga.info", "https://onemanga.info", "en", isNsfw = true, className = "OneMangaInfo"), // Some chapters link to 1manga.co, hard to filter
)
companion object {