diff --git a/kotatsu-parsers-ksp/src/main/kotlin/org/koitharu/kotatsu/parsers/ksp/ParserProcessor.kt b/kotatsu-parsers-ksp/src/main/kotlin/org/koitharu/kotatsu/parsers/ksp/ParserProcessor.kt index d95f99b8..46f1293c 100644 --- a/kotatsu-parsers-ksp/src/main/kotlin/org/koitharu/kotatsu/parsers/ksp/ParserProcessor.kt +++ b/kotatsu-parsers-ksp/src/main/kotlin/org/koitharu/kotatsu/parsers/ksp/ParserProcessor.kt @@ -70,6 +70,7 @@ class ParserProcessor( package org.koitharu.kotatsu.parsers import org.koitharu.kotatsu.parsers.model.MangaParserSource + import org.koitharu.kotatsu.parsers.core.MangaParserWrapper internal fun MangaParserSource.newParser(context: MangaLoaderContext): MangaParser = when (this) { @@ -98,10 +99,11 @@ class ParserProcessor( factoryWriter?.write( """ MangaParserSource.DUMMY -> throw NotImplementedError("Manga parser ${'$'}name cannot be instantiated") - }.also { + }.let { require(it.source == this) { "Cannot instantiate manga parser: ${'$'}name mapped to ${'$'}{it.source}" } + MangaParserWrapper(it) } """.trimIndent(), ) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/MangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/MangaParser.kt index 37b49902..d2fa0fa6 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/MangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/MangaParser.kt @@ -1,14 +1,19 @@ package org.koitharu.kotatsu.parsers import okhttp3.Headers +import okhttp3.HttpUrl +import okhttp3.Interceptor import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.config.MangaSourceConfig import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.model.search.MangaSearchQuery import org.koitharu.kotatsu.parsers.model.search.MangaSearchQueryCapabilities +import org.koitharu.kotatsu.parsers.util.LinkResolver +import org.koitharu.kotatsu.parsers.util.convertToMangaSearchQuery +import org.koitharu.kotatsu.parsers.util.toMangaListFilterCapabilities import java.util.* -public interface MangaParser { +public interface MangaParser : Interceptor { public val source: MangaParserSource @@ -25,7 +30,7 @@ public interface MangaParser { public val domain: String - public suspend fun queryManga(searchQuery: MangaSearchQuery): List + public suspend fun getList(query: MangaSearchQuery): List /** * Parse details for [Manga]: chapters list, description, large cover, etc. @@ -57,4 +62,20 @@ public interface MangaParser { public suspend fun getRelatedManga(seed: Manga): List public fun getRequestHeaders(): Headers + + /** + * Return [Manga] object by web link to it + * @see [Manga.publicUrl] + */ + @InternalParsersApi + public suspend fun resolveLink(resolver: LinkResolver, link: HttpUrl): Manga? + + @Deprecated("Use getList(query: MangaSearchQuery) instead") + public suspend fun getList(offset: Int, order: SortOrder, filter: MangaListFilter): List { + return getList(convertToMangaSearchQuery(offset, order, filter)) + } + + @Deprecated("Please check searchQueryCapabilities") + public val filterCapabilities: MangaListFilterCapabilities + get() = searchQueryCapabilities.toMangaListFilterCapabilities() } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/SinglePageMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/SinglePageMangaParser.kt deleted file mode 100644 index 6883e9be..00000000 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/SinglePageMangaParser.kt +++ /dev/null @@ -1,42 +0,0 @@ -package org.koitharu.kotatsu.parsers - -import org.koitharu.kotatsu.parsers.model.Manga -import org.koitharu.kotatsu.parsers.model.MangaListFilter -import org.koitharu.kotatsu.parsers.model.MangaParserSource -import org.koitharu.kotatsu.parsers.model.SortOrder -import org.koitharu.kotatsu.parsers.model.search.MangaSearchQuery -import org.koitharu.kotatsu.parsers.util.convertToMangaListFilter - -@InternalParsersApi -public abstract class SinglePageMangaParser( - context: MangaLoaderContext, - source: MangaParserSource, -) : AbstractMangaParser(context, source) { - - - final override suspend fun getList(query: MangaSearchQuery): List { - if (query.offset > 0) { - return emptyList() - } - return searchSinglePageManga(query) - } - - public open suspend fun searchSinglePageManga(searchQuery: MangaSearchQuery): List { - return getList( - searchQuery.offset, - searchQuery.order ?: defaultSortOrder, - convertToMangaListFilter(searchQuery), - ) - } - - @Deprecated("New searchManga method should be preferred") - final override suspend fun getList(offset: Int, order: SortOrder, filter: MangaListFilter): List { - if (offset > 0) { - return emptyList() - } - return getList(order, filter) - } - - @Deprecated("New searchManga method should be preferred") - public abstract suspend fun getList(order: SortOrder, filter: MangaListFilter): List -} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/core/AbstractMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/core/AbstractMangaParser.kt new file mode 100644 index 00000000..28e58ba7 --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/core/AbstractMangaParser.kt @@ -0,0 +1,91 @@ +package org.koitharu.kotatsu.parsers.core + +import androidx.annotation.CallSuper +import okhttp3.Headers +import okhttp3.HttpUrl +import okhttp3.Interceptor +import okhttp3.Response +import org.koitharu.kotatsu.parsers.InternalParsersApi +import org.koitharu.kotatsu.parsers.MangaLoaderContext +import org.koitharu.kotatsu.parsers.MangaParser +import org.koitharu.kotatsu.parsers.config.ConfigKey +import org.koitharu.kotatsu.parsers.config.MangaSourceConfig +import org.koitharu.kotatsu.parsers.model.* +import org.koitharu.kotatsu.parsers.network.OkHttpWebClient +import org.koitharu.kotatsu.parsers.network.WebClient +import org.koitharu.kotatsu.parsers.util.FaviconParser +import org.koitharu.kotatsu.parsers.util.LinkResolver +import org.koitharu.kotatsu.parsers.util.RelatedMangaFinder +import org.koitharu.kotatsu.parsers.util.toAbsoluteUrl +import java.util.* + +@InternalParsersApi +public abstract class AbstractMangaParser @InternalParsersApi constructor( + @property:InternalParsersApi public val context: MangaLoaderContext, + public override val source: MangaParserSource, +) : MangaParser { + + public override val config: MangaSourceConfig by lazy { context.getConfig(source) } + + public open val sourceLocale: Locale + get() = if (source.locale.isEmpty()) Locale.ROOT else Locale(source.locale) + + /** + * Provide default domain and available alternatives, if any. + * + * Never hardcode domain in requests, use [domain] instead. + */ + @InternalParsersApi + public abstract val configKeyDomain: ConfigKey.Domain + + protected open val userAgentKey: ConfigKey.UserAgent = ConfigKey.UserAgent(context.getDefaultUserAgent()) + + @Deprecated("Override intercept() instead") + override fun getRequestHeaders(): Headers = Headers.Builder() + .add("User-Agent", config[userAgentKey]) + .build() + + /** + * Used as fallback if value of `order` passed to [getList] is null + */ + public open val defaultSortOrder: SortOrder + get() { + val supported = availableSortOrders + return SortOrder.entries.first { it in supported } + } + + override val domain: String + get() = config[configKeyDomain] + + @JvmField + protected val webClient: WebClient = OkHttpWebClient(context.httpClient, source) + + /** + * Fetch direct link to the page image. + */ + public override suspend fun getPageUrl(page: MangaPage): String = page.url.toAbsoluteUrl(domain) + + /** + * Parse favicons from the main page of the source`s website + */ + public override suspend fun getFavicons(): Favicons { + return FaviconParser(webClient, domain).parseFavicons() + } + + @CallSuper + public override fun onCreateConfig(keys: MutableCollection>) { + keys.add(configKeyDomain) + } + + public override suspend fun getRelatedManga(seed: Manga): List { + return RelatedMangaFinder(listOf(this)).invoke(seed) + } + + /** + * Return [Manga] object by web link to it + * @see [Manga.publicUrl] + */ + override suspend fun resolveLink(resolver: LinkResolver, link: HttpUrl): Manga? = null + + override fun intercept(chain: Interceptor.Chain): Response = chain.proceed(chain.request()) +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/AbstractMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/core/LegacyMangaParser.kt similarity index 66% rename from src/main/kotlin/org/koitharu/kotatsu/parsers/AbstractMangaParser.kt rename to src/main/kotlin/org/koitharu/kotatsu/parsers/core/LegacyMangaParser.kt index 9f25f671..18895d2f 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/AbstractMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/core/LegacyMangaParser.kt @@ -1,8 +1,13 @@ -package org.koitharu.kotatsu.parsers +package org.koitharu.kotatsu.parsers.core import androidx.annotation.CallSuper import okhttp3.Headers import okhttp3.HttpUrl +import okhttp3.Interceptor +import okhttp3.Response +import org.koitharu.kotatsu.parsers.InternalParsersApi +import org.koitharu.kotatsu.parsers.MangaLoaderContext +import org.koitharu.kotatsu.parsers.MangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.config.MangaSourceConfig import org.koitharu.kotatsu.parsers.model.* @@ -13,18 +18,18 @@ import org.koitharu.kotatsu.parsers.network.WebClient import org.koitharu.kotatsu.parsers.util.* import java.util.* +@Suppress("OVERRIDE_DEPRECATION") @InternalParsersApi -public abstract class AbstractMangaParser @InternalParsersApi constructor( +public abstract class LegacyMangaParser @InternalParsersApi constructor( @property:InternalParsersApi public val context: MangaLoaderContext, public override val source: MangaParserSource, ) : MangaParser { - @Deprecated("Please check searchQueryCapabilities") - public abstract val filterCapabilities: MangaListFilterCapabilities - - public override val searchQueryCapabilities: MangaSearchQueryCapabilities + public final override val searchQueryCapabilities: MangaSearchQueryCapabilities get() = filterCapabilities.toMangaSearchQueryCapabilities() + abstract override val filterCapabilities: MangaListFilterCapabilities + public override val config: MangaSourceConfig by lazy { context.getConfig(source) } public open val sourceLocale: Locale @@ -61,42 +66,18 @@ public abstract class AbstractMangaParser @InternalParsersApi constructor( @JvmField protected val webClient: WebClient = OkHttpWebClient(context.httpClient, source) - /** - * Search list of manga by specified searchQuery - * - * @param searchQuery searchQuery - */ - public override suspend fun queryManga(searchQuery: MangaSearchQuery): List { - if (!searchQuery.skipValidation) { - searchQueryCapabilities.validate(searchQuery) - } - - return getList(searchQuery) - } - /** * Search list of manga by specified searchQuery * * @param query searchQuery */ - protected open suspend fun getList(query: MangaSearchQuery): List = getList( + public final override suspend fun getList(query: MangaSearchQuery): List = getList( offset = query.offset, order = query.order ?: defaultSortOrder, filter = convertToMangaListFilter(query), ) - /** - * Parse list of manga by specified criteria - * - * @param offset starting from 0 and used for pagination. - * Note than passed value may not be divisible by internal page size, so you should adjust it manually. - * @param order one of [availableSortOrders] or [defaultSortOrder] for default value - * @param filter is a set of filter rules - * - * @deprecated New [getList] should be preferred. - */ - @Deprecated("New getList(query: MangaSearchQuery) method should be preferred") - public abstract suspend fun getList(offset: Int, order: SortOrder, filter: MangaListFilter): List + abstract override suspend fun getList(offset: Int, order: SortOrder, filter: MangaListFilter): List /** * Fetch direct link to the page image. @@ -123,6 +104,7 @@ public abstract class AbstractMangaParser @InternalParsersApi constructor( * Return [Manga] object by web link to it * @see [Manga.publicUrl] */ - internal open suspend fun resolveLink(resolver: LinkResolver, link: HttpUrl): Manga? = null + override suspend fun resolveLink(resolver: LinkResolver, link: HttpUrl): Manga? = null + override fun intercept(chain: Interceptor.Chain): Response = chain.proceed(chain.request()) } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/core/LegacyPagedMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/core/LegacyPagedMangaParser.kt new file mode 100644 index 00000000..57c51d39 --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/core/LegacyPagedMangaParser.kt @@ -0,0 +1,52 @@ +package org.koitharu.kotatsu.parsers.core + +import androidx.annotation.VisibleForTesting +import org.koitharu.kotatsu.parsers.InternalParsersApi +import org.koitharu.kotatsu.parsers.MangaLoaderContext +import org.koitharu.kotatsu.parsers.model.Manga +import org.koitharu.kotatsu.parsers.model.MangaListFilter +import org.koitharu.kotatsu.parsers.model.MangaParserSource +import org.koitharu.kotatsu.parsers.model.SortOrder +import org.koitharu.kotatsu.parsers.util.Paginator + +@InternalParsersApi +public abstract class LegacyPagedMangaParser( + context: MangaLoaderContext, + source: MangaParserSource, + @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED) @JvmField public val pageSize: Int, + searchPageSize: Int = pageSize, +) : LegacyMangaParser(context, source) { + + @JvmField + protected val paginator: Paginator = Paginator(pageSize) + + @JvmField + protected val searchPaginator: Paginator = Paginator(searchPageSize) + + final override suspend fun getList(offset: Int, order: SortOrder, filter: MangaListFilter): List { + return getList( + paginator = if (filter.query.isNullOrEmpty()) { + paginator + } else { + searchPaginator + }, + offset = offset, + order = order, + filter = filter, + ) + } + + public abstract suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List + + private suspend fun getList( + paginator: Paginator, + offset: Int, + order: SortOrder, + filter: MangaListFilter, + ): List { + val page = paginator.getPage(offset) + val list = getListPage(page, order, filter) + paginator.onListReceived(offset, page, list.size) + return list + } +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/core/LegacySinglePageMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/core/LegacySinglePageMangaParser.kt new file mode 100644 index 00000000..898280ce --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/core/LegacySinglePageMangaParser.kt @@ -0,0 +1,24 @@ +package org.koitharu.kotatsu.parsers.core + +import org.koitharu.kotatsu.parsers.InternalParsersApi +import org.koitharu.kotatsu.parsers.MangaLoaderContext +import org.koitharu.kotatsu.parsers.model.Manga +import org.koitharu.kotatsu.parsers.model.MangaListFilter +import org.koitharu.kotatsu.parsers.model.MangaParserSource +import org.koitharu.kotatsu.parsers.model.SortOrder + +@InternalParsersApi +public abstract class LegacySinglePageMangaParser( + context: MangaLoaderContext, + source: MangaParserSource, +) : LegacyMangaParser(context, source) { + + final override suspend fun getList(offset: Int, order: SortOrder, filter: MangaListFilter): List { + if (offset > 0) { + return emptyList() + } + return getList(order, filter) + } + + public abstract suspend fun getList(order: SortOrder, filter: MangaListFilter): List +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/core/MangaParserWrapper.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/core/MangaParserWrapper.kt new file mode 100644 index 00000000..4c13da50 --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/core/MangaParserWrapper.kt @@ -0,0 +1,64 @@ +package org.koitharu.kotatsu.parsers.core + +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import okhttp3.Interceptor +import okhttp3.Request +import okhttp3.Response +import org.koitharu.kotatsu.parsers.MangaParser +import org.koitharu.kotatsu.parsers.model.* +import org.koitharu.kotatsu.parsers.model.search.MangaSearchQuery +import org.koitharu.kotatsu.parsers.util.mergeWith + +internal class MangaParserWrapper( + private val delegate: MangaParser, +) : MangaParser by delegate { + + override suspend fun getList(searchQuery: MangaSearchQuery): List = withContext(Dispatchers.Default) { + if (!searchQuery.skipValidation) { + searchQueryCapabilities.validate(searchQuery) + } + delegate.getList(searchQuery) + } + + override suspend fun getDetails(manga: Manga): Manga = withContext(Dispatchers.Default) { + delegate.getDetails(manga) + } + + override suspend fun getPages(chapter: MangaChapter): List = withContext(Dispatchers.Default) { + delegate.getPages(chapter) + } + + override suspend fun getPageUrl(page: MangaPage): String = withContext(Dispatchers.Default) { + delegate.getPageUrl(page) + } + + override suspend fun getFilterOptions(): MangaListFilterOptions = withContext(Dispatchers.Default) { + delegate.getFilterOptions() + } + + override suspend fun getFavicons(): Favicons = withContext(Dispatchers.Default) { + delegate.getFavicons() + } + + override suspend fun getRelatedManga(seed: Manga): List = withContext(Dispatchers.Default) { + delegate.getRelatedManga(seed) + } + + override fun intercept(chain: Interceptor.Chain): Response { + val request = chain.request() + val headers = request.headers.newBuilder() + .mergeWith(delegate.getRequestHeaders(), replaceExisting = false) + .build() + val newRequest = request.newBuilder().headers(headers).build() + return delegate.intercept(ProxyChain(chain, newRequest)) + } + + private class ProxyChain( + private val delegate: Interceptor.Chain, + private val request: Request, + ) : Interceptor.Chain by delegate { + + override fun request(): Request = request + } +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/PagedMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/core/PagedMangaParser.kt similarity index 53% rename from src/main/kotlin/org/koitharu/kotatsu/parsers/PagedMangaParser.kt rename to src/main/kotlin/org/koitharu/kotatsu/parsers/core/PagedMangaParser.kt index 21e4aada..87c994b0 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/PagedMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/core/PagedMangaParser.kt @@ -1,14 +1,13 @@ -package org.koitharu.kotatsu.parsers +package org.koitharu.kotatsu.parsers.core import androidx.annotation.VisibleForTesting +import org.koitharu.kotatsu.parsers.InternalParsersApi +import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.model.Manga -import org.koitharu.kotatsu.parsers.model.MangaListFilter import org.koitharu.kotatsu.parsers.model.MangaParserSource -import org.koitharu.kotatsu.parsers.model.SortOrder import org.koitharu.kotatsu.parsers.model.search.MangaSearchQuery import org.koitharu.kotatsu.parsers.model.search.SearchableField import org.koitharu.kotatsu.parsers.util.Paginator -import org.koitharu.kotatsu.parsers.util.convertToMangaListFilter @InternalParsersApi public abstract class PagedMangaParser( @@ -42,42 +41,7 @@ public abstract class PagedMangaParser( ) } - public open suspend fun getListPage(query: MangaSearchQuery, page: Int): List { - return getListPage( - page = page, - order = query.order ?: defaultSortOrder, - filter = convertToMangaListFilter(query), - ) - } - - @Deprecated("New searchManga method should be preferred") - final override suspend fun getList(offset: Int, order: SortOrder, filter: MangaListFilter): List { - return getList( - paginator = if (filter.query.isNullOrEmpty()) { - paginator - } else { - searchPaginator - }, - offset = offset, - order = order, - filter = filter, - ) - } - - @Deprecated("New searchManga method should be preferred") - public abstract suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List - - private suspend fun getList( - paginator: Paginator, - offset: Int, - order: SortOrder, - filter: MangaListFilter, - ): List { - val page = paginator.getPage(offset) - val list = getListPage(page, order, filter) - paginator.onListReceived(offset, page, list.size) - return list - } + public abstract suspend fun getListPage(query: MangaSearchQuery, page: Int): List private suspend fun searchManga( paginator: Paginator, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/core/SinglePageMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/core/SinglePageMangaParser.kt new file mode 100644 index 00000000..1934cd5d --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/core/SinglePageMangaParser.kt @@ -0,0 +1,23 @@ +package org.koitharu.kotatsu.parsers.core + +import org.koitharu.kotatsu.parsers.InternalParsersApi +import org.koitharu.kotatsu.parsers.MangaLoaderContext +import org.koitharu.kotatsu.parsers.model.Manga +import org.koitharu.kotatsu.parsers.model.MangaParserSource +import org.koitharu.kotatsu.parsers.model.search.MangaSearchQuery + +@InternalParsersApi +public abstract class SinglePageMangaParser( + context: MangaLoaderContext, + source: MangaParserSource, +) : AbstractMangaParser(context, source) { + + final override suspend fun getList(query: MangaSearchQuery): List { + if (query.offset > 0) { + return emptyList() + } + return getSinglePageList(query) + } + + public abstract suspend fun getSinglePageList(searchQuery: MangaSearchQuery): List +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/model/search/MangaSearchQueryCapabilities.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/model/search/MangaSearchQueryCapabilities.kt index 8295d18b..818cc16c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/model/search/MangaSearchQueryCapabilities.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/model/search/MangaSearchQueryCapabilities.kt @@ -7,7 +7,7 @@ import org.koitharu.kotatsu.parsers.util.mapToSet @ExposedCopyVisibility public data class MangaSearchQueryCapabilities internal constructor( - val capabilities: Set, + public val capabilities: Set, ) { public constructor(vararg capabilities: SearchCapability) : this(ArraySet(capabilities)) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/BatoToParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/BatoToParser.kt index 1257ccc0..4d6c7306 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/BatoToParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/BatoToParser.kt @@ -7,7 +7,7 @@ import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaParserAuthProvider import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.ParseException import org.koitharu.kotatsu.parsers.model.* @@ -20,7 +20,7 @@ import javax.crypto.spec.IvParameterSpec import javax.crypto.spec.SecretKeySpec @MangaSourceParser("BATOTO", "Bato.To") -internal class BatoToParser(context: MangaLoaderContext) : PagedMangaParser( +internal class BatoToParser(context: MangaLoaderContext) : LegacyPagedMangaParser( context = context, source = MangaParserSource.BATOTO, pageSize = 60, @@ -116,7 +116,7 @@ internal class BatoToParser(context: MangaLoaderContext) : PagedMangaParser( "zbato.net", "zbato.org", "fto.to", - "jto.to" + "jto.to", ) override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ComickFunParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ComickFunParser.kt index 22f0041c..e0c58f9b 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ComickFunParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ComickFunParser.kt @@ -7,7 +7,7 @@ import org.json.JSONArray import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -20,7 +20,7 @@ private const val CHAPTERS_LIMIT = 99999 @MangaSourceParser("COMICK_FUN", "ComicK") internal class ComickFunParser(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.COMICK_FUN, 20) { + LegacyPagedMangaParser(context, MangaParserSource.COMICK_FUN, 20) { override val configKeyDomain = ConfigKey.Domain("comick.io") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ExHentaiParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ExHentaiParser.kt index 3cdfe301..f3cd1f2c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ExHentaiParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ExHentaiParser.kt @@ -13,7 +13,7 @@ import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaParserAuthProvider import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.AuthRequiredException import org.koitharu.kotatsu.parsers.exception.TooManyRequestExceptions @@ -31,7 +31,7 @@ private val TAG_PREFIXES = arrayOf("male:", "female:", "other:") @MangaSourceParser("EXHENTAI", "ExHentai", type = ContentType.HENTAI) internal class ExHentaiParser( context: MangaLoaderContext, -) : PagedMangaParser(context, MangaParserSource.EXHENTAI, pageSize = 25), MangaParserAuthProvider, Interceptor { +) : LegacyPagedMangaParser(context, MangaParserSource.EXHENTAI, pageSize = 25), MangaParserAuthProvider, Interceptor { override val availableSortOrders: Set = setOf(SortOrder.NEWEST) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/HitomiLaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/HitomiLaParser.kt index f3a183e2..b618125b 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/HitomiLaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/HitomiLaParser.kt @@ -11,7 +11,7 @@ import org.json.JSONArray import org.json.JSONObject import org.jsoup.Jsoup import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.AbstractMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* @@ -28,7 +28,7 @@ import kotlin.math.min @OptIn(ExperimentalUnsignedTypes::class) @MangaSourceParser("HITOMILA", "Hitomi.La", type = ContentType.HENTAI) -internal class HitomiLaParser(context: MangaLoaderContext) : AbstractMangaParser(context, MangaParserSource.HITOMILA) { +internal class HitomiLaParser(context: MangaLoaderContext) : LegacyMangaParser(context, MangaParserSource.HITOMILA) { override val configKeyDomain = ConfigKey.Domain("hitomi.la") override fun onCreateConfig(keys: MutableCollection>) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ImHentai.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ImHentai.kt index fbdb9dc7..7a057c9f 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ImHentai.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/ImHentai.kt @@ -7,7 +7,7 @@ import kotlinx.coroutines.coroutineScope import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -15,7 +15,7 @@ import java.util.* @MangaSourceParser("IMHENTAI", "ImHentai", type = ContentType.HENTAI) internal class ImHentai(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.IMHENTAI, pageSize = 20) { + LegacyPagedMangaParser(context, MangaParserSource.IMHENTAI, pageSize = 20) { override val availableSortOrders: Set = EnumSet.of(SortOrder.UPDATED, SortOrder.POPULARITY, SortOrder.RATING) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/LineWebtoonsParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/LineWebtoonsParser.kt index 15e60612..50835537 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/LineWebtoonsParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/LineWebtoonsParser.kt @@ -6,7 +6,7 @@ import okhttp3.HttpUrl import okhttp3.HttpUrl.Companion.toHttpUrl import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.AbstractMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.NotFoundException @@ -21,7 +21,7 @@ import javax.crypto.spec.SecretKeySpec internal abstract class LineWebtoonsParser( context: MangaLoaderContext, source: MangaParserSource, -) : AbstractMangaParser(context, source) { +) : LegacyMangaParser(context, source) { override val filterCapabilities: MangaListFilterCapabilities get() = MangaListFilterCapabilities( diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaDexParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaDexParser.kt index 628b5665..30066fed 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaDexParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaDexParser.kt @@ -7,8 +7,8 @@ import kotlinx.coroutines.coroutineScope import okhttp3.HttpUrl import org.json.JSONArray import org.json.JSONObject +import org.koitharu.kotatsu.parsers.core.AbstractMangaParser import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.AbstractMangaParser import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.ParseException @@ -68,17 +68,6 @@ internal class MangaDexParser(context: MangaLoaderContext) : AbstractMangaParser SortOrder.RELEVANCE, ) - override val filterCapabilities: MangaListFilterCapabilities - get() = MangaListFilterCapabilities( - isMultipleTagsSupported = true, - isTagsExclusionSupported = true, - isSearchSupported = true, - isSearchWithFiltersSupported = true, - isYearSupported = true, - isOriginalLocaleSupported = true, - isAuthorSearchSupported = true, - ) - override val searchQueryCapabilities: MangaSearchQueryCapabilities get() = MangaSearchQueryCapabilities( SearchCapability( @@ -278,10 +267,6 @@ internal class MangaDexParser(context: MangaLoaderContext) : AbstractMangaParser return json.mapJSON { jo -> jo.fetchManga(null) } } - override suspend fun getList(offset: Int, order: SortOrder, filter: MangaListFilter): List { - return queryManga(convertToMangaSearchQuery(offset, order, filter)) - } - override suspend fun getDetails(manga: Manga): Manga { val mangaId = manga.url.removePrefix("/") return getDetails(mangaId) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaFireParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaFireParser.kt index 84e36a6e..fe646745 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaFireParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaFireParser.kt @@ -11,7 +11,7 @@ import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaParserAuthProvider import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.bitmap.Rect import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* @@ -28,7 +28,7 @@ internal abstract class MangaFireParser( context: MangaLoaderContext, source: MangaParserSource, private val siteLang: String, -) : PagedMangaParser(context, source, 30), Interceptor, MangaParserAuthProvider { +) : LegacyPagedMangaParser(context, source, 30), Interceptor, MangaParserAuthProvider { override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("mangafire.to") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaPark.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaPark.kt index a51c78cb..44615e75 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaPark.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaPark.kt @@ -4,7 +4,7 @@ import androidx.collection.ArrayMap import kotlinx.coroutines.coroutineScope import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -15,7 +15,7 @@ import java.util.* @MangaSourceParser("MANGAPARK", "MangaPark") internal class MangaPark(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.MANGAPARK, pageSize = 36) { + LegacyPagedMangaParser(context, MangaParserSource.MANGAPARK, pageSize = 36) { override val configKeyDomain = ConfigKey.Domain( "mangapark.net", @@ -31,7 +31,7 @@ internal class MangaPark(context: MangaLoaderContext) : "parkmanga.com", "parkmanga.net", "parkmanga.org", - "mpark.to" + "mpark.to", ) override fun onCreateConfig(keys: MutableCollection>) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaPlusParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaPlusParser.kt index 76f2f094..73de0e7c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaPlusParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaPlusParser.kt @@ -10,7 +10,7 @@ import org.json.JSONArray import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -25,7 +25,7 @@ internal abstract class MangaPlusParser( context: MangaLoaderContext, source: MangaParserSource, private val sourceLang: String, -) : SinglePageMangaParser(context, source), Interceptor { +) : LegacySinglePageMangaParser(context, source), Interceptor { private val apiUrl = "https://jumpg-webapi.tokyo-cdn.com/api" override val configKeyDomain = ConfigKey.Domain("mangaplus.shueisha.co.jp") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaReaderToParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaReaderToParser.kt index 235876a4..6f83bac1 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaReaderToParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaReaderToParser.kt @@ -9,7 +9,7 @@ import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaParserAuthProvider import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.bitmap.Bitmap import org.koitharu.kotatsu.parsers.bitmap.Rect import org.koitharu.kotatsu.parsers.config.ConfigKey @@ -23,7 +23,7 @@ import kotlin.math.min @MangaSourceParser("MANGAREADERTO", "MangaReader.To") internal class MangaReaderToParser(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.MANGAREADERTO, 16), + LegacyPagedMangaParser(context, MangaParserSource.MANGAREADERTO, 16), Interceptor, MangaParserAuthProvider { override val configKeyDomain = ConfigKey.Domain("mangareader.to") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/NineMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/NineMangaParser.kt index edb67a4b..4ab8f33b 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/NineMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/NineMangaParser.kt @@ -8,7 +8,7 @@ import okhttp3.Interceptor import okhttp3.Response import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -19,7 +19,7 @@ internal abstract class NineMangaParser( context: MangaLoaderContext, source: MangaParserSource, defaultDomain: String, -) : PagedMangaParser(context, source, pageSize = 26), Interceptor { +) : LegacyPagedMangaParser(context, source, pageSize = 26), Interceptor { override val configKeyDomain = ConfigKey.Domain(defaultDomain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/NineNineNineHentaiParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/NineNineNineHentaiParser.kt index 5928464b..889ecf6c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/NineNineNineHentaiParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/NineNineNineHentaiParser.kt @@ -8,7 +8,7 @@ import org.json.JSONObject import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -23,7 +23,7 @@ import java.util.* @Broken @MangaSourceParser("NINENINENINEHENTAI", "AnimeH", type = ContentType.HENTAI) internal class NineNineNineHentaiParser(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.NINENINENINEHENTAI, PAGE_SIZE), Interceptor { + LegacyPagedMangaParser(context, MangaParserSource.NINENINENINEHENTAI, PAGE_SIZE), Interceptor { override val configKeyDomain = ConfigKey.Domain("animeh.to") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/WebtoonsParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/WebtoonsParser.kt index 6a6b3264..aed3b964 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/WebtoonsParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/WebtoonsParser.kt @@ -8,7 +8,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrl import org.json.JSONArray import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.AbstractMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.NotFoundException @@ -24,7 +24,7 @@ import javax.crypto.spec.SecretKeySpec internal abstract class WebtoonsParser( context: MangaLoaderContext, source: MangaParserSource, -) : AbstractMangaParser(context, source) { +) : LegacyMangaParser(context, source) { private val signer by lazy { WebtoonsUrlSigner("gUtPzJFZch4ZyAGviiyH94P99lQ3pFdRTwpJWDlSGFfwgpr6ses5ALOxWHOIT7R1") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/AnimeBootstrapParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/AnimeBootstrapParser.kt index 994f65ee..f8edc5e9 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/AnimeBootstrapParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/animebootstrap/AnimeBootstrapParser.kt @@ -5,7 +5,7 @@ import kotlinx.coroutines.coroutineScope import org.json.JSONArray import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -16,7 +16,7 @@ internal abstract class AnimeBootstrapParser( source: MangaParserSource, domain: String, pageSize: Int = 24, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/FlixScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/FlixScans.kt index f0e92ddb..791ce35c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/FlixScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/FlixScans.kt @@ -7,7 +7,7 @@ import org.json.JSONObject import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -18,7 +18,8 @@ import java.util.* @Broken @MangaSourceParser("FLIXSCANS", "FlixScans.net", "ar") -internal class FlixScans(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.FLIXSCANS, 18) { +internal class FlixScans(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.FLIXSCANS, 18) { override val availableSortOrders: Set = EnumSet.of(SortOrder.UPDATED) override val configKeyDomain = ConfigKey.Domain("flixscans.net") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/MangaStorm.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/MangaStorm.kt index e85b3534..4f015567 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/MangaStorm.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/MangaStorm.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.ar import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -12,7 +12,8 @@ import java.util.* @Broken @MangaSourceParser("MANGASTORM", "MangaStorm", "ar") -internal class MangaStorm(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.MANGASTORM, 30) { +internal class MangaStorm(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.MANGASTORM, 30) { override val availableSortOrders: Set = EnumSet.of(SortOrder.POPULARITY, SortOrder.UPDATED) override val configKeyDomain = ConfigKey.Domain("mangastorm.org") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/TeamXNovel.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/TeamXNovel.kt index 876bd023..a302c81b 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/TeamXNovel.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ar/TeamXNovel.kt @@ -6,7 +6,7 @@ import kotlinx.coroutines.coroutineScope import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -14,7 +14,8 @@ import java.text.SimpleDateFormat import java.util.* @MangaSourceParser("TEAMXNOVEL", "TeamXNovel", "ar") -internal class TeamXNovel(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.TEAMXNOVEL, 10) { +internal class TeamXNovel(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.TEAMXNOVEL, 10) { override val availableSortOrders: Set = EnumSet.of(SortOrder.UPDATED, SortOrder.POPULARITY) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/be/AnibelParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/be/AnibelParser.kt index 8dedb155..9d486a9d 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/be/AnibelParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/be/AnibelParser.kt @@ -4,21 +4,24 @@ import androidx.collection.ArraySet import org.json.JSONArray import org.json.JSONObject import org.koitharu.kotatsu.parsers.Broken +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.AbstractMangaParser import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* -import org.koitharu.kotatsu.parsers.util.* +import org.koitharu.kotatsu.parsers.util.generateUid +import org.koitharu.kotatsu.parsers.util.getDomain import org.koitharu.kotatsu.parsers.util.json.asTypedList import org.koitharu.kotatsu.parsers.util.json.mapJSON import org.koitharu.kotatsu.parsers.util.json.mapJSONIndexed import org.koitharu.kotatsu.parsers.util.json.mapJSONNotNull +import org.koitharu.kotatsu.parsers.util.nullIfEmpty +import org.koitharu.kotatsu.parsers.util.toAbsoluteUrl import java.util.* @Broken @MangaSourceParser("ANIBEL", "Anibel", "be") -internal class AnibelParser(context: MangaLoaderContext) : AbstractMangaParser(context, MangaParserSource.ANIBEL) { +internal class AnibelParser(context: MangaLoaderContext) : LegacyMangaParser(context, MangaParserSource.ANIBEL) { override val configKeyDomain = ConfigKey.Domain("anibel.net") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/cupfox/CupFoxParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/cupfox/CupFoxParser.kt index 17b3be28..489726c1 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/cupfox/CupFoxParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/cupfox/CupFoxParser.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.cupfox import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -13,7 +13,7 @@ internal abstract class CupFoxParser( source: MangaParserSource, domain: String, pageSize: Int = 24, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/AsuraScansParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/AsuraScansParser.kt index 02427559..8c2b9cec 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/AsuraScansParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/AsuraScansParser.kt @@ -6,7 +6,7 @@ import kotlinx.coroutines.sync.withLock import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -18,7 +18,7 @@ import java.util.* @MangaSourceParser("ASURASCANS", "AsuraComic", "en") internal class AsuraScansParser(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.ASURASCANS, pageSize = 30) { + LegacyPagedMangaParser(context, MangaParserSource.ASURASCANS, pageSize = 30) { override val configKeyDomain = ConfigKey.Domain("asuracomic.net") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/BeeToon.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/BeeToon.kt index 0924068c..e95b88d4 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/BeeToon.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/BeeToon.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.en import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -11,7 +11,7 @@ import java.util.* @MangaSourceParser("BEETOON", "BeeToon.net", "en") internal class BeeToon(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.BEETOON, pageSize = 30) { + LegacyPagedMangaParser(context, MangaParserSource.BEETOON, pageSize = 30) { override val availableSortOrders: Set = EnumSet.of(SortOrder.UPDATED, SortOrder.POPULARITY) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/CloneMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/CloneMangaParser.kt index 1505eb1a..e3784216 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/CloneMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/CloneMangaParser.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.en import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -10,7 +10,7 @@ import java.util.* @MangaSourceParser("CLONEMANGA", "CloneManga", "en") internal class CloneMangaParser(context: MangaLoaderContext) : - SinglePageMangaParser(context, MangaParserSource.CLONEMANGA) { + LegacySinglePageMangaParser(context, MangaParserSource.CLONEMANGA) { override val availableSortOrders: Set = Collections.singleton( SortOrder.POPULARITY, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ComicExtra.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ComicExtra.kt index 99fc790b..3391b542 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ComicExtra.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ComicExtra.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.en import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -11,7 +11,8 @@ import java.text.SimpleDateFormat import java.util.* @MangaSourceParser("COMICEXTRA", "ComicExtra", "en", ContentType.COMICS) -internal class ComicExtra(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.COMICEXTRA, 36) { +internal class ComicExtra(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.COMICEXTRA, 36) { override val configKeyDomain = ConfigKey.Domain("azcomix.me") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/DynastyScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/DynastyScans.kt index 6c27a14d..1babf16d 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/DynastyScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/DynastyScans.kt @@ -9,7 +9,7 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -19,7 +19,7 @@ import java.util.* @MangaSourceParser("DYNASTYSCANS", "DynastyScans", "en") internal class DynastyScans(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.DYNASTYSCANS, 117) { + LegacyPagedMangaParser(context, MangaParserSource.DYNASTYSCANS, 117) { override val configKeyDomain = ConfigKey.Domain("dynasty-scans.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/FlameComics.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/FlameComics.kt index 3cb8fd6a..df7c8cc0 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/FlameComics.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/FlameComics.kt @@ -6,7 +6,7 @@ import org.json.JSONArray import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit @MangaSourceParser("FLAMECOMICS", "FlameComics", "en") internal class FlameComics(context: MangaLoaderContext) : - SinglePageMangaParser(context, MangaParserSource.FLAMECOMICS) { + LegacySinglePageMangaParser(context, MangaParserSource.FLAMECOMICS) { private val commonPrefix = suspendLazy(initializer = ::fetchCommonPrefix) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/FlixScansOrg.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/FlixScansOrg.kt index 7f2c8966..5b2ba4b2 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/FlixScansOrg.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/FlixScansOrg.kt @@ -6,6 +6,7 @@ import org.json.JSONArray import org.json.JSONObject import org.koitharu.kotatsu.parsers.* import org.koitharu.kotatsu.parsers.config.ConfigKey +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* import org.koitharu.kotatsu.parsers.util.json.asTypedList @@ -16,7 +17,7 @@ import java.util.* @Broken @MangaSourceParser("FLIXSCANSORG", "FlixScans.org", "en") internal class FlixScansOrg(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.FLIXSCANSORG, 18) { + LegacyPagedMangaParser(context, MangaParserSource.FLIXSCANSORG, 18) { override val availableSortOrders: Set = EnumSet.of(SortOrder.UPDATED) override val configKeyDomain = ConfigKey.Domain("flixscans.org") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaGeko.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaGeko.kt index bdfb6a85..7cde28a0 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaGeko.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaGeko.kt @@ -4,7 +4,7 @@ import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -12,7 +12,8 @@ import java.text.SimpleDateFormat import java.util.* @MangaSourceParser("MANGAGEKO", "MangaGeko", "en") -internal class MangaGeko(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.MANGAGEKO, 30) { +internal class MangaGeko(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.MANGAGEKO, 30) { override val availableSortOrders: Set = EnumSet.of(SortOrder.POPULARITY, SortOrder.UPDATED, SortOrder.NEWEST) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaKawaiiEn.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaKawaiiEn.kt index 7b563ee3..3fd19fad 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaKawaiiEn.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaKawaiiEn.kt @@ -5,7 +5,7 @@ import kotlinx.coroutines.coroutineScope import okhttp3.Headers import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -13,7 +13,7 @@ import java.util.* @MangaSourceParser("MANGAKAWAII_EN", "MangaKawaii En", "en") internal class MangaKawaiiEn(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.MANGAKAWAII_EN, 50) { + LegacyPagedMangaParser(context, MangaParserSource.MANGAKAWAII_EN, 50) { override val configKeyDomain = ConfigKey.Domain("www.mangakawaii.io") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaTownParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaTownParser.kt index 2916122b..6a19264c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaTownParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MangaTownParser.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.en import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -12,7 +12,7 @@ import java.util.* @MangaSourceParser("MANGATOWN", "MangaTown", "en") internal class MangaTownParser(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.MANGATOWN, 30) { + LegacyPagedMangaParser(context, MangaParserSource.MANGATOWN, 30) { override val configKeyDomain = ConfigKey.Domain("www.mangatown.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Mangaowl.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Mangaowl.kt index f28f9156..8d27d8a4 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Mangaowl.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Mangaowl.kt @@ -5,7 +5,7 @@ import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -17,7 +17,7 @@ import java.util.* @Broken @MangaSourceParser("MANGAOWL", "MangaOwl.to", "en") internal class Mangaowl(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.MANGAOWL, pageSize = 24) { + LegacyPagedMangaParser(context, MangaParserSource.MANGAOWL, pageSize = 24) { override val availableSortOrders: Set = EnumSet.of( SortOrder.POPULARITY, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Manhwa18Com.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Manhwa18Com.kt index f957f62f..6757a050 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Manhwa18Com.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Manhwa18Com.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.en import androidx.collection.ArrayMap import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -12,7 +12,7 @@ import java.util.* @MangaSourceParser("MANHWA18COM", "Manhwa18.com", "en", type = ContentType.HENTAI) internal class Manhwa18Com(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.MANHWA18COM, pageSize = 18, searchPageSize = 18) { + LegacyPagedMangaParser(context, MangaParserSource.MANHWA18COM, pageSize = 18, searchPageSize = 18) { override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("manhwa18.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Manhwa18Parser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Manhwa18Parser.kt index 738c541a..3ef86cca 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Manhwa18Parser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Manhwa18Parser.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.en import androidx.collection.ArrayMap import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -12,7 +12,7 @@ import java.util.* @MangaSourceParser("MANHWA18", "Manhwa18.net", "en", type = ContentType.HENTAI) internal class Manhwa18Parser(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.MANHWA18, pageSize = 18, searchPageSize = 18) { + LegacyPagedMangaParser(context, MangaParserSource.MANHWA18, pageSize = 18, searchPageSize = 18) { override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("manhwa18.net") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ManhwasMen.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ManhwasMen.kt index 0b2b41bf..6c317424 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ManhwasMen.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/ManhwasMen.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.en import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -12,7 +12,7 @@ import java.util.* @MangaSourceParser("MANHWASMEN", "ManhwasMen", "en", type = ContentType.HENTAI) internal class ManhwasMen(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.MANHWASMEN, pageSize = 30, searchPageSize = 30) { + LegacyPagedMangaParser(context, MangaParserSource.MANHWASMEN, pageSize = 30, searchPageSize = 30) { override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("manhwas.men") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MyComicList.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MyComicList.kt index 467b2997..d6be64bd 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MyComicList.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/MyComicList.kt @@ -2,14 +2,15 @@ package org.koitharu.kotatsu.parsers.site.en import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* import java.util.* @MangaSourceParser("MYCOMICLIST", "MyComicList", "en", ContentType.COMICS) -internal class MyComicList(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.MYCOMICLIST, 24) { +internal class MyComicList(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.MYCOMICLIST, 24) { override val configKeyDomain = ConfigKey.Domain("mycomiclist.org") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Po2Scans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Po2Scans.kt index f68bae24..4b3592d2 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Po2Scans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Po2Scans.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.en import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -12,7 +12,8 @@ import java.util.* @Broken @MangaSourceParser("PO2SCANS", "Po2Scans", "en") -internal class Po2Scans(context: MangaLoaderContext) : SinglePageMangaParser(context, MangaParserSource.PO2SCANS) { +internal class Po2Scans(context: MangaLoaderContext) : + LegacySinglePageMangaParser(context, MangaParserSource.PO2SCANS) { override val availableSortOrders: Set = EnumSet.of(SortOrder.ALPHABETICAL) override val configKeyDomain = ConfigKey.Domain("po2scans.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Pururin.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Pururin.kt index 6c865000..34e8e27a 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Pururin.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/Pururin.kt @@ -8,7 +8,7 @@ import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -17,7 +17,7 @@ import java.util.* @Broken @MangaSourceParser("PURURIN", "Pururin", "en", ContentType.HENTAI) internal class Pururin(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.PURURIN, pageSize = 20) { + LegacyPagedMangaParser(context, MangaParserSource.PURURIN, pageSize = 20) { override val configKeyDomain = ConfigKey.Domain("pururin.to") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/VyManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/VyManga.kt index 51b51560..de83f027 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/VyManga.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/VyManga.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.en import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -12,7 +12,7 @@ import java.util.* @MangaSourceParser("VYMANGA", "VyManga", "en") internal class VyManga(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.VYMANGA, pageSize = 36) { + LegacyPagedMangaParser(context, MangaParserSource.VYMANGA, pageSize = 36) { override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("vymanga.net") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/WeebCentral.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/WeebCentral.kt index 51a2342a..78a0aa56 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/WeebCentral.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/en/WeebCentral.kt @@ -5,6 +5,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrl import org.jsoup.nodes.* import org.koitharu.kotatsu.parsers.* import org.koitharu.kotatsu.parsers.config.ConfigKey +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.model.MangaState.* import org.koitharu.kotatsu.parsers.model.ContentType.* @@ -16,7 +17,7 @@ import java.util.EnumSet import java.util.Locale @MangaSourceParser("WEEBCENTRAL", "Weeb Central", "en") -internal class WeebCentral(context: MangaLoaderContext) : AbstractMangaParser(context, MangaParserSource.WEEBCENTRAL), +internal class WeebCentral(context: MangaLoaderContext) : LegacyMangaParser(context, MangaParserSource.WEEBCENTRAL), MangaParserAuthProvider { override val configKeyDomain = ConfigKey.Domain("weebcentral.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/es/TempleScanEsp.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/es/TempleScanEsp.kt index 28b7b31d..91a06512 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/es/TempleScanEsp.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/es/TempleScanEsp.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.es import kotlinx.coroutines.coroutineScope import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -15,7 +15,7 @@ import java.util.* @MangaSourceParser("TEMPLESCANESP", "TempleScanEsp", "es", ContentType.HENTAI) internal class TempleScanEsp(context: MangaLoaderContext) : - SinglePageMangaParser(context, MangaParserSource.TEMPLESCANESP) { + LegacySinglePageMangaParser(context, MangaParserSource.TEMPLESCANESP) { override val availableSortOrders: Set = EnumSet.of(SortOrder.NEWEST_ASC) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/es/TuMangaOnlineParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/es/TuMangaOnlineParser.kt index 06f18b9f..c1ceb38e 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/es/TuMangaOnlineParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/es/TuMangaOnlineParser.kt @@ -6,7 +6,7 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -14,7 +14,7 @@ import java.text.SimpleDateFormat import java.util.* @MangaSourceParser("TUMANGAONLINE", "TuMangaOnline", "es") -internal class TuMangaOnlineParser(context: MangaLoaderContext) : PagedMangaParser( +internal class TuMangaOnlineParser(context: MangaLoaderContext) : LegacyPagedMangaParser( context, source = MangaParserSource.TUMANGAONLINE, pageSize = 24, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/FmreaderParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/FmreaderParser.kt index bb2b89f5..e0995e33 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/FmreaderParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fmreader/FmreaderParser.kt @@ -4,7 +4,7 @@ import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -17,7 +17,7 @@ internal abstract class FmreaderParser( source: MangaParserSource, domain: String, pageSize: Int = 20, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/FoolSlideParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/FoolSlideParser.kt index 343c9069..047fca3e 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/FoolSlideParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/foolslide/FoolSlideParser.kt @@ -4,7 +4,7 @@ import kotlinx.coroutines.coroutineScope import org.json.JSONArray import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -16,7 +16,7 @@ internal abstract class FoolSlideParser( source: MangaParserSource, domain: String, pageSize: Int = 25, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/BentomangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/BentomangaParser.kt index 469e6391..9f4a5c9b 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/BentomangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/BentomangaParser.kt @@ -8,7 +8,7 @@ import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.ParseException import org.koitharu.kotatsu.parsers.model.* @@ -19,7 +19,7 @@ import java.util.* @Broken @MangaSourceParser("BENTOMANGA", "BentoManga", "fr") internal class BentomangaParser(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.BENTOMANGA, 10) { + LegacyPagedMangaParser(context, MangaParserSource.BENTOMANGA, 10) { override val availableSortOrders: Set = EnumSet.of( SortOrder.UPDATED, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/FuryoSociety.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/FuryoSociety.kt index 2fac73ac..72604c12 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/FuryoSociety.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/FuryoSociety.kt @@ -5,7 +5,7 @@ import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.ErrorMessages import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -16,7 +16,7 @@ import java.util.* @MangaSourceParser("FURYOSOCIETY", "FuryoSociety", "fr") internal class FuryoSociety(context: MangaLoaderContext) : - SinglePageMangaParser(context, MangaParserSource.FURYOSOCIETY) { + LegacySinglePageMangaParser(context, MangaParserSource.FURYOSOCIETY) { override val availableSortOrders: Set = EnumSet.of(SortOrder.ALPHABETICAL, SortOrder.UPDATED) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LegacyScansParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LegacyScansParser.kt index b4cbf8e9..194a6ba4 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LegacyScansParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LegacyScansParser.kt @@ -4,7 +4,7 @@ import org.json.JSONArray import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -14,7 +14,7 @@ import java.util.* @MangaSourceParser("LEGACY_SCANS", "LegacyScans", "fr") internal class LegacyScansParser(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.LEGACY_SCANS, 18) { + LegacyPagedMangaParser(context, MangaParserSource.LEGACY_SCANS, 18) { override val configKeyDomain = ConfigKey.Domain("legacy-scans.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LireScan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LireScan.kt index c62617c3..7b703423 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LireScan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LireScan.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.fr import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -12,7 +12,7 @@ import java.util.* @Broken @MangaSourceParser("LIRESCAN", "LireScan", "fr") -internal class LireScan(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.LIRESCAN, 20) { +internal class LireScan(context: MangaLoaderContext) : LegacyPagedMangaParser(context, MangaParserSource.LIRESCAN, 20) { override val availableSortOrders: Set = EnumSet.of(SortOrder.UPDATED) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LugnicaScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LugnicaScans.kt index 1f04d9c1..1a69abd6 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LugnicaScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/LugnicaScans.kt @@ -4,7 +4,7 @@ import org.json.JSONArray import org.koitharu.kotatsu.parsers.ErrorMessages import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -17,7 +17,7 @@ import java.util.* @MangaSourceParser("LUGNICASCANS", "LugnicaScans", "fr") internal class LugnicaScans(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.LUGNICASCANS, 10) { + LegacyPagedMangaParser(context, MangaParserSource.LUGNICASCANS, 10) { override val configKeyDomain = ConfigKey.Domain("lugnica-scans.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/MangaKawaii.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/MangaKawaii.kt index 18e5b5f8..52a43646 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/MangaKawaii.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/MangaKawaii.kt @@ -5,14 +5,15 @@ import kotlinx.coroutines.coroutineScope import okhttp3.Headers import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* import java.util.* @MangaSourceParser("MANGAKAWAII", "MangaKawaii Fr", "fr") -internal class MangaKawaii(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.MANGAKAWAII, 50) { +internal class MangaKawaii(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.MANGAKAWAII, 50) { override val configKeyDomain = ConfigKey.Domain("www.mangakawaii.io") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/MangaMana.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/MangaMana.kt index bf768540..c80517c0 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/MangaMana.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/MangaMana.kt @@ -11,7 +11,7 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.ParseException import org.koitharu.kotatsu.parsers.model.* @@ -22,7 +22,8 @@ import java.text.SimpleDateFormat import java.util.* @MangaSourceParser("MANGAMANA", "MangaMana", "fr") -internal class MangaMana(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.MANGAMANA, 25) { +internal class MangaMana(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.MANGAMANA, 25) { override val configKeyDomain = ConfigKey.Domain("www.manga-mana.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/ScansMangasMe.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/ScansMangasMe.kt index 6972afe3..f2cca594 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/ScansMangasMe.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/ScansMangasMe.kt @@ -6,7 +6,7 @@ import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -16,7 +16,7 @@ import java.util.* @Broken @MangaSourceParser("SCANS_MANGAS_ME", "ScansMangas.me", "fr") internal class ScansMangasMe(context: MangaLoaderContext) : - SinglePageMangaParser(context, MangaParserSource.SCANS_MANGAS_ME) { + LegacySinglePageMangaParser(context, MangaParserSource.SCANS_MANGAS_ME) { override val availableSortOrders: Set = EnumSet.of( SortOrder.ALPHABETICAL, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/ScantradUnion.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/ScantradUnion.kt index cd462824..fd7a15ee 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/ScantradUnion.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/ScantradUnion.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.fr import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.ParseException import org.koitharu.kotatsu.parsers.model.* @@ -13,7 +13,7 @@ import java.util.* @MangaSourceParser("SCANTRADUNION", "ScantradUnion", "fr") internal class ScantradUnion(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.SCANTRADUNION, 10) { + LegacyPagedMangaParser(context, MangaParserSource.SCANTRADUNION, 10) { override val configKeyDomain = ConfigKey.Domain("scantrad-union.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fuzzydoodle/FuzzyDoodleParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fuzzydoodle/FuzzyDoodleParser.kt index d6088614..bfd7a0c9 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fuzzydoodle/FuzzyDoodleParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fuzzydoodle/FuzzyDoodleParser.kt @@ -7,7 +7,7 @@ import kotlinx.coroutines.coroutineScope import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -20,7 +20,7 @@ internal abstract class FuzzyDoodleParser( source: MangaParserSource, domain: String, pageSize: Int = 24, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/galleryadults/GalleryAdultsParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/galleryadults/GalleryAdultsParser.kt index 000478e5..e1caf3a5 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/galleryadults/GalleryAdultsParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/galleryadults/GalleryAdultsParser.kt @@ -8,7 +8,7 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.ErrorMessages import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -19,7 +19,7 @@ internal abstract class GalleryAdultsParser( source: MangaParserSource, domain: String, pageSize: Int = 20, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/gattsu/GattsuParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/gattsu/GattsuParser.kt index c66f854e..00a984b1 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/gattsu/GattsuParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/gattsu/GattsuParser.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.gattsu import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -14,7 +14,7 @@ internal abstract class GattsuParser( source: MangaParserSource, domain: String, pageSize: Int = 20, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/guya/GuyaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/guya/GuyaParser.kt index 7e1ad7c4..37073bc5 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/guya/GuyaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/guya/GuyaParser.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.guya import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -12,7 +12,7 @@ internal abstract class GuyaParser( context: MangaLoaderContext, source: MangaParserSource, domain: String, -) : SinglePageMangaParser(context, source) { +) : LegacySinglePageMangaParser(context, source) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/HeanCms.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/HeanCms.kt index 48417f58..5ab01c5c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/HeanCms.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/HeanCms.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.heancms import org.json.JSONArray import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -19,7 +19,7 @@ internal abstract class HeanCms( source: MangaParserSource, domain: String, pageSize: Int = 20, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancmsalt/HeanCmsAlt.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancmsalt/HeanCmsAlt.kt index c2f944c8..7f285db7 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancmsalt/HeanCmsAlt.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancmsalt/HeanCmsAlt.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.heancmsalt import org.koitharu.kotatsu.parsers.ErrorMessages import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -17,7 +17,7 @@ internal abstract class HeanCmsAlt( source: MangaParserSource, domain: String, pageSize: Int = 18, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/hotcomics/HotComicsParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/hotcomics/HotComicsParser.kt index c00c2bf4..54bf1618 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/hotcomics/HotComicsParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/hotcomics/HotComicsParser.kt @@ -7,7 +7,7 @@ import kotlinx.coroutines.sync.withLock import okhttp3.Headers import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -20,7 +20,7 @@ internal abstract class HotComicsParser( source: MangaParserSource, domain: String, pageSize: Int = 24, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/DoujinDesuParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/DoujinDesuParser.kt index c92ae232..939eb577 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/DoujinDesuParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/DoujinDesuParser.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.id import okhttp3.Headers import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -12,7 +12,7 @@ import java.util.* @MangaSourceParser("DOUJINDESU", "DoujinDesu.tv", "id") internal class DoujinDesuParser(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.DOUJINDESU, pageSize = 18) { + LegacyPagedMangaParser(context, MangaParserSource.DOUJINDESU, pageSize = 18) { override val configKeyDomain: ConfigKey.Domain get() = ConfigKey.Domain("doujindesu.tv") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/HentaiCrot.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/HentaiCrot.kt index 16df73ad..846369d5 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/HentaiCrot.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/HentaiCrot.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.id import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -10,7 +10,7 @@ import java.util.* @MangaSourceParser("HENTAICROT", "HentaiCrot", "id", ContentType.HENTAI) internal class HentaiCrot(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.HENTAICROT, 8) { + LegacyPagedMangaParser(context, MangaParserSource.HENTAICROT, 8) { override val configKeyDomain = ConfigKey.Domain("hentaicrot.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/PixHentai.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/PixHentai.kt index d597ec47..09cb73a4 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/PixHentai.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/PixHentai.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.id import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -10,7 +10,7 @@ import java.util.* @MangaSourceParser("PIXHENTAI", "PixHentai", "id", ContentType.HENTAI) internal class PixHentai(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.PIXHENTAI, 8) { + LegacyPagedMangaParser(context, MangaParserSource.PIXHENTAI, 8) { override val configKeyDomain = ConfigKey.Domain("pixhentai.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/iken/IkenParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/iken/IkenParser.kt index 62ca74dc..ac1b16f3 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/iken/IkenParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/iken/IkenParser.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.iken import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -18,7 +18,7 @@ internal abstract class IkenParser( source: MangaParserSource, domain: String, pageSize: Int = 18, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ja/NicovideoSeigaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ja/NicovideoSeigaParser.kt index 461adf16..17868f71 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ja/NicovideoSeigaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ja/NicovideoSeigaParser.kt @@ -1,7 +1,7 @@ package org.koitharu.kotatsu.parsers.site.ja import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.AbstractMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.MangaParserAuthProvider import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.config.ConfigKey @@ -16,7 +16,7 @@ private const val STATUS_FINISHED = "完結" @MangaSourceParser("NICOVIDEO_SEIGA", "NicoVideo Seiga", "ja") internal class NicovideoSeigaParser(context: MangaLoaderContext) : - AbstractMangaParser(context, MangaParserSource.NICOVIDEO_SEIGA), + LegacyMangaParser(context, MangaParserSource.NICOVIDEO_SEIGA), MangaParserAuthProvider { override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("nicovideo.jp") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/keyoapp/KeyoappParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/keyoapp/KeyoappParser.kt index f74ab8a9..08de052e 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/keyoapp/KeyoappParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/keyoapp/KeyoappParser.kt @@ -5,7 +5,7 @@ import kotlinx.coroutines.coroutineScope import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -17,7 +17,7 @@ internal abstract class KeyoappParser( context: MangaLoaderContext, source: MangaParserSource, domain: String, -) : SinglePageMangaParser(context, source) { +) : LegacySinglePageMangaParser(context, source) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/LikeMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/LikeMangaParser.kt index 36826964..af731998 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/LikeMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/likemanga/LikeMangaParser.kt @@ -7,7 +7,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrl import org.json.JSONObject import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -20,7 +20,7 @@ internal abstract class LikeMangaParser( source: MangaParserSource, domain: String, pageSize: Int = 36, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/liliana/LilianaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/liliana/LilianaParser.kt index 7e655c99..d16ca46d 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/liliana/LilianaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/liliana/LilianaParser.kt @@ -5,7 +5,7 @@ import kotlinx.coroutines.coroutineScope import org.jsoup.Jsoup import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -17,7 +17,7 @@ internal abstract class LilianaParser( source: MangaParserSource, domain: String, pageSize: Int = 24, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/MadaraParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/MadaraParser.kt index 5a61e581..d0ca91ea 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/MadaraParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/MadaraParser.kt @@ -8,7 +8,7 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaParserAuthProvider -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.AuthRequiredException import org.koitharu.kotatsu.parsers.exception.ParseException @@ -23,7 +23,7 @@ internal abstract class MadaraParser( source: MangaParserSource, domain: String, pageSize: Int = 12, -) : PagedMangaParser(context, source, pageSize), MangaParserAuthProvider { +) : LegacyPagedMangaParser(context, source, pageSize), MangaParserAuthProvider { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madtheme/MadthemeParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madtheme/MadthemeParser.kt index 4ddd47b4..7f66c277 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madtheme/MadthemeParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madtheme/MadthemeParser.kt @@ -4,7 +4,7 @@ import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -17,7 +17,7 @@ internal abstract class MadthemeParser( source: MangaParserSource, domain: String, pageSize: Int = 48, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/manga18/Manga18Parser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/manga18/Manga18Parser.kt index 4c0945e2..f297393a 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/manga18/Manga18Parser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/manga18/Manga18Parser.kt @@ -4,7 +4,7 @@ import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -16,7 +16,7 @@ internal abstract class Manga18Parser( source: MangaParserSource, domain: String, pageSize: Int = 20, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/MangaboxParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/MangaboxParser.kt index d5ad8753..e636a7df 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/MangaboxParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/MangaboxParser.kt @@ -4,8 +4,8 @@ import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey +import org.koitharu.kotatsu.parsers.core.PagedMangaParser import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.model.search.MangaSearchQuery import org.koitharu.kotatsu.parsers.model.search.MangaSearchQueryCapabilities @@ -36,14 +36,6 @@ internal abstract class MangaboxParser( SortOrder.ALPHABETICAL, ) - override val filterCapabilities: MangaListFilterCapabilities - get() = MangaListFilterCapabilities( - isMultipleTagsSupported = true, - isTagsExclusionSupported = true, - isSearchSupported = true, - isSearchWithFiltersSupported = true, - ) - override val searchQueryCapabilities: MangaSearchQueryCapabilities get() = MangaSearchQueryCapabilities( SearchCapability( @@ -192,15 +184,11 @@ internal abstract class MangaboxParser( authors = emptySet(), state = null, source = source, - contentRating = if (isNsfwSource) ContentRating.ADULT else ContentRating.SAFE, + contentRating = if (source.contentType == ContentType.HENTAI) ContentRating.ADULT else ContentRating.SAFE, ) } } - override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List { - return queryManga(convertToMangaSearchQuery(page, order, filter)) - } - protected open val selectTagMap = "div.panel-genres-list a:not(.genres-select)" protected open suspend fun fetchAvailableTags(): Set { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangairo.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangairo.kt index 7fb73556..acecac63 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangairo.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangairo.kt @@ -37,12 +37,6 @@ internal class Mangairo(context: MangaLoaderContext) : SortOrder.POPULARITY, SortOrder.NEWEST, ) - override val filterCapabilities: MangaListFilterCapabilities - get() = super.filterCapabilities.copy( - isTagsExclusionSupported = false, - isMultipleTagsSupported = false, - isSearchWithFiltersSupported = false, - ) override val searchQueryCapabilities: MangaSearchQueryCapabilities get() = MangaSearchQueryCapabilities( @@ -139,78 +133,7 @@ internal class Mangairo(context: MangaLoaderContext) : authors = emptySet(), state = null, source = source, - contentRating = if (isNsfwSource) ContentRating.ADULT else ContentRating.SAFE, - ) - } - } - - override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List { - val url = buildString { - append("https://") - append(domain) - when { - - !filter.query.isNullOrEmpty() -> { - append(searchUrl) - append(filter.query.urlEncoded()) - append("?page=") - } - - else -> { - append(listUrl) - append("/type-") - when (order) { - SortOrder.POPULARITY -> append("topview") - SortOrder.UPDATED -> append("latest") - SortOrder.NEWEST -> append("newest") - else -> append("latest") - } - - append("/ctg-") - if (filter.tags.isNotEmpty()) { - filter.tags.oneOrThrowIfMany()?.let { - append(it.key) - } - } else { - append("all") - } - - append("/state-") - if (filter.states.isNotEmpty()) { - filter.states.oneOrThrowIfMany()?.let { - append( - when (it) { - MangaState.ONGOING -> "ongoing" - MangaState.FINISHED -> "completed" - else -> "all" - }, - ) - } - } else { - append("all") - } - - append("/page-") - } - } - append(page.toString()) - } - val doc = webClient.httpGet(url).parseHtml() - return doc.select("div.story-item").map { div -> - val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href") - Manga( - id = generateUid(href), - url = href, - publicUrl = href.toAbsoluteUrl(div.host ?: domain), - coverUrl = div.selectFirst("img")?.src().orEmpty(), - title = (div.selectFirst("h2")?.text() ?: div.selectFirst("h3")?.text()).orEmpty(), - altTitle = null, - rating = RATING_UNKNOWN, - tags = emptySet(), - author = null, - state = null, - source = source, - isNsfw = isNsfwSource, + contentRating = if (source.contentType == ContentType.HENTAI) ContentRating.ADULT else ContentRating.SAFE, ) } } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangakakalot.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangakakalot.kt index 81300ba2..f6e36932 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangakakalot.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/Mangakakalot.kt @@ -22,12 +22,6 @@ internal class Mangakakalot(context: MangaLoaderContext) : SortOrder.POPULARITY, SortOrder.NEWEST, ) - override val filterCapabilities: MangaListFilterCapabilities - get() = super.filterCapabilities.copy( - isTagsExclusionSupported = false, - isMultipleTagsSupported = false, - isSearchWithFiltersSupported = false, - ) override val searchQueryCapabilities: MangaSearchQueryCapabilities get() = MangaSearchQueryCapabilities( @@ -148,7 +142,7 @@ internal class Mangakakalot(context: MangaLoaderContext) : authors = emptySet(), state = null, source = source, - contentRating = if (isNsfwSource) ContentRating.ADULT else ContentRating.SAFE, + contentRating = null, ) } } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/MangakakalotTv.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/MangakakalotTv.kt index 7cfda584..bf82bba1 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/MangakakalotTv.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangabox/en/MangakakalotTv.kt @@ -25,13 +25,6 @@ internal class MangakakalotTv(context: MangaLoaderContext) : SortOrder.POPULARITY, SortOrder.NEWEST, ) - override val filterCapabilities: MangaListFilterCapabilities - get() = super.filterCapabilities.copy( - isTagsExclusionSupported = false, - isMultipleTagsSupported = false, - isSearchWithFiltersSupported = false, - ) - override val searchQueryCapabilities: MangaSearchQueryCapabilities get() = MangaSearchQueryCapabilities( @@ -140,7 +133,7 @@ internal class MangakakalotTv(context: MangaLoaderContext) : authors = emptySet(), state = null, source = source, - contentRating = if (isNsfwSource) ContentRating.ADULT else ContentRating.SAFE, + contentRating = null, ) } } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangadventure/MangAdventureParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangadventure/MangAdventureParser.kt index 11b1d603..8458d889 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangadventure/MangAdventureParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangadventure/MangAdventureParser.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.mangadventure import okhttp3.HttpUrl import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.NotFoundException import org.koitharu.kotatsu.parsers.model.* @@ -17,7 +17,7 @@ internal abstract class MangAdventureParser( source: MangaParserSource, domain: String, pageSize: Int = 25, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/MangaReaderParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/MangaReaderParser.kt index 262e43ba..40b09d0f 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/MangaReaderParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/MangaReaderParser.kt @@ -12,7 +12,7 @@ import okhttp3.internal.closeQuietly import org.json.JSONObject import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -25,7 +25,7 @@ internal abstract class MangaReaderParser( domain: String, pageSize: Int, searchPageSize: Int, -) : PagedMangaParser(context, source, pageSize, searchPageSize), Interceptor { +) : LegacyPagedMangaParser(context, source, pageSize, searchPageSize), Interceptor { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangaworld/MangaWorldParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangaworld/MangaWorldParser.kt index a86c1ccf..3d7698a2 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangaworld/MangaWorldParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangaworld/MangaWorldParser.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.mangaworld import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -14,7 +14,7 @@ internal abstract class MangaWorldParser( source: MangaParserSource, domain: String, pageSize: Int = 16, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val availableSortOrders: Set = EnumSet.of( SortOrder.POPULARITY, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/MmrcmsParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/MmrcmsParser.kt index 6b6e5134..96cad997 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/MmrcmsParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mmrcms/MmrcmsParser.kt @@ -4,7 +4,7 @@ import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -16,7 +16,7 @@ internal abstract class MmrcmsParser( source: MangaParserSource, domain: String, pageSize: Int = 20, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/nepnep/NepnepParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/nepnep/NepnepParser.kt index b99c62eb..0e3863b8 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/nepnep/NepnepParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/nepnep/NepnepParser.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.nepnep import org.json.JSONArray import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.AbstractMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -20,7 +20,7 @@ internal abstract class NepnepParser( context: MangaLoaderContext, source: MangaParserSource, domain: String, -) : AbstractMangaParser(context, source) { +) : LegacyMangaParser(context, source) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/onemanga/OneMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/onemanga/OneMangaParser.kt index 78a44957..66bbcc44 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/onemanga/OneMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/onemanga/OneMangaParser.kt @@ -1,7 +1,7 @@ package org.koitharu.kotatsu.parsers.site.onemanga import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -11,7 +11,7 @@ internal abstract class OneMangaParser( context: MangaLoaderContext, source: MangaParserSource, domain: String, -) : SinglePageMangaParser(context, source) { +) : LegacySinglePageMangaParser(context, source) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/otakusanctuary/OtakuSanctuaryParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/otakusanctuary/OtakuSanctuaryParser.kt index a82cb385..c98a2e9b 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/otakusanctuary/OtakuSanctuaryParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/otakusanctuary/OtakuSanctuaryParser.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.otakusanctuary import kotlinx.coroutines.coroutineScope import okhttp3.HttpUrl.Companion.toHttpUrl import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -16,7 +16,7 @@ internal abstract class OtakuSanctuaryParser( source: MangaParserSource, domain: String, pageSize: Int = 32, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pizzareader/PizzaReaderParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pizzareader/PizzaReaderParser.kt index 720c3a78..f0c41254 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pizzareader/PizzaReaderParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pizzareader/PizzaReaderParser.kt @@ -4,7 +4,7 @@ import kotlinx.coroutines.coroutineScope import org.json.JSONArray import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -19,7 +19,7 @@ internal abstract class PizzaReaderParser( context: MangaLoaderContext, source: MangaParserSource, domain: String, -) : SinglePageMangaParser(context, source) { +) : LegacySinglePageMangaParser(context, source) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/BrMangas.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/BrMangas.kt index f0122a50..dbad70a7 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/BrMangas.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/BrMangas.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.pt import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -12,7 +12,7 @@ import java.util.* @Broken @MangaSourceParser("BRMANGAS", "BrMangas", "pt") -internal class BrMangas(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.BRMANGAS, 25) { +internal class BrMangas(context: MangaLoaderContext) : LegacyPagedMangaParser(context, MangaParserSource.BRMANGAS, 25) { override val configKeyDomain = ConfigKey.Domain("www.brmangas.net") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/LerManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/LerManga.kt index cf91ec60..db9f18f6 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/LerManga.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/LerManga.kt @@ -2,6 +2,7 @@ package org.koitharu.kotatsu.parsers.site.pt import org.koitharu.kotatsu.parsers.* import org.koitharu.kotatsu.parsers.config.ConfigKey +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* import java.text.SimpleDateFormat @@ -9,7 +10,7 @@ import java.util.* @Broken @MangaSourceParser("LERMANGA", "LerManga", "pt") -internal class LerManga(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.LERMANGA, 24) { +internal class LerManga(context: MangaLoaderContext) : LegacyPagedMangaParser(context, MangaParserSource.LERMANGA, 24) { override val configKeyDomain = ConfigKey.Domain("lermanga.org") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/LerMangaOnline.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/LerMangaOnline.kt index cbcf2e04..28cfebee 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/LerMangaOnline.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/LerMangaOnline.kt @@ -4,7 +4,7 @@ import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -14,7 +14,7 @@ import java.util.* @Broken @MangaSourceParser("LERMANGAONLINE", "LerMangaOnline", "pt") internal class LerMangaOnline(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.LERMANGAONLINE, 20) { + LegacyPagedMangaParser(context, MangaParserSource.LERMANGAONLINE, 20) { override val configKeyDomain = ConfigKey.Domain("lermangaonline.com.br") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/LuratoonScansParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/LuratoonScansParser.kt index e58848ab..698152c1 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/LuratoonScansParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/LuratoonScansParser.kt @@ -8,6 +8,7 @@ import okhttp3.ResponseBody.Companion.toResponseBody import org.json.JSONArray import org.koitharu.kotatsu.parsers.* import org.koitharu.kotatsu.parsers.config.ConfigKey +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* import java.text.SimpleDateFormat @@ -16,7 +17,7 @@ import java.util.zip.ZipInputStream @Broken // Not dead but changed template @MangaSourceParser("RANDOMSCANS", "LuratoonScan", "pt") internal class LuratoonScansParser(context: MangaLoaderContext) : - SinglePageMangaParser(context, MangaParserSource.RANDOMSCANS), + LegacySinglePageMangaParser(context, MangaParserSource.RANDOMSCANS), Interceptor { override val configKeyDomain = ConfigKey.Domain("luratoons.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/MangaOnline.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/MangaOnline.kt index 678d2842..51779b90 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/MangaOnline.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/MangaOnline.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.pt import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -10,7 +10,8 @@ import java.text.SimpleDateFormat import java.util.* @MangaSourceParser("MANGAONLINE", "MangaOnline.biz", "pt") -internal class MangaOnline(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.MANGAONLINE, 20) { +internal class MangaOnline(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.MANGAONLINE, 20) { override val configKeyDomain = ConfigKey.Domain("mangaonline.biz") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/MuitoHentai.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/MuitoHentai.kt index a9c37629..15d7bccc 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/MuitoHentai.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/MuitoHentai.kt @@ -2,14 +2,15 @@ package org.koitharu.kotatsu.parsers.site.pt import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* import java.util.* @MangaSourceParser("MUITOHENTAI", "MuitoHentai", "pt", ContentType.HENTAI) -internal class MuitoHentai(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.MUITOHENTAI, 24) { +internal class MuitoHentai(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.MUITOHENTAI, 24) { override val configKeyDomain = ConfigKey.Domain("www.muitohentai.com") @@ -125,7 +126,7 @@ internal class MuitoHentai(context: MangaLoaderContext) : PagedMangaParser(conte .map { url -> if (url.startsWith("https://$domain/")) { url.substringAfter("$domain/") - } else url + } else url } return src.map { url -> @@ -133,7 +134,7 @@ internal class MuitoHentai(context: MangaLoaderContext) : PagedMangaParser(conte id = generateUid(url), url = url.takeUnless { it.startsWith("https://") }?.let { "https://$domain/$it" } ?: url, preview = null, - source = source + source = source, ) } } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/OnePieceEx.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/OnePieceEx.kt index f224747b..5ae1f8ac 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/OnePieceEx.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/OnePieceEx.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.pt import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -11,7 +11,8 @@ import java.util.* @Broken @MangaSourceParser("ONEPIECEEX", "OnePieceEx", "pt") -internal class OnePieceEx(context: MangaLoaderContext) : SinglePageMangaParser(context, MangaParserSource.ONEPIECEEX) { +internal class OnePieceEx(context: MangaLoaderContext) : + LegacySinglePageMangaParser(context, MangaParserSource.ONEPIECEEX) { override val configKeyDomain = ConfigKey.Domain("onepieceex.net") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/YugenMangas.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/YugenMangas.kt index c9c01d98..91027aa8 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/YugenMangas.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/pt/YugenMangas.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.pt import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -15,7 +15,7 @@ import java.util.* @MangaSourceParser("YUGENMANGAS", "YugenApp", "pt") internal class YugenMangas(context: MangaLoaderContext) : - SinglePageMangaParser(context, MangaParserSource.YUGENMANGAS) { + LegacySinglePageMangaParser(context, MangaParserSource.YUGENMANGAS) { override val configKeyDomain = ConfigKey.Domain("yugenmangasbr.voblog.xyz") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/AComics.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/AComics.kt index 6d78fb38..4cc30ceb 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/AComics.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/AComics.kt @@ -6,7 +6,7 @@ import kotlinx.coroutines.sync.withLock import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -14,7 +14,7 @@ import java.util.* @MangaSourceParser("ACOMICS", "AComics", "ru", ContentType.COMICS) internal class AComics(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.ACOMICS, pageSize = 10) { + LegacyPagedMangaParser(context, MangaParserSource.ACOMICS, pageSize = 10) { override val availableSortOrders: Set = EnumSet.of( SortOrder.UPDATED, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/DesuMeParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/DesuMeParser.kt index 8a091dab..db04af54 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/DesuMeParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/DesuMeParser.kt @@ -5,7 +5,7 @@ import okhttp3.Headers import okhttp3.HttpUrl import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.ParseException import org.koitharu.kotatsu.parsers.model.* @@ -17,7 +17,8 @@ import org.koitharu.kotatsu.parsers.util.suspendlazy.suspendLazy import java.util.* @MangaSourceParser("DESUME", "Desu", "ru") -internal class DesuMeParser(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.DESUME, 20) { +internal class DesuMeParser(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.DESUME, 20) { override val configKeyDomain = ConfigKey.Domain("desu.me", "desu.win") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/MangaWtfParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/MangaWtfParser.kt index 4181644f..46b9f1ac 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/MangaWtfParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/MangaWtfParser.kt @@ -7,7 +7,7 @@ import org.json.JSONObject import org.koitharu.kotatsu.parsers.InternalParsersApi import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -18,7 +18,7 @@ import java.util.* @MangaSourceParser("MANGA_WTF", "MangaWtf", "ru") internal class MangaWtfParser( context: MangaLoaderContext, -) : PagedMangaParser(context, MangaParserSource.MANGA_WTF, pageSize = 20) { +) : LegacyPagedMangaParser(context, MangaParserSource.MANGA_WTF, pageSize = 20) { override val availableSortOrders: Set = EnumSet.of( @@ -137,13 +137,13 @@ internal class MangaWtfParser( tags = jo.getJSONArray("labels").mapJSONToSet { it.toMangaTag() }, state = jo.getStringOrNull("status")?.toMangaState(), author = - jo.getJSONArray("relations").asTypedList().firstNotNullOfOrNull { - if (it.getStringOrNull("type") == "AUTHOR") { - it.getJSONObject("publisher").getStringOrNull("name") - } else { - null - } - }, + jo.getJSONArray("relations").asTypedList().firstNotNullOfOrNull { + if (it.getStringOrNull("type") == "AUTHOR") { + it.getJSONObject("publisher").getStringOrNull("name") + } else { + null + } + }, source = source, largeCoverUrl = null, description = jo.getString("description").nl2br(), @@ -209,10 +209,10 @@ internal class MangaWtfParser( MangaChapter( id = generateUid(jo.getString("id")), name = - jo.getStringOrNull("name") ?: buildString { - if (volume > 0) append("Том ").append(volume).append(' ') - if (number > 0) append("Глава ").append(number) else append("Без имени") - }, + jo.getStringOrNull("name") ?: buildString { + if (volume > 0) append("Том ").append(volume).append(' ') + if (number > 0) append("Глава ").append(number) else append("Без имени") + }, number = number, volume = volume, url = jo.getString("id"), diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/NudeMoonParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/NudeMoonParser.kt index d13ef133..dd29bb53 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/NudeMoonParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/NudeMoonParser.kt @@ -1,7 +1,7 @@ package org.koitharu.kotatsu.parsers.site.ru import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.AbstractMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.MangaParserAuthProvider import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.config.ConfigKey @@ -14,7 +14,7 @@ import java.util.* @MangaSourceParser("NUDEMOON", "Nude-Moon", "ru", type = ContentType.HENTAI) internal class NudeMoonParser( context: MangaLoaderContext, -) : AbstractMangaParser(context, MangaParserSource.NUDEMOON), MangaParserAuthProvider { +) : LegacyMangaParser(context, MangaParserSource.NUDEMOON), MangaParserAuthProvider { override val configKeyDomain = ConfigKey.Domain( "b.nude-moon.fun", diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/RemangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/RemangaParser.kt index 0c264b25..25858c7d 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/RemangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/RemangaParser.kt @@ -10,7 +10,7 @@ import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaParserAuthProvider import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.ContentUnavailableException import org.koitharu.kotatsu.parsers.exception.ParseException @@ -29,7 +29,7 @@ private const val TOO_MANY_REQUESTS = 429 @MangaSourceParser("REMANGA", "Реманга", "ru") internal class RemangaParser( context: MangaLoaderContext, -) : PagedMangaParser(context, MangaParserSource.REMANGA, PAGE_SIZE), MangaParserAuthProvider, Interceptor { +) : LegacyPagedMangaParser(context, MangaParserSource.REMANGA, PAGE_SIZE), MangaParserAuthProvider, Interceptor { private val baseHeaders: Headers get() = Headers.Builder() diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/WaMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/WaMangaParser.kt index 943b5aa7..99850a04 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/WaMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/WaMangaParser.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.ru import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -14,7 +14,7 @@ import java.util.* @MangaSourceParser("WAMANGA", "WaManga", "ru", type = ContentType.MANGA) internal class WaMangaParser( context: MangaLoaderContext, -) : SinglePageMangaParser(context, MangaParserSource.WAMANGA) { +) : LegacySinglePageMangaParser(context, MangaParserSource.WAMANGA) { override val configKeyDomain = ConfigKey.Domain("wamanga.me") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/GroupleParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/GroupleParser.kt index 83c338ed..f532e403 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/GroupleParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/grouple/GroupleParser.kt @@ -17,7 +17,7 @@ import okio.IOException import org.json.JSONArray import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.AbstractMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.MangaParserAuthProvider import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.AuthRequiredException @@ -43,7 +43,7 @@ internal abstract class GroupleParser( context: MangaLoaderContext, source: MangaParserSource, private val siteId: Int, -) : AbstractMangaParser(context, source), MangaParserAuthProvider, Interceptor { +) : LegacyMangaParser(context, source), MangaParserAuthProvider, Interceptor { @Volatile private var cachedPagesServer: String? = null diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/multichan/ChanParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/multichan/ChanParser.kt index 2b52ad80..2d013cba 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/multichan/ChanParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/multichan/ChanParser.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.ru.multichan import okhttp3.HttpUrl import org.jsoup.internal.StringUtil import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.AbstractMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.MangaParserAuthProvider import org.koitharu.kotatsu.parsers.exception.AuthRequiredException import org.koitharu.kotatsu.parsers.model.* @@ -14,7 +14,7 @@ import java.util.* internal abstract class ChanParser( context: MangaLoaderContext, source: MangaParserSource, -) : AbstractMangaParser(context, source), MangaParserAuthProvider { +) : LegacyMangaParser(context, source), MangaParserAuthProvider { override val availableSortOrders: Set = EnumSet.of( SortOrder.NEWEST, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/rulib/LibSocialParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/rulib/LibSocialParser.kt index ab80425c..70a113f2 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/rulib/LibSocialParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/rulib/LibSocialParser.kt @@ -7,7 +7,7 @@ import okhttp3.HttpUrl import org.json.JSONArray import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -21,7 +21,7 @@ internal abstract class LibSocialParser( source: MangaParserSource, protected val siteDomain: String, protected val siteId: Int, -) : PagedMangaParser(context, source, pageSize = 60) { +) : LegacyPagedMangaParser(context, source, pageSize = 60) { override val availableSortOrders: Set = EnumSet.of( SortOrder.UPDATED, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/scan/ScanParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/scan/ScanParser.kt index e2636664..557c8b4e 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/scan/ScanParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/scan/ScanParser.kt @@ -5,7 +5,7 @@ import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import org.jsoup.Jsoup import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -18,7 +18,7 @@ internal abstract class ScanParser( source: MangaParserSource, domain: String, pageSize: Int = 0, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/sinmh/SinmhParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/sinmh/SinmhParser.kt index 28a1eccf..ad3bbe2f 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/sinmh/SinmhParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/sinmh/SinmhParser.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.sinmh import kotlinx.coroutines.coroutineScope import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -14,7 +14,7 @@ internal abstract class SinmhParser( source: MangaParserSource, domain: String, pageSize: Int = 36, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/tr/MangaAy.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/tr/MangaAy.kt index 21e28e92..41bfe9d2 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/tr/MangaAy.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/tr/MangaAy.kt @@ -6,7 +6,7 @@ import kotlinx.coroutines.sync.withLock import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -14,7 +14,7 @@ import java.text.SimpleDateFormat import java.util.* @MangaSourceParser("MANGAAY", "MangaAy", "tr") -internal class MangaAy(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.MANGAAY, 45) { +internal class MangaAy(context: MangaLoaderContext) : LegacyPagedMangaParser(context, MangaParserSource.MANGAAY, 45) { override val configKeyDomain = ConfigKey.Domain("manga-ay.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/tr/SadScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/tr/SadScans.kt index ccb6d26a..bca4fbf6 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/tr/SadScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/tr/SadScans.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.tr import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.SinglePageMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -10,7 +10,8 @@ import java.text.SimpleDateFormat import java.util.* @MangaSourceParser("SADSCANS", "SadScans", "tr") -internal class SadScans(context: MangaLoaderContext) : SinglePageMangaParser(context, MangaParserSource.SADSCANS) { +internal class SadScans(context: MangaLoaderContext) : + LegacySinglePageMangaParser(context, MangaParserSource.SADSCANS) { override val configKeyDomain = ConfigKey.Domain("sadscans.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/tr/TrWebtoon.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/tr/TrWebtoon.kt index 19d14bbd..44935e00 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/tr/TrWebtoon.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/tr/TrWebtoon.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.tr import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -13,7 +13,7 @@ import java.util.* @MangaSourceParser("TRWEBTOON", "TrWebtoon", "tr") internal class TrWebtoon(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.TRWEBTOON, pageSize = 21) { + LegacyPagedMangaParser(context, MangaParserSource.TRWEBTOON, pageSize = 21) { override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("trwebtoon.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/HentaiUkrParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/HentaiUkrParser.kt index 330a9b42..bfd618e0 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/HentaiUkrParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/HentaiUkrParser.kt @@ -8,7 +8,7 @@ import okhttp3.Response import org.json.JSONArray import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.AbstractMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* @@ -25,7 +25,7 @@ private const val PAGE_SIZE = 60 // NOTE High profile focus @MangaSourceParser("HENTAIUKR", "HentaiUkr", "uk", ContentType.HENTAI) -internal class HentaiUkrParser(context: MangaLoaderContext) : AbstractMangaParser(context, MangaParserSource.HENTAIUKR), +internal class HentaiUkrParser(context: MangaLoaderContext) : LegacyMangaParser(context, MangaParserSource.HENTAIUKR), Interceptor { private val date = SimpleDateFormat("yyyy-MM-dd", Locale.US) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/HoneyMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/HoneyMangaParser.kt index 3c842804..b5f6c710 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/HoneyMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/HoneyMangaParser.kt @@ -7,7 +7,7 @@ import org.json.JSONArray import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -27,7 +27,7 @@ private const val IMAGE_BASEURL_FALLBACK = "https://hmvolumestorage.b-cdn.net/pu @MangaSourceParser("HONEYMANGA", "HoneyManga", "uk") internal class HoneyMangaParser(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.HONEYMANGA, PAGE_SIZE), + LegacyPagedMangaParser(context, MangaParserSource.HONEYMANGA, PAGE_SIZE), Interceptor { private val urlApi get() = "https://data.api.$domain" diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/MangaInUaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/MangaInUaParser.kt index ef0755ba..90c56961 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/MangaInUaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/uk/MangaInUaParser.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.uk import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -12,7 +12,7 @@ import java.util.* private const val DEF_BRANCH_NAME = "Основний переклад" @MangaSourceParser("MANGAINUA", "MANGA/in/UA", "uk") -internal class MangaInUaParser(context: MangaLoaderContext) : PagedMangaParser( +internal class MangaInUaParser(context: MangaLoaderContext) : LegacyPagedMangaParser( context = context, source = MangaParserSource.MANGAINUA, pageSize = 24, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/BlogTruyenParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/BlogTruyenParser.kt index eb7b86a0..a8beef37 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/BlogTruyenParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/BlogTruyenParser.kt @@ -5,7 +5,7 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -17,7 +17,7 @@ import org.koitharu.kotatsu.parsers.Broken @Broken @MangaSourceParser("BLOGTRUYEN", "Blog Truyện", "vi") internal class BlogTruyenParser(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.BLOGTRUYEN, pageSize = 20) { + LegacyPagedMangaParser(context, MangaParserSource.BLOGTRUYEN, pageSize = 20) { override val configKeyDomain: ConfigKey.Domain get() = ConfigKey.Domain("blogtruyenmoi.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/BlogTruyenVN.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/BlogTruyenVN.kt index 74df4cc7..43f97d04 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/BlogTruyenVN.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/BlogTruyenVN.kt @@ -7,7 +7,7 @@ import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -20,7 +20,7 @@ import java.util.* @Broken @MangaSourceParser("BLOGTRUYENVN", "BlogTruyen.vn (Unofficial)", "vi") internal class BlogTruyenVN(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.BLOGTRUYENVN, pageSize = 20) { + LegacyPagedMangaParser(context, MangaParserSource.BLOGTRUYENVN, pageSize = 20) { override val configKeyDomain: ConfigKey.Domain get() = ConfigKey.Domain("blogtruyenvn.org", "blogtruyenvn.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/CMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/CMangaParser.kt index 6043ef05..ebd36e91 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/CMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/CMangaParser.kt @@ -6,7 +6,7 @@ import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaParserAuthProvider import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.AuthRequiredException import org.koitharu.kotatsu.parsers.model.Manga @@ -20,7 +20,6 @@ import org.koitharu.kotatsu.parsers.model.MangaState import org.koitharu.kotatsu.parsers.model.MangaTag import org.koitharu.kotatsu.parsers.model.RATING_UNKNOWN import org.koitharu.kotatsu.parsers.model.SortOrder -import org.koitharu.kotatsu.parsers.util.domain import org.koitharu.kotatsu.parsers.util.generateUid import org.koitharu.kotatsu.parsers.util.getCookies import org.koitharu.kotatsu.parsers.util.json.asTypedList @@ -46,7 +45,7 @@ private const val PAGE_SIZE = 20 @MangaSourceParser("CMANGA", "CManga", "vi") internal class CMangaParser(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.CMANGA, PAGE_SIZE), MangaParserAuthProvider { + LegacyPagedMangaParser(context, MangaParserSource.CMANGA, PAGE_SIZE), MangaParserAuthProvider { override val configKeyDomain: ConfigKey.Domain get() = ConfigKey.Domain("cmangax.com") @@ -131,7 +130,7 @@ internal class CMangaParser(context: MangaLoaderContext) : order == SortOrder.POPULARITY_TODAY || order == SortOrder.POPULARITY_WEEK || order == SortOrder.POPULARITY_MONTH - ) + ) ) { addPathSegments("api/home_album_top") } else { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/CuuTruyenParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/CuuTruyenParser.kt index 7ede5846..e3137c80 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/CuuTruyenParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/CuuTruyenParser.kt @@ -10,7 +10,7 @@ import okio.IOException import org.jsoup.HttpStatusException import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.bitmap.Bitmap import org.koitharu.kotatsu.parsers.bitmap.Rect import org.koitharu.kotatsu.parsers.config.ConfigKey @@ -25,7 +25,7 @@ import java.util.TimeZone @MangaSourceParser("CUUTRUYEN", "Cứu Truyện", "vi") internal class CuuTruyenParser(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.CUUTRUYEN, 20), Interceptor { + LegacyPagedMangaParser(context, MangaParserSource.CUUTRUYEN, 20), Interceptor { override val userAgentKey = ConfigKey.UserAgent(UserAgents.KOTATSU) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/DuaLeoTruyen.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/DuaLeoTruyen.kt index 7758ed43..8593b276 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/DuaLeoTruyen.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/DuaLeoTruyen.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.vi import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -12,7 +12,7 @@ import java.util.* @MangaSourceParser("DUALEOTRUYEN", "Dưa Leo Truyện", "vi", type = ContentType.HENTAI) internal class DuaLeoTruyen(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.DUALEOTRUYEN, 60) { + LegacyPagedMangaParser(context, MangaParserSource.DUALEOTRUYEN, 60) { override val configKeyDomain: ConfigKey.Domain get() = ConfigKey.Domain("dualeotruyenxxy.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/GocTruyenTranh.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/GocTruyenTranh.kt index fa16abb2..98c30f83 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/GocTruyenTranh.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/GocTruyenTranh.kt @@ -3,85 +3,86 @@ package org.koitharu.kotatsu.parsers.site.vi import androidx.collection.arraySetOf import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.network.UserAgents import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* -import java.text.SimpleDateFormat import java.util.* @MangaSourceParser("GOCTRUYENTRANH", "Góc Truyện Tranh", "vi") internal class GocTruyenTranh(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.GOCTRUYENTRANH, 30) { - - override val configKeyDomain = ConfigKey.Domain("goctruyentranh.net") + LegacyPagedMangaParser(context, MangaParserSource.GOCTRUYENTRANH, 30) { - override fun onCreateConfig(keys: MutableCollection>) { + override val configKeyDomain = ConfigKey.Domain("goctruyentranh.net") + + override fun onCreateConfig(keys: MutableCollection>) { super.onCreateConfig(keys) keys.add(userAgentKey) } override val userAgentKey = ConfigKey.UserAgent(UserAgents.CHROME_DESKTOP) - override val availableSortOrders: Set = EnumSet.of( + override val availableSortOrders: Set = EnumSet.of( SortOrder.UPDATED, - SortOrder.NEWEST, + SortOrder.NEWEST, SortOrder.NEWEST_ASC, SortOrder.ALPHABETICAL, SortOrder.RATING, - SortOrder.POPULARITY + SortOrder.POPULARITY, ) - override val filterCapabilities: MangaListFilterCapabilities - get() = MangaListFilterCapabilities( - isMultipleTagsSupported = true, - isTagsExclusionSupported = false, - isSearchSupported = true, - isSearchWithFiltersSupported = true, - ) + override val filterCapabilities: MangaListFilterCapabilities + get() = MangaListFilterCapabilities( + isMultipleTagsSupported = true, + isTagsExclusionSupported = false, + isSearchSupported = true, + isSearchWithFiltersSupported = true, + ) - override suspend fun getFilterOptions() = MangaListFilterOptions( - availableTags = availableTags(), - availableStates = EnumSet.of(MangaState.ONGOING, MangaState.FINISHED), - availableContentTypes = EnumSet.of( - ContentType.MANGA, - ContentType.MANHWA, - ContentType.MANHUA, - ContentType.OTHER, - ), - ) + override suspend fun getFilterOptions() = MangaListFilterOptions( + availableTags = availableTags(), + availableStates = EnumSet.of(MangaState.ONGOING, MangaState.FINISHED), + availableContentTypes = EnumSet.of( + ContentType.MANGA, + ContentType.MANHWA, + ContentType.MANHUA, + ContentType.OTHER, + ), + ) - override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List { - val url = buildString { - append("https://") - append(domain) - append("/baseapi/comics/filterComic") - append("?keyword=") - append(filter.query?.urlEncoded() ?: "") - - if (filter.tags.isNotEmpty()) { - append("&categories=") - append(filter.tags.joinToString(",") { tag -> - availableTags().find { it.title == tag.title }?.key ?: tag.key - }) - } - - append("&status=") - when { - filter.states.isEmpty() -> append("") - filter.states.size > 1 -> append("") - else -> append( + override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List { + val url = buildString { + append("https://") + append(domain) + append("/baseapi/comics/filterComic") + append("?keyword=") + append(filter.query?.urlEncoded() ?: "") + + if (filter.tags.isNotEmpty()) { + append("&categories=") + append( + filter.tags.joinToString(",") { tag -> + availableTags().find { it.title == tag.title }?.key ?: tag.key + }, + ) + } + + append("&status=") + when { + filter.states.isEmpty() -> append("") + filter.states.size > 1 -> append("") + else -> append( when (filter.states.first()) { MangaState.ONGOING -> "0" MangaState.FINISHED -> "1" else -> "" - } + }, ) - } - - append("&sort=") - append( + } + + append("&sort=") + append( when (order) { SortOrder.UPDATED -> "recently_updated" SortOrder.NEWEST -> "latest" @@ -90,12 +91,12 @@ internal class GocTruyenTranh(context: MangaLoaderContext) : SortOrder.ALPHABETICAL -> "alphabet" SortOrder.POPULARITY -> "mostView" else -> "recently_updated" - } + }, ) - - if (filter.types.isNotEmpty()) { - append("&country=") - append( + + if (filter.types.isNotEmpty()) { + append("&country=") + append( filter.types.joinToString(",") { when (it) { ContentType.MANGA -> "manga" @@ -104,197 +105,201 @@ internal class GocTruyenTranh(context: MangaLoaderContext) : ContentType.OTHER -> "other" else -> "manga" } - } + }, ) - } - - append("&page=") - append(page) - } - - val json = webClient.httpGet(url).parseJson() - val data = json.getJSONObject("comics").getJSONArray("data") - - return List(data.length()) { i -> - val item = data.getJSONObject(i) - val slug = item.getString("slug") - val mangaUrl = buildString { - append("https://") - append(domain) - append("/") - append(slug) - } - - val categories = item.optJSONArray("categories") - val tags = if (categories != null) { - List(categories.length()) { j -> - val category = categories.getJSONObject(j) - MangaTag( - key = category.getString("id"), - title = category.getString("name").toTitleCase(sourceLocale), - source = source, - ) - }.toSet() - } else { - emptySet() - } + } + + append("&page=") + append(page) + } + + val json = webClient.httpGet(url).parseJson() + val data = json.getJSONObject("comics").getJSONArray("data") + + return List(data.length()) { i -> + val item = data.getJSONObject(i) + val slug = item.getString("slug") + val mangaUrl = buildString { + append("https://") + append(domain) + append("/") + append(slug) + } + + val categories = item.optJSONArray("categories") + val tags = if (categories != null) { + List(categories.length()) { j -> + val category = categories.getJSONObject(j) + MangaTag( + key = category.getString("id"), + title = category.getString("name").toTitleCase(sourceLocale), + source = source, + ) + }.toSet() + } else { + emptySet() + } // Check NSFW manga by tags, API / Site not have this information - val checkNsfw = tags.any { tag -> - tag.key in setOf("25", "39", "41", "43", "57", "63") - } - - Manga( - id = generateUid(mangaUrl), - url = "/$slug", - publicUrl = mangaUrl, - title = item.getString("name"), - altTitle = item.optString("origin_name")?.takeUnless { it == "null" || it.isEmpty() }, - description = item.optString("content"), - rating = RATING_UNKNOWN, - isNsfw = checkNsfw || isNsfwSource, - coverUrl = item.optString("thumbnail"), - tags = tags, - state = when (item.optString("status")) { - "0" -> MangaState.ONGOING - "1" -> MangaState.FINISHED - else -> null - }, - source = source, - author = null, - ) - } - } + val checkNsfw = tags.any { tag -> + tag.key in setOf("25", "39", "41", "43", "57", "63") + } - override suspend fun getDetails(manga: Manga): Manga { - val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml() - return manga.copy( - rating = doc.selectFirst("div > span.leading-none")?.text()?.toFloatOrNull()?.div(5f) ?: RATING_UNKNOWN, - author = doc.selectFirst("aside p:contains(Tác giả:) a[href^='/tac-gia/']")?.text(), - chapters = doc.select("ul[itemtype='https://schema.org/ItemList'] li").mapChapters(reversed = true) { i, li -> - val a = li.selectFirstOrThrow("a") - val href = a.attrAsRelativeUrl("href") - val name = li.selectFirst("div.w-\\[50\\%\\].truncate.flex")?.text() ?: "" - val dateText = li.selectFirst("div.w-\\[50\\%\\].truncate.text-center")?.text() - MangaChapter( - id = generateUid(href), - name = name, - number = i + 1f, - volume = 0, - url = href, - scanlator = null, - uploadDate = parseChapterDate(dateText), - branch = null, - source = source, - ) - }, - ) - } + Manga( + id = generateUid(mangaUrl), + url = "/$slug", + publicUrl = mangaUrl, + title = item.getString("name"), + altTitle = item.optString("origin_name")?.takeUnless { it == "null" || it.isEmpty() }, + description = item.optString("content"), + rating = RATING_UNKNOWN, + isNsfw = checkNsfw || isNsfwSource, + coverUrl = item.optString("thumbnail"), + tags = tags, + state = when (item.optString("status")) { + "0" -> MangaState.ONGOING + "1" -> MangaState.FINISHED + else -> null + }, + source = source, + author = null, + ) + } + } - override suspend fun getPages(chapter: MangaChapter): List { - val fullUrl = chapter.url.toAbsoluteUrl(domain) - val doc = webClient.httpGet(fullUrl).parseHtml() - return doc.select("img.lozad[data-src]").map { img -> - val url = img.attr("data-src") - MangaPage( - id = generateUid(url), - url = url, - preview = null, - source = source, - ) - } - } + override suspend fun getDetails(manga: Manga): Manga { + val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml() + return manga.copy( + rating = doc.selectFirst("div > span.leading-none")?.text()?.toFloatOrNull()?.div(5f) ?: RATING_UNKNOWN, + author = doc.selectFirst("aside p:contains(Tác giả:) a[href^='/tac-gia/']")?.text(), + chapters = doc.select("ul[itemtype='https://schema.org/ItemList'] li") + .mapChapters(reversed = true) { i, li -> + val a = li.selectFirstOrThrow("a") + val href = a.attrAsRelativeUrl("href") + val name = li.selectFirst("div.w-\\[50\\%\\].truncate.flex")?.text() ?: "" + val dateText = li.selectFirst("div.w-\\[50\\%\\].truncate.text-center")?.text() + MangaChapter( + id = generateUid(href), + name = name, + number = i + 1f, + volume = 0, + url = href, + scanlator = null, + uploadDate = parseChapterDate(dateText), + branch = null, + source = source, + ) + }, + ) + } - private fun parseChapterDate(dateText: String?): Long { - if (dateText == null) return 0 - - val number = dateText.filter { it.isDigit() }.toIntOrNull() ?: return 0 - val now = System.currentTimeMillis() - - return when { - dateText.contains("phút trước") -> { - now - (number * 60 * 1000L) - } - dateText.contains("giờ trước") -> { - now - (number * 60 * 60 * 1000L) - } - dateText.contains("ngày trước") -> { - now - (number * 24 * 60 * 60 * 1000L) - } - else -> 0L - } - } + override suspend fun getPages(chapter: MangaChapter): List { + val fullUrl = chapter.url.toAbsoluteUrl(domain) + val doc = webClient.httpGet(fullUrl).parseHtml() + return doc.select("img.lozad[data-src]").map { img -> + val url = img.attr("data-src") + MangaPage( + id = generateUid(url), + url = url, + preview = null, + source = source, + ) + } + } - private fun availableTags() = arraySetOf( - MangaTag("Action", "1", source), - MangaTag("Adventure", "2", source), - MangaTag("Fantasy", "3", source), - MangaTag("Manhua", "4", source), - MangaTag("Chuyển Sinh", "5", source), - MangaTag("Truyện Màu", "6", source), - MangaTag("Xuyên Không", "7", source), - MangaTag("Manhwa", "8", source), - MangaTag("Drama", "9", source), - MangaTag("Historical", "10", source), - MangaTag("Manga", "11", source), - MangaTag("Seinen", "12", source), - MangaTag("Comedy", "13", source), - MangaTag("Martial Arts", "14", source), - MangaTag("Mystery", "15", source), - MangaTag("Romance", "16", source), - MangaTag("Shounen", "17", source), - MangaTag("Sports", "18", source), - MangaTag("Supernatural", "19", source), - MangaTag("Harem", "20", source), - MangaTag("Webtoon", "21", source), - MangaTag("School Life", "22", source), - MangaTag("Psychological", "23", source), - MangaTag("Cổ Đại", "24", source), - MangaTag("Ecchi", "25", source), - MangaTag("Gender Bender", "26", source), - MangaTag("Shoujo", "27", source), - MangaTag("Slice of Life", "28", source), - MangaTag("Ngôn Tình", "29", source), - MangaTag("Horror", "30", source), - MangaTag("Sci-fi", "31", source), - MangaTag("Tragedy", "32", source), - MangaTag("Mecha", "33", source), - MangaTag("Comic", "34", source), - MangaTag("One shot", "35", source), - MangaTag("Shoujo Ai", "36", source), - MangaTag("Anime", "37", source), - MangaTag("Josei", "38", source), - MangaTag("Smut", "39", source), - MangaTag("Shounen Ai", "40", source), - MangaTag("Mature", "41", source), - MangaTag("Soft Yuri", "42", source), - MangaTag("Adult", "43", source), - MangaTag("Doujinshi", "44", source), - MangaTag("Live action", "45", source), - MangaTag("Trinh Thám", "46", source), - MangaTag("Việt Nam", "47", source), - MangaTag("Truyện scan", "48", source), - MangaTag("Cooking", "49", source), - MangaTag("Tạp chí truyện tranh", "50", source), - MangaTag("16+", "51", source), - MangaTag("Thiếu Nhi", "52", source), - MangaTag("Soft Yaoi", "53", source), - MangaTag("Đam Mỹ", "54", source), - MangaTag("BoyLove", "55", source), - MangaTag("Yaoi", "56", source), - MangaTag("18+", "57", source), - MangaTag("Người Thú", "58", source), - MangaTag("ABO", "59", source), - MangaTag("Mafia", "60", source), - MangaTag("Isekai", "61", source), - MangaTag("Hệ Thống", "62", source), - MangaTag("NTR", "63", source), - MangaTag("Yuri", "64", source), - MangaTag("Girl Love", "65", source), - MangaTag("Demons", "66", source), - MangaTag("Huyền Huyễn", "67", source), - MangaTag("Detective", "68", source), - MangaTag("Trọng Sinh", "69", source), - MangaTag("Magic", "70", source), - ) + private fun parseChapterDate(dateText: String?): Long { + if (dateText == null) return 0 + + val number = dateText.filter { it.isDigit() }.toIntOrNull() ?: return 0 + val now = System.currentTimeMillis() + + return when { + dateText.contains("phút trước") -> { + now - (number * 60 * 1000L) + } + + dateText.contains("giờ trước") -> { + now - (number * 60 * 60 * 1000L) + } + + dateText.contains("ngày trước") -> { + now - (number * 24 * 60 * 60 * 1000L) + } + + else -> 0L + } + } + + private fun availableTags() = arraySetOf( + MangaTag("Action", "1", source), + MangaTag("Adventure", "2", source), + MangaTag("Fantasy", "3", source), + MangaTag("Manhua", "4", source), + MangaTag("Chuyển Sinh", "5", source), + MangaTag("Truyện Màu", "6", source), + MangaTag("Xuyên Không", "7", source), + MangaTag("Manhwa", "8", source), + MangaTag("Drama", "9", source), + MangaTag("Historical", "10", source), + MangaTag("Manga", "11", source), + MangaTag("Seinen", "12", source), + MangaTag("Comedy", "13", source), + MangaTag("Martial Arts", "14", source), + MangaTag("Mystery", "15", source), + MangaTag("Romance", "16", source), + MangaTag("Shounen", "17", source), + MangaTag("Sports", "18", source), + MangaTag("Supernatural", "19", source), + MangaTag("Harem", "20", source), + MangaTag("Webtoon", "21", source), + MangaTag("School Life", "22", source), + MangaTag("Psychological", "23", source), + MangaTag("Cổ Đại", "24", source), + MangaTag("Ecchi", "25", source), + MangaTag("Gender Bender", "26", source), + MangaTag("Shoujo", "27", source), + MangaTag("Slice of Life", "28", source), + MangaTag("Ngôn Tình", "29", source), + MangaTag("Horror", "30", source), + MangaTag("Sci-fi", "31", source), + MangaTag("Tragedy", "32", source), + MangaTag("Mecha", "33", source), + MangaTag("Comic", "34", source), + MangaTag("One shot", "35", source), + MangaTag("Shoujo Ai", "36", source), + MangaTag("Anime", "37", source), + MangaTag("Josei", "38", source), + MangaTag("Smut", "39", source), + MangaTag("Shounen Ai", "40", source), + MangaTag("Mature", "41", source), + MangaTag("Soft Yuri", "42", source), + MangaTag("Adult", "43", source), + MangaTag("Doujinshi", "44", source), + MangaTag("Live action", "45", source), + MangaTag("Trinh Thám", "46", source), + MangaTag("Việt Nam", "47", source), + MangaTag("Truyện scan", "48", source), + MangaTag("Cooking", "49", source), + MangaTag("Tạp chí truyện tranh", "50", source), + MangaTag("16+", "51", source), + MangaTag("Thiếu Nhi", "52", source), + MangaTag("Soft Yaoi", "53", source), + MangaTag("Đam Mỹ", "54", source), + MangaTag("BoyLove", "55", source), + MangaTag("Yaoi", "56", source), + MangaTag("18+", "57", source), + MangaTag("Người Thú", "58", source), + MangaTag("ABO", "59", source), + MangaTag("Mafia", "60", source), + MangaTag("Isekai", "61", source), + MangaTag("Hệ Thống", "62", source), + MangaTag("NTR", "63", source), + MangaTag("Yuri", "64", source), + MangaTag("Girl Love", "65", source), + MangaTag("Demons", "66", source), + MangaTag("Huyền Huyễn", "67", source), + MangaTag("Detective", "68", source), + MangaTag("Trọng Sinh", "69", source), + MangaTag("Magic", "70", source), + ) } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/Hentai18VN.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/Hentai18VN.kt index 71ad6ec7..9bc5befa 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/Hentai18VN.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/Hentai18VN.kt @@ -1,13 +1,11 @@ package org.koitharu.kotatsu.parsers.site.vi -import androidx.collection.arraySetOf import okhttp3.Headers import okhttp3.HttpUrl.Companion.toHttpUrl -import org.json.JSONObject import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -15,7 +13,8 @@ import java.text.SimpleDateFormat import java.util.* @MangaSourceParser("HENTAI18VN", "Hentai18VN", "vi", type = ContentType.HENTAI) -internal class Hentai18VN(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.HENTAI18VN, 30) { +internal class Hentai18VN(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.HENTAI18VN, 30) { override val configKeyDomain = ConfigKey.Domain("hentai18vn.art") @@ -24,79 +23,79 @@ internal class Hentai18VN(context: MangaLoaderContext) : PagedMangaParser(contex keys.add(userAgentKey) } - override val filterCapabilities: MangaListFilterCapabilities - get() = MangaListFilterCapabilities( + override val filterCapabilities: MangaListFilterCapabilities + get() = MangaListFilterCapabilities( isSearchSupported = true, - isSearchWithFiltersSupported = false + isSearchWithFiltersSupported = false, ) - override suspend fun getFilterOptions() = MangaListFilterOptions(availableTags = fetchAvailableTags()) - override val availableSortOrders: Set = EnumSet.of( + override suspend fun getFilterOptions() = MangaListFilterOptions(availableTags = fetchAvailableTags()) + override val availableSortOrders: Set = EnumSet.of( SortOrder.NEWEST, SortOrder.POPULARITY, - SortOrder.UPDATED + SortOrder.UPDATED, ) - - override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List { - return when { - !filter.query.isNullOrEmpty() -> { - if (page > 1) { - return emptyList() - } - - val keyword = filter.query - val url = "http://$domain/search/html/1" - val headers = Headers.Builder().add("X-Requested-With", "XMLHttpRequest").build() - val response = webClient.httpPost(url.toHttpUrl(), payload = "keyword=$keyword", headers).parseHtml() - parseMangaSearch(response) - } - - !filter.tags.isNullOrEmpty() -> { - val tag = filter.tags.first() - val url = buildString { - append("https://") - append(domain) - append("/the-loai/") - append(tag.key) - if (page > 1) { - append("?page=") - append(page) - } - } - val response = webClient.httpGet(url).parseHtml() - parseMangaList(response) - } - - else -> { - val url = buildString { - append("https://") - append(domain) - append("/") - append( + + override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List { + return when { + !filter.query.isNullOrEmpty() -> { + if (page > 1) { + return emptyList() + } + + val keyword = filter.query + val url = "http://$domain/search/html/1" + val headers = Headers.Builder().add("X-Requested-With", "XMLHttpRequest").build() + val response = webClient.httpPost(url.toHttpUrl(), payload = "keyword=$keyword", headers).parseHtml() + parseMangaSearch(response) + } + + !filter.tags.isNullOrEmpty() -> { + val tag = filter.tags.first() + val url = buildString { + append("https://") + append(domain) + append("/the-loai/") + append(tag.key) + if (page > 1) { + append("?page=") + append(page) + } + } + val response = webClient.httpGet(url).parseHtml() + parseMangaList(response) + } + + else -> { + val url = buildString { + append("https://") + append(domain) + append("/") + append( when (order) { SortOrder.NEWEST -> "danh-sach/truyen-hentai-moi" SortOrder.POPULARITY -> "danh-sach/truyen-hentai-hot" SortOrder.UPDATED -> "danh-sach/truyen-hentai-hoan-thanh" else -> "danh-sach/truyen-hentai-hay" - } + }, ) - if (page > 1) { - append("?page=") - append(page) - } - } - - val response = webClient.httpGet(url).parseHtml() - parseMangaList(response) - } - } - } - - private fun parseMangaSearch(doc: Document): List { - return doc.select("a.item").map { a -> - val href = a.attr("href") - val mangaInfo = a.selectFirst("img") - Manga( + if (page > 1) { + append("?page=") + append(page) + } + } + + val response = webClient.httpGet(url).parseHtml() + parseMangaList(response) + } + } + } + + private fun parseMangaSearch(doc: Document): List { + return doc.select("a.item").map { a -> + val href = a.attr("href") + val mangaInfo = a.selectFirst("img") + Manga( id = generateUid(href), url = href, publicUrl = href.toAbsoluteUrl(domain), @@ -108,48 +107,48 @@ internal class Hentai18VN(context: MangaLoaderContext) : PagedMangaParser(contex state = null, coverUrl = mangaInfo.requireSrc(), isNsfw = isNsfwSource, - source = source - ) - } - } - - private fun parseMangaList(doc: Document): List { - return doc.select("div.visual").map { div -> - val a = div.selectFirst("div.main_text h3.title a") - val img = div.selectFirst("div.hentai-cover img") - val mangaUrl = a.attr("href") - Manga( - id = generateUid(mangaUrl), - publicUrl = mangaUrl, - url = mangaUrl.removePrefix("https://$domain"), - title = a.text(), - altTitle = null, - author = null, - description = null, - tags = emptySet(), - rating = RATING_UNKNOWN, - state = null, - coverUrl = img.attr("data-original").takeIf { it.isNotEmpty() } ?: img.attr("src"), - isNsfw = isNsfwSource, source = source, ) - } - } - - override suspend fun getDetails(manga: Manga): Manga { - val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml() - val tags = doc.select("div.hentai-info .line-content a.item-tag") - .mapNotNull { a -> - MangaTag( + } + } + + private fun parseMangaList(doc: Document): List { + return doc.select("div.visual").map { div -> + val a = div.selectFirst("div.main_text h3.title a") + val img = div.selectFirst("div.hentai-cover img") + val mangaUrl = a.attr("href") + Manga( + id = generateUid(mangaUrl), + publicUrl = mangaUrl, + url = mangaUrl.removePrefix("https://$domain"), + title = a.text(), + altTitle = null, + author = null, + description = null, + tags = emptySet(), + rating = RATING_UNKNOWN, + state = null, + coverUrl = img.attr("data-original").takeIf { it.isNotEmpty() } ?: img.attr("src"), + isNsfw = isNsfwSource, + source = source, + ) + } + } + + override suspend fun getDetails(manga: Manga): Manga { + val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml() + val tags = doc.select("div.hentai-info .line-content a.item-tag") + .mapNotNull { a -> + MangaTag( title = a.text(), key = a.attr("href").substringAfterLast("/"), - source = source + source = source, ) - }.toSet() + }.toSet() - val chapters = doc.select("ul#chapter-list li.citem").mapChapters(reversed=true) { i, li -> - val a = li.selectFirst("a") - MangaChapter( + val chapters = doc.select("ul#chapter-list li.citem").mapChapters(reversed = true) { i, li -> + val a = li.selectFirst("a") + MangaChapter( id = generateUid(a.attr("href")), name = a.text(), number = i + 1f, @@ -158,71 +157,71 @@ internal class Hentai18VN(context: MangaLoaderContext) : PagedMangaParser(contex source = source, scanlator = null, branch = null, - volume = 0 + volume = 0, ) - } + } - val altTitle = doc.selectFirst("h2.alternative")?.text() - val author = doc.selectFirst("div.hentai-info .line:contains(Tác giả) .line-content")?.text() - val state = when(doc.selectFirst("div.hentai-info .line:contains(Tình trạng) .line-content")?.text()) { - "Đang cập nhật" -> MangaState.ONGOING - "Hoàn thành" -> MangaState.FINISHED - else -> null - } + val altTitle = doc.selectFirst("h2.alternative")?.text() + val author = doc.selectFirst("div.hentai-info .line:contains(Tác giả) .line-content")?.text() + val state = when (doc.selectFirst("div.hentai-info .line:contains(Tình trạng) .line-content")?.text()) { + "Đang cập nhật" -> MangaState.ONGOING + "Hoàn thành" -> MangaState.FINISHED + else -> null + } - return manga.copy( + return manga.copy( tags = tags, author = author, altTitle = altTitle, state = state, chapters = chapters, - description = doc.select("div.about").text() + description = doc.select("div.about").text(), ) - } + } - override suspend fun getPages(chapter: MangaChapter): List { - val doc = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml() - return doc.select("div.chapter-content div.item-photo img").mapNotNull { img -> - val url = img.requireSrc() - MangaPage( + override suspend fun getPages(chapter: MangaChapter): List { + val doc = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml() + return doc.select("div.chapter-content div.item-photo img").mapNotNull { img -> + val url = img.requireSrc() + MangaPage( id = generateUid(url), url = url, preview = null, - source = source + source = source, ) - } - } - - private suspend fun fetchAvailableTags(): Set { - val firstPage = webClient.httpGet("https://$domain/tim-the-loai").parseHtml() - val lastPage = firstPage.selectFirst("a[aria-label=Last]") - ?.attr("href") - ?.substringAfter("page=") - ?.toIntOrNull() ?: 1 - - return (1..lastPage).flatMap { page -> - val doc = if (page == 1) { - firstPage - } else { - webClient.httpGet("https://$domain/tim-the-loai?page=$page").parseHtml() - } - - doc.select("ul.list-tags li").mapNotNull { li -> - val a = li.selectFirst("a") ?: return@mapNotNull null - val title = a.selectFirst("h3.tag-name")?.text()?.trim() ?: return@mapNotNull null - val key = a.attr("href").substringAfterLast("/") - MangaTag( title = title, key = key, source = source ) - } - }.toSet() - } - - private fun parseChapterDate(date: String?): Long { - if (date == null) return 0 - return try { - val now = SimpleDateFormat("dd/MM/yyyy", Locale.US) - now.parse(date)?.time ?: 0L - } catch (e: Exception) { - 0L - } - } -} \ No newline at end of file + } + } + + private suspend fun fetchAvailableTags(): Set { + val firstPage = webClient.httpGet("https://$domain/tim-the-loai").parseHtml() + val lastPage = firstPage.selectFirst("a[aria-label=Last]") + ?.attr("href") + ?.substringAfter("page=") + ?.toIntOrNull() ?: 1 + + return (1..lastPage).flatMap { page -> + val doc = if (page == 1) { + firstPage + } else { + webClient.httpGet("https://$domain/tim-the-loai?page=$page").parseHtml() + } + + doc.select("ul.list-tags li").mapNotNull { li -> + val a = li.selectFirst("a") ?: return@mapNotNull null + val title = a.selectFirst("h3.tag-name")?.text()?.trim() ?: return@mapNotNull null + val key = a.attr("href").substringAfterLast("/") + MangaTag(title = title, key = key, source = source) + } + }.toSet() + } + + private fun parseChapterDate(date: String?): Long { + if (date == null) return 0 + return try { + val now = SimpleDateFormat("dd/MM/yyyy", Locale.US) + now.parse(date)?.time ?: 0L + } catch (e: Exception) { + 0L + } + } +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt index abebb836..90834e4b 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt @@ -8,7 +8,7 @@ import kotlinx.coroutines.sync.withLock import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.Broken import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.AbstractMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* @@ -21,7 +21,7 @@ private const val SEARCH_PAGE_SIZE = 10 @Broken @MangaSourceParser("HENTAIVN", "HentaiVN", "vi", type = ContentType.HENTAI) -internal class HentaiVNParser(context: MangaLoaderContext) : AbstractMangaParser(context, MangaParserSource.HENTAIVN) { +internal class HentaiVNParser(context: MangaLoaderContext) : LegacyMangaParser(context, MangaParserSource.HENTAIVN) { override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("hentaihvn.tv") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVnBuzz.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVnBuzz.kt index 50076ea0..9b8cad3a 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVnBuzz.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVnBuzz.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.vi import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.network.UserAgents @@ -11,7 +11,8 @@ import org.koitharu.kotatsu.parsers.util.* import java.util.* @MangaSourceParser("HENTAIVNBUZZ", "HentaiVn.buzz", "vi", type = ContentType.HENTAI) -internal class HentaiVnBuzz(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.HENTAIVNBUZZ, 24) { +internal class HentaiVnBuzz(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.HENTAIVNBUZZ, 24) { override val configKeyDomain = ConfigKey.Domain("hentaivn.buzz") @@ -176,25 +177,26 @@ internal class HentaiVnBuzz(context: MangaLoaderContext) : PagedMangaParser(cont "Hoàn thành" -> MangaState.FINISHED else -> null }, - chapters = doc.select("div.story-detail__list-chapter--list ul.list-unstyled li a").mapIndexed { i, element -> - val href = element.attrAsRelativeUrl("href") - val name = element.text().removePrefix("- ") - MangaChapter( - id = generateUid(href), - name = name, - number = i + 1f, - volume = 0, - url = href, - scanlator = null, - uploadDate = 0, - branch = null, - source = source, - ) - } + chapters = doc.select("div.story-detail__list-chapter--list ul.list-unstyled li a") + .mapIndexed { i, element -> + val href = element.attrAsRelativeUrl("href") + val name = element.text().removePrefix("- ") + MangaChapter( + id = generateUid(href), + name = name, + number = i + 1f, + volume = 0, + url = href, + scanlator = null, + uploadDate = 0, + branch = null, + source = source, + ) + }, ) } - override suspend fun getPages(chapter: MangaChapter): List { + override suspend fun getPages(chapter: MangaChapter): List { val fullUrl = chapter.url.toAbsoluteUrl(domain) val doc = webClient.httpGet(fullUrl).parseHtml() val imageUrls = doc.select("meta[property='og:image']").map { it.attr("content") } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/KuroNeko.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/KuroNeko.kt index 2bd46af7..e40d3beb 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/KuroNeko.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/KuroNeko.kt @@ -1,16 +1,15 @@ package org.koitharu.kotatsu.parsers.site.vi -import androidx.collection.arraySetOf import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* import java.util.* @MangaSourceParser("KURONEKO", "Việt Hentai", "vi", type = ContentType.HENTAI) -internal class KuroNeko(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.KURONEKO, 60) { +internal class KuroNeko(context: MangaLoaderContext) : LegacyPagedMangaParser(context, MangaParserSource.KURONEKO, 60) { override val configKeyDomain = ConfigKey.Domain("vi-hentai.com") @@ -217,14 +216,14 @@ internal class KuroNeko(context: MangaLoaderContext) : PagedMangaParser(context, calendar.timeInMillis }.getOrDefault(0L) - private suspend fun availableTags(): Set { - val doc = webClient.httpGet("https://$domain").parseHtml() - return doc.select("ul.grid.grid-cols-2 a").mapToSet { a -> - MangaTag( - key = a.attr("href").removeSuffix('/').substringAfterLast('/'), - title = a.text(), - source = source, - ) - } - } + private suspend fun availableTags(): Set { + val doc = webClient.httpGet("https://$domain").parseHtml() + return doc.select("ul.grid.grid-cols-2 a").mapToSet { a -> + MangaTag( + key = a.attr("href").removeSuffix('/').substringAfterLast('/'), + title = a.text(), + source = source, + ) + } + } } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/LxManga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/LxManga.kt index 4287cd03..37d34fb5 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/LxManga.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/LxManga.kt @@ -1,16 +1,15 @@ package org.koitharu.kotatsu.parsers.site.vi -import androidx.collection.arraySetOf import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* import java.util.* @MangaSourceParser("LXMANGA", "LXManga", "vi", type = ContentType.HENTAI) -internal class LxManga(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.LXMANGA, 60) { +internal class LxManga(context: MangaLoaderContext) : LegacyPagedMangaParser(context, MangaParserSource.LXMANGA, 60) { override val configKeyDomain = ConfigKey.Domain("lxmanga.cloud") @@ -211,13 +210,13 @@ internal class LxManga(context: MangaLoaderContext) : PagedMangaParser(context, private suspend fun availableTags(): Set { val url = "https://$domain/the-loai" val doc = webClient.httpGet(url).parseHtml() - + return doc.select("nav.grid.grid-cols-3.md\\:grid-cols-8 button").map { button -> val key = button.attr("wire:click").substringAfterLast(", '").substringBeforeLast("')") MangaTag( key = key, title = button.select("span.text-ellipsis").text(), - source = source + source = source, ) }.toSet() } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/SayHentai.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/SayHentai.kt index 79bd21ed..83936909 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/SayHentai.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/SayHentai.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.vi import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -10,7 +10,8 @@ import java.text.SimpleDateFormat import java.util.* @MangaSourceParser("SAYHENTAI", "SayHentai", "vi", ContentType.HENTAI) -internal class SayHentai(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.SAYHENTAI, 20) { +internal class SayHentai(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.SAYHENTAI, 20) { override val configKeyDomain = ConfigKey.Domain("sayhentai.ink") override fun onCreateConfig(keys: MutableCollection>) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenGG.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenGG.kt index d6524f8e..dca2871a 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenGG.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenGG.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.vi import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -10,7 +10,7 @@ import java.text.SimpleDateFormat import java.util.* @MangaSourceParser("TRUYENGG", "TruyenGG", "vi") -internal class TruyenGG(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.TRUYENGG, 42) { +internal class TruyenGG(context: MangaLoaderContext) : LegacyPagedMangaParser(context, MangaParserSource.TRUYENGG, 42) { override val configKeyDomain = ConfigKey.Domain("truyengg.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenHentaiVN.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenHentaiVN.kt index 2c3bd5c9..60605e95 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenHentaiVN.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenHentaiVN.kt @@ -1,10 +1,9 @@ package org.koitharu.kotatsu.parsers.site.vi -import androidx.collection.arraySetOf import androidx.collection.ArrayMap import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -13,7 +12,8 @@ import java.util.* import java.text.SimpleDateFormat @MangaSourceParser("TRUYENHENTAIVN", "TruyenHentaiVN", "vi", type = ContentType.HENTAI) -internal class TruyenHentaiVN(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.TRUYENHENTAIVN, 30) { +internal class TruyenHentaiVN(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.TRUYENHENTAIVN, 30) { private var cacheTags = suspendLazy(initializer = ::fetchTags) override val configKeyDomain = ConfigKey.Domain("truyenhentaivn.live") @@ -26,19 +26,19 @@ internal class TruyenHentaiVN(context: MangaLoaderContext) : PagedMangaParser(co override val filterCapabilities: MangaListFilterCapabilities get() = MangaListFilterCapabilities( isSearchSupported = true, - isSearchWithFiltersSupported = false + isSearchWithFiltersSupported = false, ) - override suspend fun getFilterOptions() = MangaListFilterOptions(availableTags = cacheTags.get().values.toSet()) + override suspend fun getFilterOptions() = MangaListFilterOptions(availableTags = cacheTags.get().values.toSet()) - override val availableSortOrders: Set = EnumSet.of(SortOrder.UPDATED) + override val availableSortOrders: Set = EnumSet.of(SortOrder.UPDATED) override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List { val url = buildString { append("https://") append(domain) - - when { + + when { !filter.tags.isNullOrEmpty() -> { val tag = filter.tags.first() append(tag.key) @@ -47,7 +47,7 @@ internal class TruyenHentaiVN(context: MangaLoaderContext) : PagedMangaParser(co append(page) } } - + !filter.query.isNullOrEmpty() -> { append("/tim-kiem-truyen/?q=") append(filter.query.urlEncoded()) @@ -56,7 +56,7 @@ internal class TruyenHentaiVN(context: MangaLoaderContext) : PagedMangaParser(co append(page) } } - + else -> { append("/chap-moi") if (page > 1) { @@ -87,60 +87,60 @@ internal class TruyenHentaiVN(context: MangaLoaderContext) : PagedMangaParser(co state = null, coverUrl = cover, isNsfw = true, - source = source + source = source, ) } } override suspend fun getDetails(manga: Manga): Manga { val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml() - return manga.copy( - author = doc.selectFirst("div.author i")?.text(), - tags = doc.select("div.genre.mb-3.mgen a").mapNotNull { a -> - val key = a.attr("href").substringAfterLast("-") - val title = a.text().trim() - if (key.isNotEmpty() && title.isNotEmpty()) { - MangaTag( - key = key, - title = title, - source = source - ) - } else null - }.toSet(), - description = doc.selectFirst("div.inner.mb-1.full")?.let { div -> - div.select("p").joinToString("\n") { it.wholeText() } - }, - coverUrl = doc.selectFirst("div.book img")?.src(), - state = when(doc.selectFirst("div.tsinfo .imptdt i")?.text()?.trim()) { - "Đã hoàn thành" -> MangaState.FINISHED - "Đang tiến hành" -> MangaState.ONGOING - else -> null - }, - chapters = doc.select("div.chap-list .d-flex").mapChapters(reversed = true) { i, div -> - val url = div.selectFirst("a")?.attrAsRelativeUrl("href") ?: "" - val name = div.selectFirst("a .name")?.text() ?: "" - val dateStr = div.selectFirst("a span:last-child")?.text() - - val uploadDate = dateStr?.let { - try { - SimpleDateFormat("dd-MM-yyyy", Locale.US).parse(it)?.time ?: 0L - } catch (e: Exception) { - 0L - } - } ?: 0L - - MangaChapter( - id = generateUid(url), - name = name, - number = i + 1f, - url = url, - scanlator = null, - uploadDate = uploadDate, - branch = null, - source = source, - volume = 0 - ) - } + return manga.copy( + author = doc.selectFirst("div.author i")?.text(), + tags = doc.select("div.genre.mb-3.mgen a").mapNotNull { a -> + val key = a.attr("href").substringAfterLast("-") + val title = a.text().trim() + if (key.isNotEmpty() && title.isNotEmpty()) { + MangaTag( + key = key, + title = title, + source = source, + ) + } else null + }.toSet(), + description = doc.selectFirst("div.inner.mb-1.full")?.let { div -> + div.select("p").joinToString("\n") { it.wholeText() } + }, + coverUrl = doc.selectFirst("div.book img")?.src(), + state = when (doc.selectFirst("div.tsinfo .imptdt i")?.text()?.trim()) { + "Đã hoàn thành" -> MangaState.FINISHED + "Đang tiến hành" -> MangaState.ONGOING + else -> null + }, + chapters = doc.select("div.chap-list .d-flex").mapChapters(reversed = true) { i, div -> + val url = div.selectFirst("a")?.attrAsRelativeUrl("href") ?: "" + val name = div.selectFirst("a .name")?.text() ?: "" + val dateStr = div.selectFirst("a span:last-child")?.text() + + val uploadDate = dateStr?.let { + try { + SimpleDateFormat("dd-MM-yyyy", Locale.US).parse(it)?.time ?: 0L + } catch (e: Exception) { + 0L + } + } ?: 0L + + MangaChapter( + id = generateUid(url), + name = name, + number = i + 1f, + url = url, + scanlator = null, + uploadDate = uploadDate, + branch = null, + source = source, + volume = 0, + ) + }, ) } @@ -153,7 +153,7 @@ internal class TruyenHentaiVN(context: MangaLoaderContext) : PagedMangaParser(co id = generateUid(url), url = url, preview = null, - source = source + source = source, ) } else null } @@ -172,4 +172,4 @@ internal class TruyenHentaiVN(context: MangaLoaderContext) : PagedMangaParser(co } return tagMap } -} \ No newline at end of file +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenQQ.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenQQ.kt index 7200cb77..71226456 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenQQ.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenQQ.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.vi import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -10,7 +10,7 @@ import java.text.SimpleDateFormat import java.util.* @MangaSourceParser("TRUYENQQ", "TruyenQQ", "vi") -internal class TruyenQQ(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.TRUYENQQ, 42) { +internal class TruyenQQ(context: MangaLoaderContext) : LegacyPagedMangaParser(context, MangaParserSource.TRUYENQQ, 42) { override val configKeyDomain = ConfigKey.Domain("truyenqqto.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenTranh3Q.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenTranh3Q.kt index bf75bb99..de30476f 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenTranh3Q.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/TruyenTranh3Q.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.vi import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -11,7 +11,7 @@ import java.util.* @MangaSourceParser("TRUYENTRANH3Q", "TruyenTranh3Q", "vi") internal class TruyenTranh3Q(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.TRUYENTRANH3Q, 42) { + LegacyPagedMangaParser(context, MangaParserSource.TRUYENTRANH3Q, 42) { private val relativeTimePattern = Regex("(\\d+)\\s*(phút|giờ|ngày|tuần) trước") private val absoluteTimePattern = Regex("(\\d{2}-\\d{2}-\\d{4})") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/VcomycsParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/VcomycsParser.kt index 20ea712d..e93c6a18 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/VcomycsParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/VcomycsParser.kt @@ -6,7 +6,7 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.ContentRating import org.koitharu.kotatsu.parsers.model.ContentType @@ -24,7 +24,6 @@ import org.koitharu.kotatsu.parsers.model.SortOrder import org.koitharu.kotatsu.parsers.util.attrAsRelativeUrl import org.koitharu.kotatsu.parsers.util.attrOrNull import org.koitharu.kotatsu.parsers.util.attrOrThrow -import org.koitharu.kotatsu.parsers.util.domain import org.koitharu.kotatsu.parsers.util.generateUid import org.koitharu.kotatsu.parsers.util.json.mapJSONNotNull import org.koitharu.kotatsu.parsers.util.mapChapters @@ -47,7 +46,8 @@ import javax.crypto.spec.PBEKeySpec import javax.crypto.spec.SecretKeySpec @MangaSourceParser("VCOMYCS", "Vcomycs", "vi", ContentType.MANGA) -internal class VcomycsParser(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.VCOMYCS, 36) { +internal class VcomycsParser(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.VCOMYCS, 36) { override val configKeyDomain: ConfigKey.Domain get() = ConfigKey.Domain("vivicomi.org") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/YurinekoParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/YurinekoParser.kt index b4ed8840..acaa3a10 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/YurinekoParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/YurinekoParser.kt @@ -3,7 +3,7 @@ package org.koitharu.kotatsu.parsers.site.vi import org.json.JSONObject import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -15,7 +15,8 @@ import java.text.SimpleDateFormat import java.util.* @MangaSourceParser("YURINEKO", "YuriNeko", "vi", ContentType.HENTAI) -internal class YurinekoParser(context: MangaLoaderContext) : PagedMangaParser(context, MangaParserSource.YURINEKO, 20) { +internal class YurinekoParser(context: MangaLoaderContext) : + LegacyPagedMangaParser(context, MangaParserSource.YURINEKO, 20) { override val configKeyDomain: ConfigKey.Domain get() = ConfigKey.Domain("yurineko.site") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vmp/VmpParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vmp/VmpParser.kt index eba126d6..4d31a680 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vmp/VmpParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vmp/VmpParser.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.site.vmp import kotlinx.coroutines.coroutineScope import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -13,7 +13,7 @@ internal abstract class VmpParser( source: MangaParserSource, domain: String, pageSize: Int = 24, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/wpcomics/WpComicsParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/wpcomics/WpComicsParser.kt index 6a1c7275..ebe3cfa8 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/wpcomics/WpComicsParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/wpcomics/WpComicsParser.kt @@ -10,7 +10,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.NotFoundException import org.koitharu.kotatsu.parsers.model.* @@ -24,7 +24,7 @@ internal abstract class WpComicsParser( source: MangaParserSource, domain: String, pageSize: Int = 48, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zeistmanga/ZeistMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zeistmanga/ZeistMangaParser.kt index 6eebd3ae..cebe121b 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zeistmanga/ZeistMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zeistmanga/ZeistMangaParser.kt @@ -8,7 +8,7 @@ import org.jsoup.Jsoup import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.ErrorMessages import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -23,7 +23,7 @@ internal abstract class ZeistMangaParser( source: MangaParserSource, domain: String, pageSize: Int = 12, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zh/Baozimh.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zh/Baozimh.kt index ea2f8964..4f931d49 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zh/Baozimh.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zh/Baozimh.kt @@ -5,7 +5,7 @@ import org.json.JSONArray import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.exception.ParseException import org.koitharu.kotatsu.parsers.model.* @@ -16,7 +16,7 @@ import java.util.* @MangaSourceParser("BAOZIMH", "Baozimh", "zh") internal class Baozimh(context: MangaLoaderContext) : - PagedMangaParser(context, MangaParserSource.BAOZIMH, pageSize = 36) { + LegacyPagedMangaParser(context, MangaParserSource.BAOZIMH, pageSize = 36) { override val configKeyDomain = ConfigKey.Domain("www.baozimh.com") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/ZMangaParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/ZMangaParser.kt index 161fe7fb..2da43b90 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/ZMangaParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/zmanga/ZMangaParser.kt @@ -4,7 +4,7 @@ import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import org.jsoup.nodes.Document import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.koitharu.kotatsu.parsers.PagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.* @@ -17,7 +17,7 @@ internal abstract class ZMangaParser( source: MangaParserSource, domain: String, pageSize: Int = 16, -) : PagedMangaParser(context, source, pageSize) { +) : LegacyPagedMangaParser(context, source, pageSize) { override val configKeyDomain = ConfigKey.Domain(domain) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/FaviconParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/FaviconParser.kt index e41f9931..24296048 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/FaviconParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/FaviconParser.kt @@ -1,5 +1,7 @@ package org.koitharu.kotatsu.parsers.util +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.model.Favicon import org.koitharu.kotatsu.parsers.model.Favicons @@ -11,7 +13,7 @@ public class FaviconParser( private val domain: String, ) { - public suspend fun parseFavicons(): Favicons { + public suspend fun parseFavicons(): Favicons = withContext(Dispatchers.Default) { val url = "https://$domain" val doc = webClient.httpGet(url).parseHtml() val result = HashSet() @@ -31,7 +33,7 @@ public class FaviconParser( if (result.isEmpty()) { result.add(createFallback()) } - return Favicons(result, url) + Favicons(result, url) } private fun parseLink(link: Element): Favicon? { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/LinkResolver.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/LinkResolver.kt index bf6fc4ea..5dea9128 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/LinkResolver.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/LinkResolver.kt @@ -4,8 +4,8 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runInterruptible import okhttp3.HttpUrl import okhttp3.HttpUrl.Companion.toHttpUrlOrNull -import org.koitharu.kotatsu.parsers.AbstractMangaParser import org.koitharu.kotatsu.parsers.MangaLoaderContext +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.util.suspendlazy.suspendLazy @@ -14,12 +14,12 @@ public class LinkResolver internal constructor( public val link: HttpUrl, ) { - private val source = suspendLazy(initializer = ::resolveSource) + private val source = suspendLazy(Dispatchers.Default, ::resolveSource) public suspend fun getSource(): MangaParserSource? = source.get() public suspend fun getManga(): Manga? { - val parser = context.newParserInstance(source.get() ?: return null) as? AbstractMangaParser + val parser = context.newParserInstance(source.get() ?: return null) as? LegacyMangaParser ?: return null return parser.resolveLink(this, link) ?: resolveManga(parser) } @@ -27,7 +27,7 @@ public class LinkResolver internal constructor( private suspend fun resolveSource(): MangaParserSource? = runInterruptible(Dispatchers.Default) { val domains = setOfNotNull(link.host, link.topPrivateDomain()) for (s in MangaParserSource.entries) { - val parser = context.newParserInstance(s) as AbstractMangaParser + val parser = context.newParserInstance(s) as LegacyMangaParser for (d in parser.configKeyDomain.presetValues) { if (d in domains) { return@runInterruptible s @@ -38,7 +38,7 @@ public class LinkResolver internal constructor( } internal suspend fun resolveManga( - parser: AbstractMangaParser, + parser: LegacyMangaParser, url: String = link.toString().toRelativeUrl(link.host), id: Long = parser.generateUid(url), title: String = STUB_TITLE, @@ -63,7 +63,7 @@ public class LinkResolver internal constructor( ), ) - private suspend fun resolveBySeed(parser: AbstractMangaParser, s: Manga): Manga? { + private suspend fun resolveBySeed(parser: LegacyMangaParser, s: Manga): Manga? { val seed = parser.getDetails(s) if (!parser.filterCapabilities.isSearchSupported) { return seed.takeUnless { it.chapters.isNullOrEmpty() } diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/MangaParserEnv.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/MangaParserEnv.kt index c81dab01..8c22c7a0 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/MangaParserEnv.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/MangaParserEnv.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.util import okhttp3.HttpUrl import org.jsoup.nodes.Element -import org.koitharu.kotatsu.parsers.AbstractMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.ErrorMessages import org.koitharu.kotatsu.parsers.InternalParsersApi import org.koitharu.kotatsu.parsers.MangaParser @@ -82,17 +82,17 @@ private fun Set?.oneOrThrowIfMany(msg: String): T? = when { else -> throw IllegalArgumentException(msg) } -public val AbstractMangaParser.domain: String +public val LegacyMangaParser.domain: String get() = config[configKeyDomain] @InternalParsersApi -public fun AbstractMangaParser.getDomain(subdomain: String): String { +public fun LegacyMangaParser.getDomain(subdomain: String): String { val domain = domain return subdomain + "." + domain.removePrefix("www.") } @InternalParsersApi -public fun AbstractMangaParser.urlBuilder(subdomain: String? = null): HttpUrl.Builder { +public fun LegacyMangaParser.urlBuilder(subdomain: String? = null): HttpUrl.Builder { return HttpUrl.Builder() .scheme(SCHEME_HTTPS) .host(if (subdomain == null) domain else "$subdomain.$domain") diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/RelatedMangaFinder.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/RelatedMangaFinder.kt index 4b1edf32..03b76f9c 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/RelatedMangaFinder.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/RelatedMangaFinder.kt @@ -1,9 +1,6 @@ package org.koitharu.kotatsu.parsers.util -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.async -import kotlinx.coroutines.awaitAll -import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.* import org.koitharu.kotatsu.parsers.MangaParser import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.SortOrder @@ -15,14 +12,16 @@ public class RelatedMangaFinder( private val parsers: Collection, ) { - public suspend operator fun invoke(seed: Manga): List = coroutineScope { - parsers.singleOrNull()?.let { parser -> - findRelatedImpl(this, parser, seed) - } ?: parsers.map { parser -> - async { + public suspend operator fun invoke(seed: Manga): List = withContext(Dispatchers.Default) { + coroutineScope { + parsers.singleOrNull()?.let { parser -> findRelatedImpl(this, parser, seed) - } - }.awaitAll().flatten() + } ?: parsers.map { parser -> + async { + findRelatedImpl(this, parser, seed) + } + }.awaitAll().flatten() + } } private suspend fun findRelatedImpl(scope: CoroutineScope, parser: MangaParser, seed: Manga): List { @@ -36,7 +35,7 @@ public class RelatedMangaFinder( } val results = words.map { keyword -> scope.async { - val result = parser.queryManga( + val result = parser.getList( MangaSearchQuery.Builder() .order(SortOrder.RELEVANCE) .criterion(QueryCriteria.Match(SearchableField.TITLE_NAME, keyword)) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/SearchQueryConverter.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/SearchQueryConverter.kt index 5fe41fc6..af7e7970 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/util/SearchQueryConverter.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/util/SearchQueryConverter.kt @@ -1,6 +1,5 @@ package org.koitharu.kotatsu.parsers.util -import org.koitharu.kotatsu.parsers.InternalParsersApi import org.koitharu.kotatsu.parsers.model.MangaListFilter import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities import org.koitharu.kotatsu.parsers.model.SortOrder @@ -21,8 +20,7 @@ import org.koitharu.kotatsu.parsers.model.search.SearchableField.* * @param filter The [MangaListFilter] to convert. * @return A [MangaSearchQuery] constructed based on the given [filter]. */ -@InternalParsersApi -public fun convertToMangaSearchQuery(offset: Int, sortOrder: SortOrder, filter: MangaListFilter): MangaSearchQuery { +internal fun convertToMangaSearchQuery(offset: Int, sortOrder: SortOrder, filter: MangaListFilter): MangaSearchQuery { return MangaSearchQuery.Builder().apply { offset(offset) order(sortOrder) @@ -75,8 +73,7 @@ public fun convertToMangaSearchQuery(offset: Int, sortOrder: SortOrder, filter: * @return A {@link MangaListFilter} constructed based on the given {@code searchQuery}. * @throws UnsupportedOperationException If the search criteria contain unsupported fields. */ -@InternalParsersApi -public fun convertToMangaListFilter(searchQuery: MangaSearchQuery): MangaListFilter { +internal fun convertToMangaListFilter(searchQuery: MangaSearchQuery): MangaListFilter { return MangaListFilter.Builder().apply { for (criterion in searchQuery.criteria) { when (criterion) { @@ -89,6 +86,17 @@ public fun convertToMangaListFilter(searchQuery: MangaSearchQuery): MangaListFil }.build() } +internal fun MangaSearchQueryCapabilities.toMangaListFilterCapabilities() = MangaListFilterCapabilities( + isMultipleTagsSupported = capabilities.any { x -> x.field == TAG && x.multiValue }, + isTagsExclusionSupported = capabilities.any { x -> x.field == TAG && x.criteriaTypes.contains(Exclude::class) }, + isSearchSupported = capabilities.any { x -> x.field == TITLE_NAME }, + isSearchWithFiltersSupported = capabilities.any { x -> x.field == TITLE_NAME && x.otherCriteria }, + isYearSupported = capabilities.any { x -> x.field == PUBLICATION_YEAR && x.criteriaTypes.contains(Match::class) }, + isYearRangeSupported = capabilities.any { x -> x.field == PUBLICATION_YEAR && x.criteriaTypes.contains(Range::class) }, + isOriginalLocaleSupported = capabilities.any { x -> x.field == ORIGINAL_LANGUAGE }, + isAuthorSearchSupported = capabilities.any { x -> x.field == AUTHOR }, +) + internal fun MangaListFilterCapabilities.toMangaSearchQueryCapabilities(): MangaSearchQueryCapabilities = MangaSearchQueryCapabilities( capabilities = setOfNotNull( diff --git a/src/test/kotlin/org/koitharu/kotatsu/parsers/MangaParserTest.kt b/src/test/kotlin/org/koitharu/kotatsu/parsers/MangaParserTest.kt index 46c761a6..4e80719f 100644 --- a/src/test/kotlin/org/koitharu/kotatsu/parsers/MangaParserTest.kt +++ b/src/test/kotlin/org/koitharu/kotatsu/parsers/MangaParserTest.kt @@ -5,6 +5,8 @@ import okhttp3.HttpUrl import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Disabled import org.junit.jupiter.params.ParameterizedTest +import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser +import org.koitharu.kotatsu.parsers.core.LegacySinglePageMangaParser import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.model.search.MangaSearchQuery import org.koitharu.kotatsu.parsers.model.search.QueryCriteria @@ -25,7 +27,7 @@ internal class MangaParserTest { @MangaSources fun list(source: MangaParserSource) = runTest(timeout = timeout) { val parser = context.newParserInstance(source) - val list = parser.queryManga(MangaSearchQuery.Builder().build()) + val list = parser.getList(MangaSearchQuery.Builder().build()) checkMangaList(list, "list") assert(list.all { it.source == source }) } @@ -34,13 +36,13 @@ internal class MangaParserTest { @MangaSources fun pagination(source: MangaParserSource) = runTest(timeout = timeout) { val parser = context.newParserInstance(source) - if (parser is SinglePageMangaParser) { + if (parser is LegacySinglePageMangaParser) { return@runTest } - val page1 = parser.queryManga(MangaSearchQuery.EMPTY) + val page1 = parser.getList(MangaSearchQuery.EMPTY) val page2 = - parser.queryManga(MangaSearchQuery.Builder().offset(page1.size).build()) - if (parser is PagedMangaParser) { + parser.getList(MangaSearchQuery.Builder().offset(page1.size).build()) + if (parser is LegacyPagedMangaParser) { assert(parser.pageSize >= page1.size) { "Page size is ${page1.size} but ${parser.pageSize} expected" } @@ -58,13 +60,13 @@ internal class MangaParserTest { @MangaSources fun searchByTitleName(source: MangaParserSource) = runTest(timeout = timeout) { val parser = context.newParserInstance(source) - val subject = parser.queryManga(MangaSearchQuery.EMPTY).minByOrNull { + val subject = parser.getList(MangaSearchQuery.EMPTY).minByOrNull { it.title.length } ?: error("No manga found") val query = subject.title check(query.isNotBlank()) { "Manga title '$query' is blank" } - val list = parser.queryManga( + val list = parser.getList( MangaSearchQuery.Builder() .order(SortOrder.RELEVANCE) .criterion(QueryCriteria.Match(TITLE_NAME, query)) @@ -97,7 +99,7 @@ internal class MangaParserTest { assert(tags.all { it.source == source }) val tag = tags.last() - val list = parser.queryManga( + val list = parser.getList( MangaSearchQuery.Builder() .offset(0) .criterion(Include(TAG, setOf(tag))) @@ -114,7 +116,7 @@ internal class MangaParserTest { // if (!parser.filterCapabilities.isMultipleTagsSupported) return@runTest val tags = parser.getFilterOptions().availableTags.shuffled().take(2).toSet() - val list = parser.queryManga( + val list = parser.getList( MangaSearchQuery.Builder() .offset(0) .criterion(Include(TAG, tags)) @@ -134,7 +136,7 @@ internal class MangaParserTest { return@runTest } val locale = locales.random() - val list = parser.queryManga( + val list = parser.getList( MangaSearchQuery.Builder() .criterion(Include(LANGUAGE, setOf(locale))) .criterion(Include(LANGUAGE, setOf(locale))) @@ -150,7 +152,7 @@ internal class MangaParserTest { @MangaSources fun details(source: MangaParserSource) = runTest(timeout = timeout) { val parser = context.newParserInstance(source) - val list = parser.queryManga(MangaSearchQuery.EMPTY) + val list = parser.getList(MangaSearchQuery.EMPTY) val manga = list[0] parser.getDetails(manga).apply { @@ -181,7 +183,7 @@ internal class MangaParserTest { @MangaSources fun pages(source: MangaParserSource) = runTest(timeout = timeout) { val parser = context.newParserInstance(source) - val list = parser.queryManga(MangaSearchQuery.EMPTY) + val list = parser.getList(MangaSearchQuery.EMPTY) val manga = list.first() val chapter = parser.getDetails(manga).chapters?.firstOrNull() ?: error("Chapter is null at ${manga.publicUrl}") val pages = parser.getPages(chapter) @@ -236,7 +238,7 @@ internal class MangaParserTest { @MangaSources fun link(source: MangaParserSource) = runTest(timeout = timeout) { val parser = context.newParserInstance(source) - val manga = parser.queryManga(MangaSearchQuery.Builder().build()).first() + val manga = parser.getList(MangaSearchQuery.Builder().build()).first() val resolved = context.newLinkResolver(manga.publicUrl).getManga() Assertions.assertNotNull(resolved) resolved ?: return@runTest diff --git a/src/test/kotlin/org/koitharu/kotatsu/parsers/util/IntentFilterGenerator.kt b/src/test/kotlin/org/koitharu/kotatsu/parsers/util/IntentFilterGenerator.kt index a8ff362f..fd5b78df 100644 --- a/src/test/kotlin/org/koitharu/kotatsu/parsers/util/IntentFilterGenerator.kt +++ b/src/test/kotlin/org/koitharu/kotatsu/parsers/util/IntentFilterGenerator.kt @@ -1,7 +1,7 @@ package org.koitharu.kotatsu.parsers.util import org.junit.jupiter.api.Test -import org.koitharu.kotatsu.parsers.AbstractMangaParser +import org.koitharu.kotatsu.parsers.core.LegacyMangaParser import org.koitharu.kotatsu.parsers.MangaLoaderContextMock import org.koitharu.kotatsu.parsers.model.MangaParserSource import org.koitharu.kotatsu.parsers.newParser @@ -26,7 +26,7 @@ class IntentFilterGenerator { if (source == MangaParserSource.DUMMY) { continue } - val parser = source.newParser(MangaLoaderContextMock) as AbstractMangaParser + val parser = source.newParser(MangaLoaderContextMock) as LegacyMangaParser parser.configKeyDomain.presetValues.forEach { domain -> writer.appendTab().append("") }