From 3d54b44b26f26b63a8652e2cd22c8dc450457248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Pe=C3=B1a=20Y=20Lillo?= <80992641+Diegopyl1209@users.noreply.github.com> Date: Mon, 29 Aug 2022 05:24:25 -0400 Subject: [PATCH] fixes [OnePace] [VostFree] (#813) * fixes [OnePace] * fix [VostFree] --- src/all/onepace/build.gradle | 2 +- .../animeextension/all/onepace/Onepace.kt | 15 ++++++++++----- src/fr/vostfree/build.gradle | 2 +- .../animeextension/fr/vostfree/Vostfree.kt | 4 ++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/all/onepace/build.gradle b/src/all/onepace/build.gradle index 6b3c54a0d..d1db0891a 100644 --- a/src/all/onepace/build.gradle +++ b/src/all/onepace/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Onepace' pkgNameSuffix = 'all.onepace' extClass = '.OnepaceFactory' - extVersionCode = 6 + extVersionCode = 7 libVersion = '13' containsNsfw = false } diff --git a/src/all/onepace/src/eu/kanade/tachiyomi/animeextension/all/onepace/Onepace.kt b/src/all/onepace/src/eu/kanade/tachiyomi/animeextension/all/onepace/Onepace.kt index 6a1b0289c..819ed762c 100644 --- a/src/all/onepace/src/eu/kanade/tachiyomi/animeextension/all/onepace/Onepace.kt +++ b/src/all/onepace/src/eu/kanade/tachiyomi/animeextension/all/onepace/Onepace.kt @@ -26,7 +26,7 @@ import org.jsoup.nodes.Element import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy -import java.lang.Exception +import kotlin.Exception open class Onepace(override val lang: String, override val name: String) : ConfigurableAnimeSource, ParsedAnimeHttpSource() { @@ -106,10 +106,15 @@ open class Onepace(override val lang: String, override val name: String) : Confi val jsoup = client.newCall(GET(realUrl)).execute().asJsoup() return jsoup.select("table.listingplikow tbody tr.filerow.even").map { val epName = it.select("td.cien a.name").text().replace(".mp4", "") - val epNum = epName.substringAfter("][").substringBefore("]") - .replace("-", ".") - .replace(",", ".") - .replace("F", ".").replace("B", "0").toFloat() + val epNum = try { + epName.substringAfter("][").substringBefore("]") + .replace("-", ".") + .replace(",", ".") + .replace("F", ".").replace("B", "0").toFloat() + } catch (e: Exception) { + // bruh + (Math.random() * 100).toFloat() + } val epUrl = it.select("td.cien a.name").attr("href") SEpisode.create().apply { name = epName diff --git a/src/fr/vostfree/build.gradle b/src/fr/vostfree/build.gradle index c050ac46b..c433ac991 100644 --- a/src/fr/vostfree/build.gradle +++ b/src/fr/vostfree/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Vostfree' pkgNameSuffix = 'fr.vostfree' extClass = '.Vostfree' - extVersionCode = 8 + extVersionCode = 9 libVersion = '13' } diff --git a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt index 44a2036b7..c4f5b033e 100644 --- a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt +++ b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt @@ -64,7 +64,7 @@ class Vostfree : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun episodeListParse(response: Response): List { val episodes = mutableListOf() val jsoup = response.asJsoup() - jsoup.select("select.new_player_selector option").forEach { it -> + jsoup.select("select.new_player_selector option").forEachIndexed { index, it -> val epNum = it.text().replace("Episode", "").drop(2) if (it.text() == "Film") { @@ -79,7 +79,7 @@ class Vostfree : ConfigurableAnimeSource, ParsedAnimeHttpSource() { episode_number = epNum.toFloat() name = "Épisode $epNum" } - episode.setUrlWithoutDomain("?episode:${epNum.toInt() - 1}/${response.request.url}") + episode.setUrlWithoutDomain("?episode:$index/${response.request.url}") episodes.add(episode) } }