fix(de/animetoast): Fixing & refactoring (#2352)

src/de/animetoast/build.gradle

@@ -6,13 +6,15 @@ ext {
     extName = 'AnimeToast'
     pkgNameSuffix = 'de.animetoast'
     extClass = '.AnimeToast'
-    extVersionCode = 8
+    extVersionCode = 9
     libVersion = '13'
 }
 
 dependencies {
     implementation(project(':lib-voe-extractor'))
     implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib-filemoon-extractor'))
+    implementation(project(':lib-mp4upload-extractor'))
 }
 
 apply from: "$rootDir/common.gradle"

src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt

@@ -12,6 +12,8 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
@@ -47,8 +49,7 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun popularAnimeFromElement(element: Element): SAnime {
         val anime = SAnime.create()
         anime.setUrlWithoutDomain(element.select("div.item-thumbnail a").attr("href"))
-        val document = client.newCall(GET(baseUrl + anime.url)).execute().asJsoup()
+        anime.thumbnail_url = element.select("div.item-thumbnail a img").attr("src")
-        anime.thumbnail_url = document.select(".item-content p img").attr("src")
         anime.title = element.select("div.item-thumbnail a").attr("title")
         return anime
     }
@@ -64,10 +65,18 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val episodeList = mutableListOf<SEpisode>()
         val file = document.select("a[rel=\"category tag\"]").text()
         if (file.contains("Serie")) {
-            val elements = document.select("#multi_link_tab0")
+            if (document.select("#multi_link_tab0").attr("id").isNotEmpty()) {
-            elements.forEach {
+                val elements = document.select("#multi_link_tab0")
-                val episode = parseEpisodesFromSeries(it)
+                elements.forEach {
-                episodeList.addAll(episode)
+                    val episode = parseEpisodesFromSeries(it)
+                    episodeList.addAll(episode)
+                }
+            } else {
+                val elements = document.select("#multi_link_tab1")
+                elements.forEach {
+                    val episode = parseEpisodesFromSeries(it)
+                    episodeList.addAll(episode)
+                }
             }
         } else {
             val episode = SEpisode.create()
@@ -81,12 +90,26 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     private fun parseEpisodesFromSeries(element: Element): List<SEpisode> {
         val episodeElements = element.select("div.tab-pane a")
-        return episodeElements.map { episodeFromElement(it) }
+        val epT = episodeElements.text()
+        if (epT.contains(":") || epT.contains("-")) {
+            val url = episodeElements.attr("href")
+            val document = client.newCall(GET(url)).execute().asJsoup()
+            val nUrl = document.select("#player-embed a").attr("href")
+            val nDoc = client.newCall(GET(nUrl)).execute().asJsoup()
+            val nEpEl = nDoc.select("div.tab-pane a")
+            return nEpEl.map { episodeFromElement(it) }
+        } else {
+            return episodeElements.map { episodeFromElement(it) }
+        }
     }
 
     override fun episodeFromElement(element: Element): SEpisode {
         val episode = SEpisode.create()
-        episode.episode_number = element.text().replace("Ep. ", "").toFloat()
+        episode.episode_number = try {
+            element.text().replace("Ep. ", "").toFloat()
+        } catch (e: Exception) {
+            100.0f
+        }
         episode.name = element.text()
         episode.setUrlWithoutDomain(element.attr("href"))
         return episode
@@ -101,34 +124,133 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     private fun videosFromElement(document: Document): List<Video> {
         val videoList = mutableListOf<Video>()
-        val epcu = document.select("div.tab-pane a.current-link").text().replace("Ep. ", "").toInt()
+        val hosterSelection = preferences.getStringSet("hoster_selection", setOf("voe", "dood", "fmoon", "mp4u"))
-        val ep = document.select("div.tab-pane a")
+        val fEp = document.select("div.tab-pane")
-        ep.forEach {
+        if (fEp.text().contains(":") || fEp.text().contains("-")) {
-            if (it.text().replace("Ep. ", "").toInt() == epcu) {
+            val tx = document.select("div.tab-pane")
-                val url = it.attr("href")
+            var here = false
-                val newdoc = client.newCall(GET(url)).execute().asJsoup()
+            tx.forEach {
-                val element = newdoc.select("#player-embed")
+                if ((it.text().contains(":") || it.text().contains("-")) && !here) {
-                val hosterSelection = preferences.getStringSet("hoster_selection", setOf("voe", "dood"))
+                    here = true
-                for (elements in element) {
+                    val sUrl = it.select("a").attr("href")
-                    val link = element.select("a").attr("abs:href")
+                    val doc = client.newCall(GET(sUrl)).execute().asJsoup()
-                    when {
+                    val nUrl = doc.select("#player-embed a").attr("href")
-                        link.contains("https://voe.sx") && hosterSelection?.contains("voe") == true -> {
+                    val nDoc = client.newCall(GET(nUrl)).execute().asJsoup()
-                            val quality = "Voe"
+                    val nEpEl = nDoc.select("div.tab-pane a")
-                            val video = VoeExtractor(client).videoFromUrl(link, quality)
+                    val nEpcu = try {
-                            if (video != null) {
+                        nDoc.select("div.tab-pane a.current-link").text()
-                                videoList.add(video)
+                            .substringAfter("Ep.").toFloat()
+                    } catch (e: Exception) {
+                        100.0f
+                    }
+                    nEpEl.forEach { tIt ->
+                        if (try { tIt.text().substringAfter("Ep.").toFloat() } catch (_: Exception) {} == nEpcu) {
+                            val url = tIt.attr("href")
+                            val newdoc = client.newCall(GET(url)).execute().asJsoup()
+                            val element = newdoc.select("#player-embed")
+                            for (elements in element) {
+                                val link = element.select("a").attr("abs:href")
+                                when {
+                                    link.contains("https://voe.sx") && hosterSelection?.contains(
+                                        "voe",
+                                    ) == true -> {
+                                        val quality = "Voe"
+                                        val video =
+                                            VoeExtractor(client).videoFromUrl(link, quality)
+                                        if (video != null) {
+                                            videoList.add(video)
+                                        }
+                                    }
+                                }
+                            }
+                            for (elements in element) {
+                                val link = element.select("iframe").attr("abs:src")
+                                when {
+                                    (link.contains("https://dood") || link.contains("https://ds2play")) && hosterSelection?.contains(
+                                        "dood",
+                                    ) == true -> {
+                                        val quality = "DoodStream"
+                                        val video =
+                                            DoodExtractor(client).videoFromUrl(
+                                                link,
+                                                quality,
+                                                false,
+                                            )
+                                        if (video != null) {
+                                            videoList.add(video)
+                                        }
+                                    }
+
+                                    link.contains("https://filemoon.sx") && hosterSelection?.contains(
+                                        "fmoon",
+                                    ) == true -> {
+                                        val videos =
+                                            FilemoonExtractor(client).videosFromUrl(link)
+                                        videoList.addAll(videos)
+                                    }
+
+                                    link.contains("mp4upload") && hosterSelection?.contains("mp4u") == true -> {
+                                        val videos =
+                                            Mp4uploadExtractor(client).videosFromUrl(
+                                                link,
+                                                headers,
+                                            )
+                                        videoList.addAll(videos)
+                                    }
+                                }
                             }
                         }
                     }
                 }
-                for (elements in element) {
+            }
-                    val link = element.select("iframe").attr("abs:src")
+        } else {
-                    when {
+            val epcu = try {
-                        link.contains("https://dood") && hosterSelection?.contains("dood") == true -> {
+                document.select("div.tab-pane a.current-link").text().substringAfter("Ep.")
-                            val quality = "DoodStream"
+                    .toFloat()
-                            val video = DoodExtractor(client).videoFromUrl(link, quality, false)
+            } catch (e: Exception) {
-                            if (video != null) {
+                100.0f
-                                videoList.add(video)
+            }
+            val ep = document.select("div.tab-pane a")
+            ep.forEach {
+                if (try { it.text().substringAfter("Ep.").toFloat() } catch (_: Exception) {} == epcu) {
+                    val url = it.attr("href")
+                    val newdoc = client.newCall(GET(url)).execute().asJsoup()
+                    val element = newdoc.select("#player-embed")
+                    for (elements in element) {
+                        val link = element.select("a").attr("abs:href")
+                        when {
+                            link.contains("https://voe.sx") && hosterSelection?.contains("voe") == true -> {
+                                val quality = "Voe"
+                                val video = VoeExtractor(client).videoFromUrl(link, quality)
+                                if (video != null) {
+                                    videoList.add(video)
+                                }
+                            }
+                        }
+                    }
+                    for (elements in element) {
+                        val link = element.select("iframe").attr("abs:src")
+                        when {
+                            (link.contains("https://dood") || link.contains("https://ds2play")) && hosterSelection?.contains(
+                                "dood",
+                            ) == true -> {
+                                val quality = "DoodStream"
+                                val video =
+                                    DoodExtractor(client).videoFromUrl(link, quality, false)
+                                if (video != null) {
+                                    videoList.add(video)
+                                }
+                            }
+
+                            link.contains("https://filemoon.sx") && hosterSelection?.contains("fmoon") == true -> {
+                                val videos = FilemoonExtractor(client).videosFromUrl(link)
+                                videoList.addAll(videos)
+                            }
+
+                            link.contains("mp4upload") && hosterSelection?.contains("mp4u") == true -> {
+                                val videos =
+                                    Mp4uploadExtractor(client).videosFromUrl(link, headers)
+                                videoList.addAll(videos)
                             }
                         }
                     }
@@ -167,8 +289,7 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun searchAnimeFromElement(element: Element): SAnime {
         val anime = SAnime.create()
         anime.setUrlWithoutDomain(element.attr("href"))
-        val document = client.newCall(GET(baseUrl + anime.url)).execute().asJsoup()
+        anime.thumbnail_url = element.select("a img").attr("src")
-        anime.thumbnail_url = document.select(".item-content p img").attr("src")
         anime.title = element.attr("title")
         return anime
     }
@@ -189,9 +310,8 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         anime.thumbnail_url = document.select(".item-content p img").attr("src")
         anime.title = document.select("h1.light-title.entry-title").text()
         anime.genre = document.select("a[rel=tag]").joinToString(", ") { it.text() }
-        val heigt = document.select("div.item-content p img").attr("height")
+        val height = document.select("div.item-content p img").attr("height")
-        anime.description = document.select("div.item-content").toString()
+        anime.description = document.select("div.item-content div + p").text()
-            .substringAfter("$heigt\">").replace("</p>", "").substringBefore("<strong>Genre:").replace("<p>", "")
         anime.status = parseStatus(document.select("a[rel=\"category tag\"]").text())
         return anime
     }
@@ -218,8 +338,8 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val hosterPref = ListPreference(screen.context).apply {
             key = "preferred_hoster"
             title = "Standard-Hoster"
-            entries = arrayOf("Voe", "DoodStream")
+            entries = arrayOf("Voe", "DoodStream", "Filemoon", "Mp4upload")
-            entryValues = arrayOf("https://voe.sx", "https://dood")
+            entryValues = arrayOf("https://voe.sx", "https://dood", "https://filemoon", "https://www.mp4upload")
             setDefaultValue("https://voe.sx")
             summary = "%s"
 
@@ -233,9 +353,9 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val subSelection = MultiSelectListPreference(screen.context).apply {
             key = "hoster_selection"
             title = "Hoster auswählen"
-            entries = arrayOf("Voe", "DoodStream")
+            entries = arrayOf("Voe", "DoodStream", "Filemoon", "Mp4upload")
-            entryValues = arrayOf("voe", "dood")
+            entryValues = arrayOf("voe", "dood", "fmoon", "mp4u")
-            setDefaultValue(setOf("voe", "dood"))
+            setDefaultValue(setOf("voe", "dood", "fmoon", "mp4u"))
 
             setOnPreferenceChangeListener { _, newValue ->
                 preferences.edit().putStringSet(key, newValue as Set<String>).commit()