add new source and remove another (#264)

* remove allmovies

* add new source

add asianembed

* some updates

src/en/allmovies/src/eu/kanade/tachiyomi/animeextension/en/allmovies/AllMovies.kt

@@ -1,240 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.allmovies
-
-import android.app.Application
-import android.content.SharedPreferences
-import androidx.preference.ListPreference
-import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
-import eu.kanade.tachiyomi.animesource.model.AnimeFilter
-import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
-import eu.kanade.tachiyomi.animesource.model.SAnime
-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.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import java.lang.Exception
-
-class AllMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
-
-    override val name = "AllMovies"
-
-    override val baseUrl = "https://allmoviesforyou.net"
-
-    override val lang = "en"
-
-    override val supportsLatest = false
-
-    override val client: OkHttpClient = network.cloudflareClient
-
-    private val preferences: SharedPreferences by lazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
-
-    // Popular Anime
-
-    override fun popularAnimeSelector(): String = "article.TPost > a"
-
-    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/movies/page/$page")
-
-    override fun popularAnimeFromElement(element: Element): SAnime {
-        val anime = SAnime.create()
-        anime.setUrlWithoutDomain(element.attr("href"))
-        anime.title = element.select("h2.Title").text()
-        anime.thumbnail_url = "https:" + element.select("div.Image figure img").attr("data-src")
-
-        return anime
-    }
-
-    override fun popularAnimeNextPageSelector(): String = "div.nav-links a:last-child"
-
-    // Episodes
-
-    override fun episodeListSelector() = "link[rel=canonical]"
-
-    override fun episodeFromElement(element: Element): SEpisode {
-        val episode = SEpisode.create()
-        episode.setUrlWithoutDomain("allmoviesforyou.net" + element.attr("href"))
-        episode.name = element.ownerDocument().select("div.TPMvCn h1.Title").text()
-        return episode
-    }
-
-    // Video urls
-
-    override fun videoListParse(response: Response): List<Video> {
-        val document = response.asJsoup()
-        val iframe1 = client.newCall(GET(document.select("iframe[data-src^=\"https://allmovies\"]").attr("data-src"))).execute().asJsoup()
-        val iframe = iframe1.select("iframe").attr("data-src") // [data-src^="https://stream"]
-        val referer = response.request.url.toString()
-        val refererHeaders = Headers.headersOf("referer", referer)
-        val iframeResponse = client.newCall(GET(iframe, refererHeaders))
-            .execute().asJsoup()
-        return videosFromElement(iframeResponse.selectFirst(videoListSelector()))
-    }
-
-    override fun videoListSelector() = "script:containsData(sources)"
-
-    private fun videosFromElement(element: Element): List<Video> {
-        val data = element.data().substringAfter("sources: [").substringBefore("],")
-        val sources = data.split("src: \"").drop(1)
-        val videoList = mutableListOf<Video>()
-        for (source in sources) {
-            val masterUrl = source.substringBefore("\"")
-            val masterPlaylist = client.newCall(GET(masterUrl)).execute().body!!.string()
-            val videoList = mutableListOf<Video>()
-            masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
-                val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
-                val videoUrl = it.substringAfter("\n").substringBefore("\n")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
-            }
-            return videoList
-        }
-        return videoList
-    }
-
-    override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.getString("preferred_quality", null)
-        if (quality != null) {
-            val newList = mutableListOf<Video>()
-            var preferred = 0
-            for (video in this) {
-                if (video.quality.contains(quality)) {
-                    newList.add(preferred, video)
-                    preferred++
-                } else {
-                    newList.add(video)
-                }
-            }
-            return newList
-        }
-        return this
-    }
-
-    override fun videoFromElement(element: Element) = throw Exception("not used")
-
-    override fun videoUrlParse(document: Document) = throw Exception("not used")
-
-    // search
-
-    override fun searchAnimeFromElement(element: Element): SAnime {
-        val anime = SAnime.create()
-        anime.setUrlWithoutDomain(element.select("article a").attr("href"))
-        anime.title = element.select("h2.Title").text()
-        anime.thumbnail_url = "https:" + element.select("div.Image figure img").attr("data-src")
-        return anime
-    }
-
-    override fun searchAnimeNextPageSelector(): String = "div.nav-links a:last-child"
-
-    override fun searchAnimeSelector(): String = "ul.MovieList li"
-
-    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        return if (query.isNotBlank()) {
-            GET("$baseUrl/page/$page?s=$query", headers)
-        } else {
-            val url = "$baseUrl/category/".toHttpUrlOrNull()!!.newBuilder()
-            filters.forEach { filter ->
-                when (filter) {
-
-                    is GenreFilter -> url.addPathSegment(filter.toUriPart())
-                }
-            }
-            url.addPathSegment("page")
-            url.addPathSegment("$page")
-            GET(url.toString(), headers)
-        }
-    }
-
-    // Details
-
-    override fun animeDetailsParse(document: Document): SAnime {
-        val anime = SAnime.create()
-        anime.title = document.select("h1.Title").text()
-        anime.genre = document.select("p.Genre a").joinToString(", ") { it.text() }
-        document.select("div.Info > span.Qlty").text().let {
-            if (it.contains("ON AIR")) anime.status = SAnime.ONGOING else anime.status = SAnime.COMPLETED
-        }
-        anime.description = document.select("div.Description p:first-child").text()
-        return anime
-    }
-
-    // Latest
-
-    override fun latestUpdatesNextPageSelector(): String? = throw Exception("Not used")
-
-    override fun latestUpdatesFromElement(element: Element): SAnime = throw Exception("Not used")
-
-    override fun latestUpdatesRequest(page: Int): Request = throw Exception("Not used")
-
-    override fun latestUpdatesSelector(): String = throw Exception("Not used")
-
-    // Filters
-
-    override fun getFilterList() = AnimeFilterList(
-        AnimeFilter.Header("NOTE: Ignored if using text search!"),
-        AnimeFilter.Separator(),
-        GenreFilter(getGenreList())
-    )
-
-    private class GenreFilter(vals: Array<Pair<String, String>>) : UriPartFilter("Movies Genres", vals)
-
-    private fun getGenreList() = arrayOf(
-        Pair("Action & Adventure", "action-adventure"),
-        Pair("Adventure", "aventure"),
-        Pair("Animation", "animation"),
-        Pair("Comedy", "comedy"),
-        Pair("Crime", "crime"),
-        Pair("Disney", "disney"),
-        Pair("Drama", "drama"),
-        Pair("Family", "family"),
-        Pair("Fantasy", "fantasy"),
-        Pair("History", "fistory"),
-        Pair("Horror", "horror"),
-        Pair("Kids", "kids"),
-        Pair("Music", "music"),
-        Pair("Mystery", "mystery"),
-        Pair("Reality", "reality"),
-        Pair("Romance", "romance"),
-        Pair("Sci-Fi & Fantasy", "sci-fi-fantasy"),
-        Pair("Science Fiction", "science-fiction"),
-        Pair("Thriller", "thriller"),
-        Pair("War", "war"),
-        Pair("War & Politics", "war-politics"),
-        Pair("Western", "western")
-    )
-
-    open class UriPartFilter(displayName: String, private val vals: Array<Pair<String, String>>) :
-        AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
-        fun toUriPart() = vals[state].second
-    }
-
-    // settings
-
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
-            title = "Preferred quality"
-            entries = arrayOf("1080p", "720p", "480p", "360p", "240p")
-            entryValues = arrayOf("1080", "720", "480", "360", "240")
-            setDefaultValue("1080")
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString(key, entry).commit()
-            }
-        }
-        screen.addPreference(videoQualityPref)
-    }
-}

src/en/asianload/build.gradle

@@ -2,10 +2,10 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 ext {
-    extName = 'AllMovies'
+    extName = 'AsianLoad'
-    pkgNameSuffix = 'en.allmovies'
+    pkgNameSuffix = 'en.asianload'
-    extClass = '.AllMovies'
+    extClass = '.AsianLoad'
-    extVersionCode = 2
+    extVersionCode = 1
     libVersion = '12'
 }
 

src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/AsianLoad.kt

@@ -0,0 +1,345 @@
+package eu.kanade.tachiyomi.animeextension.en.asianload
+
+import android.app.Application
+import android.content.SharedPreferences
+import android.net.Uri
+import android.util.Log
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+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.network.GET
+import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import java.lang.Exception
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class AsianLoad : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "AsianLoad"
+
+    override val baseUrl = "https://asianembed.io"
+
+    override val lang = "en"
+
+    override val supportsLatest = false
+
+    private val dateFormat: SimpleDateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US)
+
+    override val client: OkHttpClient = network.cloudflareClient
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    // Popular Anime
+
+    override fun popularAnimeSelector(): String = "ul.listing.items li a"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/popular?page=$page")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.attr("href"))
+        anime.thumbnail_url = element.select("div.img div.picture img").attr("src")
+        anime.title = element.select("div.img div.picture img").attr("alt")
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "li.next a"
+
+    // Episodes
+
+    override fun episodeListSelector() = "ul.listing.items.lists li a"
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        val episode = SEpisode.create()
+        episode.setUrlWithoutDomain(element.attr("href"))
+        episode.name = "Episode: " + element.attr("href").substringAfter("episode-")
+        episode.episode_number = element.attr("href").substringAfter("episode-").toFloat()
+        // episode.date_upload = element.select("div.meta span.date").text()
+        return episode
+    }
+
+    // Video urls
+
+    override fun videoListRequest(episode: SEpisode): Request {
+        val document = client.newCall(GET(baseUrl + episode.url)).execute().asJsoup()
+        val iframe = "https:" + document.select("iframe").attr("src")
+        return GET(iframe)
+    }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        return videosFromElement(document)
+    }
+
+    val srcVid = preferences.getString("preferred_server", "https://dood")
+
+    override fun videoListSelector() = "ul.list-server-items li[data-video*=$srcVid]"
+    // "ul.list-server-items li[data-video*=https://sbplay2.com], ul.list-server-items li[data-video*=https://dood], ul.list-server-items li[data-video*=https://streamtape], ul.list-server-items li[data-video*=https://fembed]"
+
+    private fun videosFromElement(document: Document): List<Video> {
+        val videoList = mutableListOf<Video>()
+        val elements = document.select(videoListSelector())
+        for (element in elements) {
+            val url = element.attr("data-video")
+            Log.i("lol", url)
+            val location = element.ownerDocument().location()
+            val videoHeaders = Headers.headersOf("Referer", location)
+            when {
+                url.contains("https://sbplay") -> {
+                    val videos = sbplayUrlParse(url.substringBefore("?caption"), location)
+                    videoList.addAll(videos)
+                }
+                url.contains("https://dood") -> {
+                    val newQuality = "Doodstream mirror"
+                    val video = Video(url, newQuality, doodUrlParse(url), null, videoHeaders)
+                    videoList.add(video)
+                }
+                url.contains("https://streamtape") -> {
+                    val newQuality = "StreamTape mirror"
+                    val video = Video(url, newQuality, streamTapeParse(url), null, videoHeaders)
+                    videoList.add(video)
+                }
+                url.contains("fembed") -> {
+                    val apiCall = client.newCall(POST(url.substringBefore("#").replace("/v/", "/api/source/"))).execute().body!!.string()
+                    Log.i("lol", "$apiCall")
+                    val data = apiCall.substringAfter("\"data\":[").substringBefore("],")
+                    val sources = data.split("\"file\":\"").drop(1)
+                    val videoList = mutableListOf<Video>()
+                    for (source in sources) {
+                        val src = source.substringAfter("\"file\":\"").substringBefore("\"").replace("\\/", "/")
+                        Log.i("lol", "$src")
+                        val quality = source.substringAfter("\"label\":\"").substringBefore("\"")
+                        val video = Video(url, quality, src, null)
+                        videoList.add(video)
+                    }
+                    return videoList
+                }
+            }
+        }
+        return videoList
+    }
+
+    override fun videoFromElement(element: Element) = throw Exception("not used")
+
+    override fun videoUrlParse(document: Document) = throw Exception("not used")
+
+    private fun sbplayUrlParse(url: String, referer: String): List<Video> {
+        val videoList = mutableListOf<Video>()
+        val refererHeader = Headers.headersOf("Referer", referer)
+        val id = Uri.parse(url).pathSegments[1]
+        val noRedirectClient = client.newBuilder().followRedirects(false).build()
+        val respDownloadLinkSelector = noRedirectClient.newCall(GET(url, refererHeader)).execute()
+        val documentDownloadSelector = respDownloadLinkSelector.asJsoup()
+        val downloadElements = documentDownloadSelector.select("div.contentbox table tbody tr td a")
+        for (downloadElement in downloadElements) {
+            val videoData = downloadElement.attr("onclick")
+            val quality = downloadElement.text()
+            val hash = videoData.splitToSequence(",").last().replace("\'", "").replace(")", "")
+            val mode =
+                videoData.splitToSequence(",").elementAt(1).replace("\'", "").replace(")", "")
+            val downloadLink =
+                "https://sbplay2.com/dl?op=download_orig&id=$id&mode=$mode&hash=$hash"
+            respDownloadLinkSelector.close()
+            val video = sbplayVideoParser(downloadLink, quality)
+            if (video != null) videoList.add(video)
+        }
+        return videoList
+    }
+
+    private fun sbplayVideoParser(url: String, quality: String): Video? {
+        return try {
+            val noRedirectClient = client.newBuilder().followRedirects(false).build()
+            val refererHeader = Headers.headersOf("Referer", url)
+            val respDownloadLink = noRedirectClient.newCall(GET(url, refererHeader)).execute()
+            val documentDownloadLink = respDownloadLink.asJsoup()
+            val downloadLink = documentDownloadLink.selectFirst("div.contentbox span a").attr("href")
+            respDownloadLink.close()
+            Video(url, quality, downloadLink, null, refererHeader)
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    private fun doodUrlParse(url: String): String? {
+        val response = client.newCall(GET(url.replace("/d/", "/e/"))).execute()
+        val content = response.body!!.string()
+        if (!content.contains("'/pass_md5/")) return null
+        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
+        val token = md5.substringAfterLast("/")
+        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
+        val randomString = getRandomString()
+        val expiry = System.currentTimeMillis()
+        val videoUrlStart = client.newCall(
+            GET(
+                "https://dood.$doodTld/pass_md5/$md5",
+                Headers.headersOf("referer", url)
+            )
+        ).execute().body!!.string()
+        Log.i("lol", "$videoUrlStart$randomString?token=$token&expiry=$expiry")
+        return "$videoUrlStart$randomString?token=$token&expiry=$expiry"
+    }
+
+    private fun getRandomString(length: Int = 10): String {
+        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
+        return (1..length)
+            .map { allowedChars.random() }
+            .joinToString("")
+    }
+
+    private fun streamTapeParse(url: String): String? {
+        val document = client.newCall(GET(url)).execute().asJsoup()
+        val script = document.select("script:containsData(document.getElementById('robotlink'))")
+            .firstOrNull()?.data()?.substringAfter("document.getElementById('robotlink').innerHTML = '")
+            ?: return null
+        val videoUrl = "https:" + script.substringBefore("'") +
+            script.substringAfter("+ ('xcd").substringBefore("'")
+        return "$videoUrl"
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString("preferred_quality", null)
+        if (quality != null) {
+            val newList = mutableListOf<Video>()
+            var preferred = 0
+            for (video in this) {
+                if (video.quality.contains(quality)) {
+                    newList.add(preferred, video)
+                    preferred++
+                } else {
+                    newList.add(video)
+                }
+            }
+            return newList
+        }
+        return this
+    }
+
+    // search
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.attr("href"))
+        anime.thumbnail_url = element.select("div.img div.picture img").attr("src")
+        anime.title = element.select("div.img div.picture img").attr("alt")
+        return anime
+    }
+
+    override fun searchAnimeNextPageSelector(): String = "li.next a"
+
+    override fun searchAnimeSelector(): String = "ul.listing.items li a"
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val url = if (query.isNotBlank()) {
+            "$baseUrl/search.html?keyword=$query&page=$page"
+        } else {
+            (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
+                when (filter) {
+                    is TypeList -> {
+                        if (filter.state > 0) {
+                            val GenreN = getTypeList()[filter.state].query
+                            val genreUrl = "$baseUrl/$GenreN?page=$page".toHttpUrlOrNull()!!.newBuilder()
+                            return GET(genreUrl.toString(), headers)
+                        }
+                    }
+                }
+            }
+            throw Exception("Choose Filter")
+        }
+        return GET(url, headers)
+    }
+
+    // Details
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        anime.title = document.select("div.video-details span.date").text()
+        anime.description = document.select("div.video-details div.post-entry").text()
+        return anime
+    }
+
+    // Latest
+
+    override fun latestUpdatesNextPageSelector(): String = throw Exception("Not used")
+
+    override fun latestUpdatesFromElement(element: Element): SAnime = throw Exception("Not used")
+
+    override fun latestUpdatesRequest(page: Int): Request = throw Exception("Not used")
+
+    override fun latestUpdatesSelector(): String = throw Exception("Not used")
+
+    // Filter
+
+    override fun getFilterList() = AnimeFilterList(
+        TypeList(typesName),
+    )
+
+    private class TypeList(types: Array<String>) : AnimeFilter.Select<String>("Drame Type", types)
+    private data class Type(val name: String, val query: String)
+    private val typesName = getTypeList().map {
+        it.name
+    }.toTypedArray()
+
+    private fun getTypeList() = listOf(
+        Type("Select", ""),
+        Type("Recently Added Sub", ""),
+        Type("Recently Added Raw", "recently-added-raw"),
+        Type("Drama Movie", "movies"),
+        Type("KShow", "kshow"),
+        Type("Ongoing Series", "ongoing-series")
+    )
+
+    // Preferences
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val serverPref = ListPreference(screen.context).apply {
+            key = "preferred_server"
+            title = "Preferred Server  (requires app restart)"
+            entries = arrayOf("Fembed", "StreamTape", "DooDStream", "StreamSB")
+            entryValues = arrayOf("https://fembed", "https://streamtape", "https://dood", "https://sbplay2.com")
+            setDefaultValue("https://dood")
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        val videoQualityPref = ListPreference(screen.context).apply {
+            key = "preferred_quality"
+            title = "Preferred quality"
+            entries = arrayOf("1080p", "720p", "480p", "360p")
+            entryValues = arrayOf("1080", "720", "480", "360")
+            setDefaultValue("1080")
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        screen.addPreference(serverPref)
+        screen.addPreference(videoQualityPref)
+    }
+}