INSANEMODE/aniyomi-extensions-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mycima: fix video selectors (#197)

Browse Source
This commit is contained in:
Ahmed gamal
2021-12-18 22:51:34 +02:00
committed by GitHub
parent 5d345bdc82
commit 2f328e979b
4 changed files with 26 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ar/mycima/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'MY CIMA' extName = 'MY CIMA'
pkgNameSuffix = 'ar.mycima' pkgNameSuffix = 'ar.mycima'
extClass = '.MyCima' extClass = '.MyCima'
extVersionCode = 7 extVersionCode = 8
libVersion = '12' libVersion = '12'
} }

40
src/ar/mycima/src/eu/kanade/tachiyomi/animeextension/ar/mycima/MyCima.kt
View File

@ -13,11 +13,6 @@ import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.util.asJsoup import eu.kanade.tachiyomi.util.asJsoup
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonArray
import kotlinx.serialization.json.jsonObject
import kotlinx.serialization.json.jsonPrimitive
import okhttp3.Headers.Companion.toHeaders import okhttp3.Headers.Companion.toHeaders
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
@ -26,7 +21,6 @@ import org.jsoup.nodes.Document
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy
import java.lang.Exception import java.lang.Exception
class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() { class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
@ -45,8 +39,6 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000) Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
} }
private val json: Json by injectLazy()
// Popular Anime // Popular Anime
override fun popularAnimeSelector(): String = "div.Grid--MycimaPosts div.GridItem div.Thumb--GridItem" override fun popularAnimeSelector(): String = "div.Grid--MycimaPosts div.GridItem div.Thumb--GridItem"
@ -87,13 +79,13 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
return episodes return episodes
} }
override fun episodeListSelector() = "div.Episodes--Seasons--Episodes a, div.List--Seasons--Episodes a.selected" override fun episodeListSelector() = "div.Episodes--Seasons--Episodes a" // , div.List--Seasons--Episodes a.selected"
override fun episodeFromElement(element: Element): SEpisode { override fun episodeFromElement(element: Element): SEpisode {
val episode = SEpisode.create() val episode = SEpisode.create()
episode.setUrlWithoutDomain(element.attr("abs:href")) episode.setUrlWithoutDomain(element.attr("abs:href"))
episode.episode_number = element.text().removePrefix("موسم ").removePrefix("الحلقة ").replace("مدبلج", "").replace(" -", "").toFloat() episode.episode_number = element.text().removePrefix("موسم ").removePrefix("الحلقة ").replace("مدبلج", "").replace(" -", "").toFloat()
episode.name = element.text() episode.name = element.ownerDocument().select("div.List--Seasons--Episodes a.selected").text() + " : " + element.text()
episode.date_upload = System.currentTimeMillis() episode.date_upload = System.currentTimeMillis()
return episode return episode
} }
@ -111,26 +103,20 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
return videosFromElement(iframeResponse.selectFirst(videoListSelector())) return videosFromElement(iframeResponse.selectFirst(videoListSelector()))
} }
override fun videoListSelector() = "body" override fun videoListSelector() = "script:containsData(source)"
private fun videosFromElement(element: Element): List<Video> { private fun videosFromElement(element: Element): List<Video> {
val data = element.data().substringAfter("sources: [").substringBefore("],")
val sources = data.split("format: '").drop(1)
val videoList = mutableListOf<Video>() val videoList = mutableListOf<Video>()
val script = element.select("script") for (source in sources) {
.firstOrNull { it.data().contains("player.qualityselector({") } val src = source.substringAfter("src: \"").substringBefore("\"")
if (script != null) { val quality = source.substringBefore("'") // .substringAfter("format: '")
val videosString = script.data().substringAfter("sources: [") val video = Video(src, quality, src, null)
.substringBefore("]").substringBeforeLast(",") videoList.add(video)
val videosArray = json.decodeFromString<JsonArray>("[$videosString]")
for (video in videosArray) {
val format = video.jsonObject["format"]!!.jsonPrimitive.content
val url = video.jsonObject["src"]!!.jsonPrimitive.content
if (format != "auto") {
videoList.add(Video(url, format, url, null))
}
}
return videoList
} }
val sourceTag = element.select("source").firstOrNull()!! return videoList
val sourceTag = element.ownerDocument().select("source").firstOrNull()!!
return listOf(Video(sourceTag.attr("src"), "Default", sourceTag.attr("src"), null)) return listOf(Video(sourceTag.attr("src"), "Default", sourceTag.attr("src"), null))
} }
@ -222,7 +208,7 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
return anime return anime
} }
override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/cima1/$page") override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/page/$page")
override fun latestUpdatesSelector(): String = "div.Grid--MycimaPosts div.GridItem div.Thumb--GridItem" override fun latestUpdatesSelector(): String = "div.Grid--MycimaPosts div.GridItem div.Thumb--GridItem"

2
src/ar/mycimamovie/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'MY CIMA MOVIES' extName = 'MY CIMA MOVIES'
pkgNameSuffix = 'ar.mycimamovie' pkgNameSuffix = 'ar.mycimamovie'
extClass = '.MyCimaMovie' extClass = '.MyCimaMovie'
extVersionCode = 7 extVersionCode = 8
libVersion = '12' libVersion = '12'
} }

36
src/ar/mycimamovie/src/eu/kanade/tachiyomi/animeextension/ar/mycimamovie/MyCimaMovie.kt
View File

@ -13,11 +13,6 @@ import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.util.asJsoup import eu.kanade.tachiyomi.util.asJsoup
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonArray
import kotlinx.serialization.json.jsonObject
import kotlinx.serialization.json.jsonPrimitive
import okhttp3.Headers.Companion.toHeaders import okhttp3.Headers.Companion.toHeaders
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
@ -26,7 +21,6 @@ import org.jsoup.nodes.Document
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy
import java.lang.Exception import java.lang.Exception
class MyCimaMovie : ConfigurableAnimeSource, ParsedAnimeHttpSource() { class MyCimaMovie : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
@ -45,8 +39,6 @@ class MyCimaMovie : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000) Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
} }
private val json: Json by injectLazy()
// Popular Anime // Popular Anime
override fun popularAnimeSelector(): String = "div.Grid--MycimaPosts div.GridItem div.Thumb--GridItem" override fun popularAnimeSelector(): String = "div.Grid--MycimaPosts div.GridItem div.Thumb--GridItem"
@ -74,7 +66,7 @@ class MyCimaMovie : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
override fun episodeFromElement(element: Element): SEpisode { override fun episodeFromElement(element: Element): SEpisode {
val episode = SEpisode.create() val episode = SEpisode.create()
episode.setUrlWithoutDomain(element.attr("abs:href")) episode.setUrlWithoutDomain(element.attr("abs:href"))
episode.name = "movie" episode.name = element.ownerDocument().select("div.Title--Content--Single-begin > h1").text() // "movie"
return episode return episode
} }
@ -91,26 +83,20 @@ class MyCimaMovie : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
return videosFromElement(iframeResponse.selectFirst(videoListSelector())) return videosFromElement(iframeResponse.selectFirst(videoListSelector()))
} }
override fun videoListSelector() = "body" override fun videoListSelector() = "script:containsData(source)"
private fun videosFromElement(element: Element): List<Video> { private fun videosFromElement(element: Element): List<Video> {
val data = element.data().substringAfter("sources: [").substringBefore("],")
val sources = data.split("format: '").drop(1)
val videoList = mutableListOf<Video>() val videoList = mutableListOf<Video>()
val script = element.select("script") for (source in sources) {
.firstOrNull { it.data().contains("player.qualityselector({") } val src = source.substringAfter("src: \"").substringBefore("\"")
if (script != null) { val quality = source.substringBefore("'") // .substringAfter("format: '")
val videosString = script.data().substringAfter("sources: [") val video = Video(src, quality, src, null)
.substringBefore("]").substringBeforeLast(",") videoList.add(video)
val videosArray = json.decodeFromString<JsonArray>("[$videosString]")
for (video in videosArray) {
val format = video.jsonObject["format"]!!.jsonPrimitive.content
val url = video.jsonObject["src"]!!.jsonPrimitive.content
if (format != "auto") {
videoList.add(Video(url, format, url, null))
}
}
return videoList
} }
val sourceTag = element.select("source").firstOrNull()!! return videoList
val sourceTag = element.ownerDocument().select("source").firstOrNull()!!
return listOf(Video(sourceTag.attr("src"), "Default", sourceTag.attr("src"), null)) return listOf(Video(sourceTag.attr("src"), "Default", sourceTag.attr("src"), null))
} }