allanime fixes

app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt

@@ -430,6 +430,7 @@ interface SearchResponse {
 enum class ActorRole {
     Main,
     Supporting,
+    Background,
 }
 
 data class Actor(
@@ -509,15 +510,21 @@ interface LoadResponse {
     var actors: List<ActorData>?
 
     companion object {
-        fun LoadResponse.setActorNames(actors: List<String>?) {
+        @JvmName("addActorNames")
+        fun LoadResponse.addActors(actors: List<String>?) {
             this.actors = actors?.map { ActorData(Actor(it)) }
         }
 
-        fun LoadResponse.setActors(actors: List<Pair<Actor, String?>>?) {
+        @JvmName("addActors")
-            println("ACTORS: ${actors?.size}")
+        fun LoadResponse.addActors(actors: List<Pair<Actor, String?>>?) {
             this.actors = actors?.map { (actor, role) -> ActorData(actor, roleString = role) }
         }
 
+        @JvmName("addActorsRole")
+        fun LoadResponse.addActors(actors: List<Pair<Actor, ActorRole?>>?) {
+            this.actors = actors?.map { (actor, role) -> ActorData(actor, role = role) }
+        }
+
         fun LoadResponse.setDuration(input: String?) {
             val cleanInput = input?.trim()?.replace(" ","") ?: return
             Regex("([0-9]*)h.*?([0-9]*)m").find(cleanInput)?.groupValues?.let { values ->

app/src/main/java/com/lagradost/cloudstream3/animeproviders/AllAnimeProvider.kt

@@ -3,6 +3,8 @@ package com.lagradost.cloudstream3.animeproviders
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.LoadResponse.Companion.addActors
+import com.lagradost.cloudstream3.mvvm.safeApiCall
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 import com.lagradost.cloudstream3.utils.getQualityFromName
@@ -163,12 +165,34 @@ class AllAnimeProvider : MainAPI() {
             }) else null)
         }
 
+        val characters = soup.select("div.character > div.card-character-box")?.mapNotNull {
+            val img = it?.selectFirst("img")?.attr("src") ?: return@mapNotNull null
+            val name = it.selectFirst("div > a")?.ownText() ?: return@mapNotNull null
+            val role = when (it.selectFirst("div > .text-secondary")?.text()?.trim()) {
+                "Main" -> ActorRole.Main
+                "Supporting" -> ActorRole.Supporting
+                "Background" -> ActorRole.Background
+                else -> null
+            }
+            Pair(Actor(name, img), role)
+        }
+
+        val recommendations = soup.select("#suggesction > div > div.p > .swipercard")?.mapNotNull {
+            val recTitle = it?.selectFirst(".showname > a") ?: return@mapNotNull null
+            val recName = recTitle.text() ?: return@mapNotNull null
+            val href = fixUrlNull(recTitle.attr("href")) ?: return@mapNotNull null
+            val img = it.selectFirst(".image > img").attr("src") ?: return@mapNotNull null
+            AnimeSearchResponse(recName, href, this.name, TvType.Anime, img)
+        }
+
         return newAnimeLoadResponse(title, url, TvType.Anime) {
             posterUrl = poster
             year = showData.airedStart?.year
 
             addEpisodes(DubStatus.Subbed, episodes.first)
             addEpisodes(DubStatus.Dubbed, episodes.second)
+            addActors(characters)
+            this.recommendations = recommendations
 
             showStatus = getStatus(showData.status.toString())
 
@@ -259,58 +283,60 @@ class AllAnimeProvider : MainAPI() {
         val sources = Regex("""sourceUrl[:=]"(.+?)"""").findAll(html).toList()
             .map { URLDecoder.decode(it.destructured.component1().sanitize(), "UTF-8") }
         sources.apmap {
-            var link = it
+            safeApiCall {
-            if (URI(link).isAbsolute || link.startsWith("//")) {
+                var link = it.replace(" ", "%20")
-                if (link.startsWith("//")) link = "https:$it"
+                if (URI(link).isAbsolute || link.startsWith("//")) {
+                    if (link.startsWith("//")) link = "https:$it"
 
-                if (Regex("""streaming\.php\?""").matches(link)) {
+                    if (Regex("""streaming\.php\?""").matches(link)) {
-                    // for now ignore
+                        // for now ignore
-                } else if (!embedIsBlacklisted(link)) {
+                    } else if (!embedIsBlacklisted(link)) {
-                    if (URI(link).path.contains(".m3u")) {
+                        if (URI(link).path.contains(".m3u")) {
-                        getM3u8Qualities(link, data, URI(link).host).forEach(callback)
+                            getM3u8Qualities(link, data, URI(link).host).forEach(callback)
-                    } else {
-                        callback(
-                            ExtractorLink(
-                                "AllAnime - " + URI(link).host,
-                                "",
-                                link,
-                                data,
-                                getQualityFromName("1080"),
-                                false
-                            )
-                        )
-                    }
-                }
-            } else {
-                link = apiEndPoint + URI(link).path + ".json?" + URI(link).query
-                val response = app.get(link)
-
-                if (response.code < 400) {
-                    val links = mapper.readValue<AllAnimeVideoApiResponse>(response.text).links
-                    links.forEach { server ->
-                        if (server.hls != null && server.hls) {
-                            getM3u8Qualities(
-                                server.link,
-                                "$apiEndPoint/player?uri=" + (if (URI(server.link).host.isNotEmpty()) server.link else apiEndPoint + URI(
-                                    server.link
-                                ).path),
-                                server.resolutionStr
-                            ).forEach(callback)
                         } else {
                             callback(
                                 ExtractorLink(
-                                    "AllAnime - " + URI(server.link).host,
+                                    "AllAnime - " + URI(link).host,
-                                    server.resolutionStr,
+                                    "",
-                                    server.link,
+                                    link,
-                                    "$apiEndPoint/player?uri=" + (if (URI(server.link).host.isNotEmpty()) server.link else apiEndPoint + URI(
+                                    data,
-                                        server.link
-                                    ).path),
                                     getQualityFromName("1080"),
                                     false
                                 )
                             )
                         }
                     }
+                } else {
+                    link = apiEndPoint + URI(link).path + ".json?" + URI(link).query
+                    val response = app.get(link)
+
+                    if (response.code < 400) {
+                        val links = mapper.readValue<AllAnimeVideoApiResponse>(response.text).links
+                        links.forEach { server ->
+                            if (server.hls != null && server.hls) {
+                                getM3u8Qualities(
+                                    server.link,
+                                    "$apiEndPoint/player?uri=" + (if (URI(server.link).host.isNotEmpty()) server.link else apiEndPoint + URI(
+                                        server.link
+                                    ).path),
+                                    server.resolutionStr
+                                ).forEach(callback)
+                            } else {
+                                callback(
+                                    ExtractorLink(
+                                        "AllAnime - " + URI(server.link).host,
+                                        server.resolutionStr,
+                                        server.link,
+                                        "$apiEndPoint/player?uri=" + (if (URI(server.link).host.isNotEmpty()) server.link else apiEndPoint + URI(
+                                            server.link
+                                        ).path),
+                                        getQualityFromName("1080"),
+                                        false
+                                    )
+                                )
+                            }
+                        }
+                    }
                 }
             }
         }

app/src/main/java/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt

@@ -2,7 +2,7 @@ package com.lagradost.cloudstream3.metaproviders
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.LoadResponse.Companion.setActors
+import com.lagradost.cloudstream3.LoadResponse.Companion.addActors
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.uwetrottmann.tmdb2.Tmdb
 import com.uwetrottmann.tmdb2.entities.*
@@ -142,7 +142,7 @@ open class TmdbProvider : MainAPI() {
 
             recommendations = (this@toLoadResponse.recommendations
                 ?: this@toLoadResponse.similar)?.results?.map { it.toSearchResponse() }
-            setActors(credits?.cast?.toList().toActors())
+            addActors(credits?.cast?.toList().toActors())
         }
     }
 
@@ -170,7 +170,7 @@ open class TmdbProvider : MainAPI() {
 
             recommendations = (this@toLoadResponse.recommendations
                 ?: this@toLoadResponse.similar)?.results?.map { it.toSearchResponse() }
-            setActors(credits?.cast?.toList().toActors())
+            addActors(credits?.cast?.toList().toActors())
         }
     }
 
@@ -268,7 +268,7 @@ open class TmdbProvider : MainAPI() {
 
                     if (response.actors.isNullOrEmpty())
                         tmdb.tvService().credits(id, "en-US").awaitResponse().body()?.let {
-                            response.setActors(it.cast?.toActors())
+                            response.addActors(it.cast?.toActors())
                         }
                 }
 
@@ -287,7 +287,7 @@ open class TmdbProvider : MainAPI() {
 
                     if (response.actors.isNullOrEmpty())
                         tmdb.moviesService().credits(id).awaitResponse().body()?.let {
-                            response.setActors(it.cast?.toActors())
+                            response.addActors(it.cast?.toActors())
                         }
                 }
                 response

app/src/main/java/com/lagradost/cloudstream3/movieproviders/SflixProvider.kt

@@ -2,7 +2,7 @@ package com.lagradost.cloudstream3.movieproviders
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.LoadResponse.Companion.setActorNames
+import com.lagradost.cloudstream3.LoadResponse.Companion.addActors
 import com.lagradost.cloudstream3.LoadResponse.Companion.setDuration
 import com.lagradost.cloudstream3.network.WebViewResolver
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
@@ -182,7 +182,7 @@ class SflixProvider(providerUrl: String, providerName: String) : MainAPI() {
                 this.posterUrl = posterUrl
                 this.plot = plot
                 setDuration(duration)
-                setActorNames(cast)
+                addActors(cast)
                 this.tags = tags
                 this.recommendations = recommendations
             }
@@ -229,7 +229,7 @@ class SflixProvider(providerUrl: String, providerName: String) : MainAPI() {
                 this.year = year
                 this.plot = plot
                 setDuration(duration)
-                setActorNames(cast)
+                addActors(cast)
                 this.tags = tags
                 this.recommendations = recommendations
             }

app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt

@@ -204,7 +204,7 @@ abstract class AbstractPlayerFragment(
                 val msg = exception.message ?: ""
                 val errorName = exception.errorCodeName
                 when (val code = exception.errorCode) {
-                    PlaybackException.ERROR_CODE_IO_FILE_NOT_FOUND, PlaybackException.ERROR_CODE_IO_NO_PERMISSION, PlaybackException.ERROR_CODE_IO_UNSPECIFIED -> {
+                    PlaybackException.ERROR_CODE_IO_FILE_NOT_FOUND, PlaybackException.ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED, PlaybackException.ERROR_CODE_IO_NO_PERMISSION, PlaybackException.ERROR_CODE_IO_UNSPECIFIED -> {
                         showToast(
                             activity,
                             "${ctx.getString(R.string.source_error)}\n$errorName ($code)\n$msg",

app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt

@@ -71,6 +71,9 @@ class ActorAdaptor(
                         ActorRole.Supporting -> {
                             R.string.actor_supporting
                         }
+                        ActorRole.Background -> {
+                            R.string.actor_background
+                        }
                     }
                 )?.let { text ->
                     actorExtra.isVisible = true

app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt

@@ -1080,11 +1080,13 @@ class ResultFragment : Fragment(), PanelsChildGestureRegionObserver.GestureRegio
             DataStoreHelper.getLastWatched(currentId)?.let { resume ->
                 if (currentIsMovie == false && episodeList.size >= 3) {
                     isSeriesVisible = true
+
                     result_resume_series_button?.setOnClickListener {
                         episodeList.firstOrNull { it.id == resume.episodeId }?.let {
                             handleAction(EpisodeClickEvent(ACTION_PLAY_EPISODE_IN_PLAYER, it))
                         }
                     }
+
                     result_resume_series_title?.text =
                         if (resume.season == null)
                             "${getString(R.string.episode)} ${resume.episode}"
@@ -1098,6 +1100,8 @@ class ResultFragment : Fragment(), PanelsChildGestureRegionObserver.GestureRegio
                         }
                         result_resume_series_progress_text?.text =
                             getString(R.string.resume_time_left).format((viewPos.duration - viewPos.position) / (60_000))
+                    } ?: run {
+                        isSeriesVisible = false
                     }
                 }
             }

app/src/main/res/values/strings.xml

@@ -387,5 +387,7 @@
     <string name="downloaded_file">Downloaded file</string>
     <string name="actor_main">Main</string>
     <string name="actor_supporting">Supporting</string>
+    <string name="actor_background">Background</string>
+
     <string name="home_source">Source</string>
 </resources>