From 1fa527454cc7082aa80c2ba3de3472f25cb9426a Mon Sep 17 00:00:00 2001
From: no-commit <>
Date: Sun, 19 Mar 2023 13:51:10 +0100
Subject: [PATCH] Fixed WatchCartoonOnline homepage

---
 WatchCartoonOnlineProvider/build.gradle.kts   |  2 +-
 .../lagradost/WatchCartoonOnlineProvider.kt   | 28 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/WatchCartoonOnlineProvider/build.gradle.kts b/WatchCartoonOnlineProvider/build.gradle.kts
index 0ec4c55..446bf2a 100644
--- a/WatchCartoonOnlineProvider/build.gradle.kts
+++ b/WatchCartoonOnlineProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 2
+version = 3
 
 
 cloudstream {
diff --git a/WatchCartoonOnlineProvider/src/main/kotlin/com/lagradost/WatchCartoonOnlineProvider.kt b/WatchCartoonOnlineProvider/src/main/kotlin/com/lagradost/WatchCartoonOnlineProvider.kt
index c9dd384..8dbc54e 100644
--- a/WatchCartoonOnlineProvider/src/main/kotlin/com/lagradost/WatchCartoonOnlineProvider.kt
+++ b/WatchCartoonOnlineProvider/src/main/kotlin/com/lagradost/WatchCartoonOnlineProvider.kt
@@ -22,7 +22,7 @@ class WatchCartoonOnlineProvider : MainAPI() {
         TvType.TvSeries
     )
 
-    override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse? {
+    override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
         val doc = app.get(mainUrl).document
         val rows = doc.select("div.recent-release").mapNotNull {
             val rowName = it.text()
@@ -121,8 +121,19 @@ class WatchCartoonOnlineProvider : MainAPI() {
 
     override suspend fun load(url: String): LoadResponse {
         val isSeries = url.contains("/anime/")
+        val episodeRegex = Regex("""-episode-\d+""")
         val document = app.get(url).document
 
+        // Retries link loading when an episode page is opened, usually from home.
+        // The slug system is too unpredictable to skip this step.
+        if (url.contains(episodeRegex)) {
+            val link = document.select("div.ildate > a").attr("href")
+            // Must not contain the episode regex, otherwise infinite recursion.
+            if (!link.contains(episodeRegex)) {
+                return load(link)
+            }
+        }
+
         return if (isSeries) {
             val title = document.selectFirst("td.vsbaslik > h2")!!.text()
             val poster =
@@ -148,7 +159,7 @@ class WatchCartoonOnlineProvider : MainAPI() {
                     return@map Episode(
                         href,
                         if (last.startsWith("English")) null else last,
-                        null,
+                        1,
                         match2.groupValues[1].toIntOrNull(),
                     )
                 }
@@ -202,15 +213,16 @@ class WatchCartoonOnlineProvider : MainAPI() {
         callback: (ExtractorLink) -> Unit
     ): Boolean {
         val document = app.get(data).document
-        val foundJS = document.select("div.iltext > script").html()
 
-        // Find the variable name, eg: var HAi = "";
-        val varRegex = Regex("""var (\S*)""")
+        val src = document.select("iframe#frameNewAnimeuploads0").attr("src").ifBlank { null } ?: mainWork {
+            val foundJS = document.select("div.iltext > script").html()
 
-        val varName = varRegex.find(foundJS)?.groupValues?.get(1)
-            ?: throw RuntimeException("Cannot find var name!")
+            // Find the variable name, eg: var HAi = "";
+            val varRegex = Regex("""var (\S*)""")
+
+            val varName = varRegex.find(foundJS)?.groupValues?.get(1)
+                ?: throw RuntimeException("Cannot find var name!")
 
-        val src = document.select("iframe#frameNewAnimeuploads0").attr("src") ?: mainWork {
             // Rhino needs to be on main
             val rhino = Context.enter()
             rhino.optimizationLevel = -1