Fix build

Koitharu 9 months ago
parent 06aa701ab1
commit 4eeb879451
Signed by: Koitharu
GPG Key ID: 676DEE768C17A9D7

@ -69,7 +69,13 @@ internal class BatoToParser(context: MangaLoaderContext) : PagedMangaParser(
override suspend fun getFilterOptions() = MangaListFilterOptions( override suspend fun getFilterOptions() = MangaListFilterOptions(
availableTags = fetchAvailableTags(), availableTags = fetchAvailableTags(),
availableStates = EnumSet.allOf(MangaState::class.java), availableStates = EnumSet.of(
MangaState.ONGOING,
MangaState.FINISHED,
MangaState.ABANDONED,
MangaState.PAUSED,
MangaState.UPCOMING,
),
availableContentRating = EnumSet.of(ContentRating.SAFE), availableContentRating = EnumSet.of(ContentRating.SAFE),
availableLocales = setOf( availableLocales = setOf(
Locale.CHINESE, Locale.ENGLISH, Locale.US, Locale.FRENCH, Locale.GERMAN, Locale.ITALIAN, Locale.JAPANESE, Locale.CHINESE, Locale.ENGLISH, Locale.US, Locale.FRENCH, Locale.GERMAN, Locale.ITALIAN, Locale.JAPANESE,
@ -153,6 +159,7 @@ internal class BatoToParser(context: MangaLoaderContext) : PagedMangaParser(
MangaState.ABANDONED -> "cancelled" MangaState.ABANDONED -> "cancelled"
MangaState.PAUSED -> "hiatus" MangaState.PAUSED -> "hiatus"
MangaState.UPCOMING -> "pending" MangaState.UPCOMING -> "pending"
else -> throw IllegalArgumentException("$it not supported")
}, },
) )
} }

@ -81,7 +81,13 @@ internal abstract class MangaFireParser(
override suspend fun getFilterOptions() = MangaListFilterOptions( override suspend fun getFilterOptions() = MangaListFilterOptions(
availableTags = tags.get().values.toSet(), availableTags = tags.get().values.toSet(),
availableStates = EnumSet.allOf(MangaState::class.java), availableStates = EnumSet.of(
MangaState.ONGOING,
MangaState.FINISHED,
MangaState.ABANDONED,
MangaState.PAUSED,
MangaState.UPCOMING,
),
) )
override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List<Manga> { override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List<Manga> {
@ -128,6 +134,7 @@ internal abstract class MangaFireParser(
MangaState.ABANDONED -> "discontinued" MangaState.ABANDONED -> "discontinued"
MangaState.PAUSED -> "on_hiatus" MangaState.PAUSED -> "on_hiatus"
MangaState.UPCOMING -> "info" MangaState.UPCOMING -> "info"
else -> throw IllegalArgumentException("$state not supported")
}, },
) )
} }

@ -53,7 +53,13 @@ internal class MangaPark(context: MangaLoaderContext) :
override suspend fun getFilterOptions() = MangaListFilterOptions( override suspend fun getFilterOptions() = MangaListFilterOptions(
availableTags = tagsMap.get().values.toSet(), availableTags = tagsMap.get().values.toSet(),
availableStates = EnumSet.allOf(MangaState::class.java), availableStates = EnumSet.of(
MangaState.ONGOING,
MangaState.FINISHED,
MangaState.ABANDONED,
MangaState.PAUSED,
MangaState.UPCOMING,
),
availableContentRating = EnumSet.of(ContentRating.SAFE), availableContentRating = EnumSet.of(ContentRating.SAFE),
availableLocales = setOf( availableLocales = setOf(
Locale("af"), Locale("sq"), Locale("am"), Locale("ar"), Locale("hy"), Locale("af"), Locale("sq"), Locale("am"), Locale("ar"), Locale("hy"),
@ -120,6 +126,7 @@ internal class MangaPark(context: MangaLoaderContext) :
MangaState.PAUSED -> "hiatus" MangaState.PAUSED -> "hiatus"
MangaState.ABANDONED -> "cancelled" MangaState.ABANDONED -> "cancelled"
MangaState.UPCOMING -> "pending" MangaState.UPCOMING -> "pending"
else -> throw IllegalArgumentException("$it not supported")
}, },
) )
} }

@ -76,7 +76,13 @@ internal class MangaReaderToParser(context: MangaLoaderContext) :
override suspend fun getFilterOptions() = MangaListFilterOptions( override suspend fun getFilterOptions() = MangaListFilterOptions(
availableTags = tags.get().values.toSet(), availableTags = tags.get().values.toSet(),
availableStates = EnumSet.allOf(MangaState::class.java), availableStates = EnumSet.of(
MangaState.ONGOING,
MangaState.FINISHED,
MangaState.ABANDONED,
MangaState.PAUSED,
MangaState.UPCOMING,
),
) )
override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List<Manga> { override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List<Manga> {
@ -105,13 +111,14 @@ internal class MangaReaderToParser(context: MangaLoaderContext) :
addQueryParameter("genres", filter.tags.joinToString(",") { it.key }) addQueryParameter("genres", filter.tags.joinToString(",") { it.key })
addQueryParameter( addQueryParameter(
name = "status", name = "status",
value = when (filter.states.oneOrThrowIfMany()) { value = when (val state = filter.states.oneOrThrowIfMany()) {
MangaState.ONGOING -> "2" MangaState.ONGOING -> "2"
MangaState.FINISHED -> "1" MangaState.FINISHED -> "1"
MangaState.ABANDONED -> "4" MangaState.ABANDONED -> "4"
MangaState.PAUSED -> "3" MangaState.PAUSED -> "3"
MangaState.UPCOMING -> "5" MangaState.UPCOMING -> "5"
null -> "" null -> ""
else -> throw IllegalArgumentException("$state not supported")
}, },
) )
} }

@ -32,7 +32,13 @@ internal class FlixScans(context: MangaLoaderContext) :
override suspend fun getFilterOptions() = MangaListFilterOptions( override suspend fun getFilterOptions() = MangaListFilterOptions(
availableTags = fetchAvailableTags(), availableTags = fetchAvailableTags(),
availableStates = EnumSet.allOf(MangaState::class.java), availableStates = EnumSet.of(
MangaState.ONGOING,
MangaState.FINISHED,
MangaState.ABANDONED,
MangaState.PAUSED,
MangaState.UPCOMING,
),
availableContentRating = EnumSet.of(ContentRating.ADULT), availableContentRating = EnumSet.of(ContentRating.ADULT),
) )
@ -78,6 +84,7 @@ internal class FlixScans(context: MangaLoaderContext) :
MangaState.ABANDONED -> "droped" MangaState.ABANDONED -> "droped"
MangaState.PAUSED -> "onhold" MangaState.PAUSED -> "onhold"
MangaState.UPCOMING -> "soon" MangaState.UPCOMING -> "soon"
else -> throw IllegalArgumentException("$it not supported")
}, },
) )
} }

@ -44,7 +44,13 @@ internal class AsuraScansParser(context: MangaLoaderContext) :
override suspend fun getFilterOptions() = MangaListFilterOptions( override suspend fun getFilterOptions() = MangaListFilterOptions(
availableTags = getOrCreateTagMap().values.toSet(), availableTags = getOrCreateTagMap().values.toSet(),
availableStates = EnumSet.allOf(MangaState::class.java), availableStates = EnumSet.of(
MangaState.ONGOING,
MangaState.FINISHED,
MangaState.ABANDONED,
MangaState.PAUSED,
MangaState.UPCOMING,
),
availableContentTypes = EnumSet.of( availableContentTypes = EnumSet.of(
ContentType.MANGA, ContentType.MANGA,
ContentType.MANHWA, ContentType.MANHWA,
@ -78,6 +84,7 @@ internal class AsuraScansParser(context: MangaLoaderContext) :
MangaState.ABANDONED -> "4" MangaState.ABANDONED -> "4"
MangaState.PAUSED -> "2" MangaState.PAUSED -> "2"
MangaState.UPCOMING -> "6" MangaState.UPCOMING -> "6"
else -> throw IllegalArgumentException("$it not supported")
}, },
) )
} }

@ -32,7 +32,13 @@ internal class FlixScansOrg(context: MangaLoaderContext) :
override suspend fun getFilterOptions() = MangaListFilterOptions( override suspend fun getFilterOptions() = MangaListFilterOptions(
availableTags = fetchAvailableTags(), availableTags = fetchAvailableTags(),
availableStates = EnumSet.allOf(MangaState::class.java), availableStates = EnumSet.of(
MangaState.ONGOING,
MangaState.FINISHED,
MangaState.ABANDONED,
MangaState.PAUSED,
MangaState.UPCOMING,
),
availableContentRating = EnumSet.of(ContentRating.ADULT), availableContentRating = EnumSet.of(ContentRating.ADULT),
) )
@ -67,6 +73,7 @@ internal class FlixScansOrg(context: MangaLoaderContext) :
MangaState.ABANDONED -> "droped" MangaState.ABANDONED -> "droped"
MangaState.PAUSED -> "onhold" MangaState.PAUSED -> "onhold"
MangaState.UPCOMING -> "soon" MangaState.UPCOMING -> "soon"
else -> throw IllegalArgumentException("$it not supported")
}, },
) )
} }

@ -72,12 +72,18 @@ internal abstract class MadaraParser(
isSearchSupported = true, isSearchSupported = true,
isSearchWithFiltersSupported = true, isSearchWithFiltersSupported = true,
isYearSupported = true, isYearSupported = true,
isAuthorSearchSupported = authorSearchSupported isAuthorSearchSupported = authorSearchSupported,
) )
override suspend fun getFilterOptions() = MangaListFilterOptions( override suspend fun getFilterOptions() = MangaListFilterOptions(
availableTags = fetchAvailableTags(), availableTags = fetchAvailableTags(),
availableStates = EnumSet.allOf(MangaState::class.java), availableStates = EnumSet.of(
MangaState.ONGOING,
MangaState.FINISHED,
MangaState.ABANDONED,
MangaState.PAUSED,
MangaState.UPCOMING,
),
availableContentRating = EnumSet.of(ContentRating.SAFE, ContentRating.ADULT), availableContentRating = EnumSet.of(ContentRating.SAFE, ContentRating.ADULT),
) )
@ -256,6 +262,7 @@ internal abstract class MadaraParser(
MangaState.ABANDONED -> append("canceled") MangaState.ABANDONED -> append("canceled")
MangaState.PAUSED -> append("on-hold") MangaState.PAUSED -> append("on-hold")
MangaState.UPCOMING -> append("upcoming") MangaState.UPCOMING -> append("upcoming")
else -> throw IllegalArgumentException("$it not supported")
} }
} }
@ -435,6 +442,7 @@ internal abstract class MadaraParser(
MangaState.ABANDONED -> "canceled" MangaState.ABANDONED -> "canceled"
MangaState.PAUSED -> "on-hold" MangaState.PAUSED -> "on-hold"
MangaState.UPCOMING -> "upcoming" MangaState.UPCOMING -> "upcoming"
else -> throw IllegalArgumentException("$it not supported")
} }
} }

@ -74,6 +74,7 @@ internal class Hentai4Free(context: MangaLoaderContext) :
MangaState.ABANDONED -> append("canceled") MangaState.ABANDONED -> append("canceled")
MangaState.PAUSED -> append("on-hold") MangaState.PAUSED -> append("on-hold")
MangaState.UPCOMING -> append("upcoming") MangaState.UPCOMING -> append("upcoming")
else -> throw IllegalArgumentException("$it not supported")
} }
} }

@ -62,6 +62,7 @@ internal class IsekaiScanEuParser(context: MangaLoaderContext) :
MangaState.ABANDONED -> append("canceled") MangaState.ABANDONED -> append("canceled")
MangaState.PAUSED -> append("on-hold") MangaState.PAUSED -> append("on-hold")
MangaState.UPCOMING -> append("upcoming") MangaState.UPCOMING -> append("upcoming")
else -> throw IllegalArgumentException("$it not supported")
} }
} }

@ -4,23 +4,11 @@ import org.jsoup.nodes.Element
import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.exception.ParseException import org.koitharu.kotatsu.parsers.exception.ParseException
import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.*
import org.koitharu.kotatsu.parsers.model.MangaChapter
import org.koitharu.kotatsu.parsers.model.MangaPage
import org.koitharu.kotatsu.parsers.model.MangaTag
import org.koitharu.kotatsu.parsers.model.MangaListFilter
import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.parsers.model.MangaState
import org.koitharu.kotatsu.parsers.model.ContentRating
import org.koitharu.kotatsu.parsers.model.SortOrder
import org.koitharu.kotatsu.parsers.site.madara.MadaraParser import org.koitharu.kotatsu.parsers.site.madara.MadaraParser
import org.koitharu.kotatsu.parsers.config.ConfigKey
import org.koitharu.kotatsu.parsers.util.* import org.koitharu.kotatsu.parsers.util.*
import org.koitharu.kotatsu.parsers.util.suspendlazy.getOrNull import org.koitharu.kotatsu.parsers.util.suspendlazy.getOrNull
import org.koitharu.kotatsu.parsers.util.suspendlazy.suspendLazy import org.koitharu.kotatsu.parsers.util.suspendlazy.suspendLazy
import java.util.*
// Do not use "hentaicb.sbs" domain, may cause duplicate tags! // Do not use "hentaicb.sbs" domain, may cause duplicate tags!
@MangaSourceParser("HENTAICUBE", "CBHentai", "vi", ContentType.HENTAI) @MangaSourceParser("HENTAICUBE", "CBHentai", "vi", ContentType.HENTAI)
@ -98,6 +86,7 @@ internal class HentaiCube(context: MangaLoaderContext) :
MangaState.ABANDONED -> append("canceled") MangaState.ABANDONED -> append("canceled")
MangaState.PAUSED -> append("on-hold") MangaState.PAUSED -> append("on-hold")
MangaState.UPCOMING -> append("upcoming") MangaState.UPCOMING -> append("upcoming")
else -> throw IllegalArgumentException("$it not supported")
} }
} }

@ -47,7 +47,13 @@ internal abstract class NepnepParser(
override suspend fun getFilterOptions() = MangaListFilterOptions( override suspend fun getFilterOptions() = MangaListFilterOptions(
availableTags = fetchAvailableTags(), availableTags = fetchAvailableTags(),
availableStates = EnumSet.allOf(MangaState::class.java), availableStates = EnumSet.of(
MangaState.ONGOING,
MangaState.FINISHED,
MangaState.ABANDONED,
MangaState.PAUSED,
MangaState.UPCOMING,
),
) )
data class MangaWithLastUpdate( data class MangaWithLastUpdate(

@ -90,6 +90,7 @@ internal class MangaWtfParser(
MangaState.ABANDONED -> "" MangaState.ABANDONED -> ""
MangaState.PAUSED -> "FROZEN" MangaState.PAUSED -> "FROZEN"
MangaState.UPCOMING -> "ANNOUNCE" MangaState.UPCOMING -> "ANNOUNCE"
else -> throw IllegalArgumentException("$it not supported")
} }
}, },
) )

@ -67,7 +67,13 @@ internal abstract class LibSocialParser(
override suspend fun getFilterOptions() = MangaListFilterOptions( override suspend fun getFilterOptions() = MangaListFilterOptions(
availableTags = fetchAvailableTags(), availableTags = fetchAvailableTags(),
availableStates = EnumSet.allOf(MangaState::class.java), availableStates = EnumSet.of(
MangaState.ONGOING,
MangaState.FINISHED,
MangaState.ABANDONED,
MangaState.PAUSED,
MangaState.UPCOMING,
),
) )
override fun intercept(chain: Interceptor.Chain): Response { override fun intercept(chain: Interceptor.Chain): Response {

@ -15,7 +15,7 @@ internal class MangaLibParser(
context = context, context = context,
source = MangaParserSource.MANGALIB, source = MangaParserSource.MANGALIB,
siteId = 1, siteId = 1,
siteDomains = arrayOf("mangalib.me"), siteDomains = arrayOf("mangalib.org", "mangalib.me"),
) { ) {
override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = try { override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = try {

@ -16,7 +16,7 @@ internal class EleceedTurkiye(context: MangaLoaderContext):
override val configKeyDomain = ConfigKey.Domain( override val configKeyDomain = ConfigKey.Domain(
"eleceedturkiye.com", "eleceedturkiye.com",
"www.eleceedturkiye.com" "www.eleceedturkiye.com",
) )
override val availableSortOrders: Set<SortOrder> = EnumSet.of(SortOrder.UPDATED) override val availableSortOrders: Set<SortOrder> = EnumSet.of(SortOrder.UPDATED)
@ -42,8 +42,8 @@ internal class EleceedTurkiye(context: MangaLoaderContext):
authors = setOf("Son Jae Ho", "ZHENA"), authors = setOf("Son Jae Ho", "ZHENA"),
state = MangaState.ONGOING, state = MangaState.ONGOING,
source = source, source = source,
contentRating = ContentRating.ADULT contentRating = ContentRating.ADULT,
) ),
) )
} }
@ -55,23 +55,23 @@ internal class EleceedTurkiye(context: MangaLoaderContext):
MangaTag("Aksiyon", "", source), MangaTag("Aksiyon", "", source),
MangaTag("Drama", "", source), MangaTag("Drama", "", source),
MangaTag("Komedi", "", source), MangaTag("Komedi", "", source),
MangaTag("Süper Güçler", "", source) MangaTag("Süper Güçler", "", source),
), ),
chapters = doc.select("div.eph-num").map { div -> chapters = doc.select("div.eph-num").mapChapters(reversed = true) { _, div ->
val href = div.selectFirstOrThrow("a").attr("href") val href = div.selectFirstOrThrow("a").attr("href")
val title = div.selectFirst("span.chapternum").text() val title = div?.selectFirst("span.chapternum")?.textOrNull()
MangaChapter( MangaChapter(
id = generateUid(href), id = generateUid(href),
title = title, title = title,
number = Regex("\\d+").find(title)?.value?.toFloatOrNull() ?: 0f, number = title?.let { Regex("\\d+").find(it)?.value?.toFloatOrNull() } ?: 0f,
url = href, url = href,
uploadDate = parseChapterDate(div.selectFirst("span.chapterdate")?.text()), uploadDate = dateFormat.tryParse(div.selectFirst("span.chapterdate")?.text()),
scanlator = null, scanlator = null,
branch = null, branch = null,
source = source, source = source,
volume = 0, volume = 0,
) )
}.reversed() },
) )
} }
@ -104,14 +104,4 @@ internal class EleceedTurkiye(context: MangaLoaderContext):
private val mangaId = "eleceed" private val mangaId = "eleceed"
private val dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale("tr")) private val dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale("tr"))
private fun parseChapterDate(dateString: String?): Long {
return dateString?.let {
try {
dateFormat.parse(it)?.time ?: 0
} catch (e: Exception) {
0
}
} ?: 0
}
} }

Loading…
Cancel
Save