diff --git a/multisrc/overrides/flixscans/flixscans/src/FlixScansNet.kt b/multisrc/overrides/flixscans/flixscans/src/FlixScansNet.kt index b148a2283..9fbdbdb85 100644 --- a/multisrc/overrides/flixscans/flixscans/src/FlixScansNet.kt +++ b/multisrc/overrides/flixscans/flixscans/src/FlixScansNet.kt @@ -2,4 +2,4 @@ package eu.kanade.tachiyomi.extension.en.flixscans import eu.kanade.tachiyomi.multisrc.flixscans.FlixScans -class FlixScansNet : FlixScans("Flix Scans", "https://flixscans.net", "en", cdnUrl = "https://media.flixscans.net/") +class FlixScansNet : FlixScans("Flix Scans", "https://flixscans.org", "en", cdnUrl = "https://media.flixscans.org/") diff --git a/multisrc/overrides/flixscans/galaxymanga/src/GalaxyManga.kt b/multisrc/overrides/flixscans/galaxymanga/src/GalaxyManga.kt index ce7fb9352..b121b0117 100644 --- a/multisrc/overrides/flixscans/galaxymanga/src/GalaxyManga.kt +++ b/multisrc/overrides/flixscans/galaxymanga/src/GalaxyManga.kt @@ -1,25 +1,13 @@ package eu.kanade.tachiyomi.extension.ar.galaxymanga -import eu.kanade.tachiyomi.multisrc.flixscans.Chapter import eu.kanade.tachiyomi.multisrc.flixscans.FlixScans import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.source.model.SChapter -import eu.kanade.tachiyomi.source.model.SManga import okhttp3.Request -import okhttp3.Response class GalaxyManga : FlixScans("جالاكسي مانجا", "https://flixscans.com", "ar") { override val versionId = 2 - override fun chapterListRequest(manga: SManga): Request { - val id = manga.url.split("-")[1] - - return GET("$apiUrl/webtoon/chapters/$id-desc", headers) - } - - override fun chapterListParse(response: Response): List { - val chapters = response.parseAs>() - - return chapters.map(Chapter::toSChapter) + override fun popularMangaRequest(page: Int): Request { + return GET("$apiUrl/webtoon/pages/home/action", headers) } } diff --git a/multisrc/overrides/flixscans/manganoon/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/flixscans/manganoon/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 57f68e783..000000000 Binary files a/multisrc/overrides/flixscans/manganoon/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/flixscans/manganoon/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/flixscans/manganoon/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 54fb85823..000000000 Binary files a/multisrc/overrides/flixscans/manganoon/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/flixscans/manganoon/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/flixscans/manganoon/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index b780a4629..000000000 Binary files a/multisrc/overrides/flixscans/manganoon/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/flixscans/manganoon/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/flixscans/manganoon/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 6b3f3691e..000000000 Binary files a/multisrc/overrides/flixscans/manganoon/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/flixscans/manganoon/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/flixscans/manganoon/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 574a70fad..000000000 Binary files a/multisrc/overrides/flixscans/manganoon/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/flixscans/manganoon/res/web_hi_res_512.png b/multisrc/overrides/flixscans/manganoon/res/web_hi_res_512.png deleted file mode 100644 index 16b34084a..000000000 Binary files a/multisrc/overrides/flixscans/manganoon/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScans.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScans.kt index 51b56371c..251e09461 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScans.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScans.kt @@ -3,9 +3,7 @@ package eu.kanade.tachiyomi.multisrc.flixscans import android.util.Log import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST -import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.network.interceptor.rateLimit -import eu.kanade.tachiyomi.network.interceptor.rateLimitHost import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.MangasPage @@ -42,11 +40,6 @@ abstract class FlixScans( .rateLimit(2) .build() - // only returns 15 chapters each request, so using higher rate limit - private val chapterClient = network.cloudflareClient.newBuilder() - .rateLimitHost(apiUrl.toHttpUrl(), 1, 2) - .build() - override fun headersBuilder() = super.headersBuilder() .add("Referer", baseUrl) @@ -240,49 +233,16 @@ abstract class FlixScans( return result.serie.toSManga(cdnUrl) } - override fun fetchChapterList(manga: SManga): Observable> { - return chapterClient.newCall(chapterListRequest(manga)) - .asObservableSuccess() - .map(::chapterListParse) - } - override fun chapterListRequest(manga: SManga): Request { val id = manga.url.split("-")[1] - return paginatedChapterListRequest(id) - } - - private fun paginatedChapterListRequest(seriesID: String, page: Int = 1): Request { - return GET("$apiUrl/webtoon/chapters/$seriesID-asc?page=$page", headers) + return GET("$apiUrl/webtoon/chapters/$id-desc", headers) } override fun chapterListParse(response: Response): List { - val result = response.parseAs>() + val chapters = response.parseAs>() - val id = response.request.url.toString() - .substringAfterLast("/") - .substringBefore("-") - - val chapters = result.data.toMutableList() - - var page = 1 - - while (page < result.meta.lastPage) { - page++ - - val newResponse = chapterClient.newCall(paginatedChapterListRequest(id, page)).execute() - - if (!newResponse.isSuccessful) { - newResponse.close() - continue - } - - val newResult = newResponse.parseAs>() - - chapters.addAll(newResult.data) - } - - return chapters.map(Chapter::toSChapter).reversed() + return chapters.map(Chapter::toSChapter) } override fun pageListRequest(chapter: SChapter): Request { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenerator.kt index 0d49ac962..3a9368cad 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenerator.kt @@ -9,12 +9,11 @@ class FlixScansGenerator : ThemeSourceGenerator { override val themeClass = "FlixScans" - override val baseVersionCode: Int = 2 + override val baseVersionCode: Int = 3 override val sources = listOf( - SingleLang("Flix Scans", "https://flixscans.net", "en", className = "FlixScansNet", pkgName = "flixscans"), + SingleLang("Flix Scans", "https://flixscans.org", "en", className = "FlixScansNet", pkgName = "flixscans"), SingleLang("جالاكسي مانجا", "https://flixscans.com", "ar", className = "GalaxyManga", overrideVersionCode = 26), - SingleLang("مانجا نون", "https://manjanoon.com", "ar", className = "MangaNoon"), ) companion object {