forked from recloudstream/cloudstream
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
c2479deabb
3 changed files with 13 additions and 11 deletions
2
.github/workflows/prerelease.yml
vendored
2
.github/workflows/prerelease.yml
vendored
|
@ -32,7 +32,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore
|
TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore
|
||||||
mkdir -p "${TMP_KEYSTORE_FILE_PATH}"
|
mkdir -p "${TMP_KEYSTORE_FILE_PATH}"
|
||||||
echo $ENCODED_STRING | base64 -di > "${TMP_KEYSTORE_FILE_PATH}"/prerelease_keystore.jks
|
echo $ENCODED_STRING | base64 -di > "${TMP_KEYSTORE_FILE_PATH}"/prerelease_keystore.keystore
|
||||||
- name: Run Gradle
|
- name: Run Gradle
|
||||||
run: ./gradlew app:assemblePrerelease
|
run: ./gradlew app:assemblePrerelease
|
||||||
env:
|
env:
|
||||||
|
|
|
@ -34,3 +34,5 @@ https://discord.gg/5Hus6fM
|
||||||
+ https://www.wcostream.com
|
+ https://www.wcostream.com
|
||||||
|
|
||||||
+ https://animepahe.com
|
+ https://animepahe.com
|
||||||
|
|
||||||
|
+ https://gogoanime.vc
|
||||||
|
|
|
@ -180,7 +180,7 @@ class TrailersToProvider : MainAPI() {
|
||||||
} else if (url.contains("/episode/")) {
|
} else if (url.contains("/episode/")) {
|
||||||
val response = khttp.get(url)
|
val response = khttp.get(url)
|
||||||
val document = Jsoup.parse(response.text)
|
val document = Jsoup.parse(response.text)
|
||||||
//val qSub = document.select("subtitle-content")
|
// val qSub = document.select("subtitle-content")
|
||||||
val subUrl = document.select("subtitle-content")?.attr("data-url") ?: ""
|
val subUrl = document.select("subtitle-content")?.attr("data-url") ?: ""
|
||||||
|
|
||||||
val subData = fixUrl(document.selectFirst("content").attr("data-url") ?: return false)
|
val subData = fixUrl(document.selectFirst("content").attr("data-url") ?: return false)
|
||||||
|
@ -222,22 +222,22 @@ class TrailersToProvider : MainAPI() {
|
||||||
|
|
||||||
val isTvShow = url.contains("/tvshow/")
|
val isTvShow = url.contains("/tvshow/")
|
||||||
if (isTvShow) {
|
if (isTvShow) {
|
||||||
val episodes = document.select("article.tour-modern") ?: return null
|
val episodes = document.select("#seasons-accordion .card-body > .tour-modern") ?: return null
|
||||||
val parsedEpisodes = episodes.map { item ->
|
val parsedEpisodes = episodes.map { item ->
|
||||||
val epPoster = item.selectFirst("> div.tour-modern-media > a.tour-modern-figure > img").attr("src")
|
val epPoster = item.selectFirst("img").attr("src")
|
||||||
val main = item.selectFirst("> div.tour-modern-main")
|
val main = item.selectFirst(".tour-modern-main")
|
||||||
val titleHeader = main.selectFirst("> h5.tour-modern-title > a")
|
val titleHeader = main.selectFirst("a")
|
||||||
val titleName = titleHeader.text()
|
val titleName = titleHeader.text()
|
||||||
val href = fixUrl(titleHeader.attr("href"))
|
val href = fixUrl(titleHeader.attr("href"))
|
||||||
val gValues = ".*?Season ([0-9]*).*Episode ([0-9]*): (.*)".toRegex().find(titleName)?.groupValues
|
val gValues = """.*?Season ([0-9]+)\s-\s(?:Episode )?([0-9]+)(?:: )?(.*)""".toRegex().find(titleName)?.groupValues
|
||||||
val season = gValues?.get(1)?.toIntOrNull()
|
val season = gValues?.get(1)?.toIntOrNull()
|
||||||
val episode = gValues?.get(2)?.toIntOrNull()
|
val episode = gValues?.get(2)?.toIntOrNull()
|
||||||
val epName = gValues?.get(3)
|
val epName = if (!gValues?.get(3).isNullOrEmpty()) gValues?.get(3) else "Episode ${gValues?.get(2)}"
|
||||||
val infoHeaders = main.select("> div > span.small-text")
|
val infoHeaders = main.select("span.small-text")
|
||||||
val date = infoHeaders?.get(0)?.text()
|
val date = infoHeaders?.get(0)?.text()
|
||||||
val ratingText = infoHeaders?.get(1)?.text()?.replace("/ 10", "")
|
val ratingText = infoHeaders?.get(1)?.text()?.replace("/ 10", "")
|
||||||
val epRating = if (ratingText == null) null else parseRating(ratingText)
|
val epRating = if (ratingText == null) null else parseRating(ratingText)
|
||||||
val epDescript = main.selectFirst("> p")?.text()
|
val epDescript = main.selectFirst("p")?.text()
|
||||||
|
|
||||||
TvSeriesEpisode(
|
TvSeriesEpisode(
|
||||||
epName,
|
epName,
|
||||||
|
@ -296,4 +296,4 @@ class TrailersToProvider : MainAPI() {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue