more fixed missing show in Gmovies & Baymovies

This commit is contained in:
hexated 2023-01-30 02:27:40 +07:00
parent 178247275d
commit 0a993d13ec
1 changed files with 9 additions and 4 deletions

View File

@ -1372,7 +1372,8 @@ object SoraExtractor : SoraStream() {
} }
val tags = val tags =
Regex("\\d{3,4}[Pp]\\.?(.*?)\\[").find(quality)?.groupValues?.getOrNull(1)?.replace(".", " ")?.trim() Regex("\\d{3,4}[Pp]\\.?(.*?)\\[").find(quality)?.groupValues?.getOrNull(1)
?.replace(".", " ")?.trim()
?: "" ?: ""
val qualities = val qualities =
Regex("(\\d{3,4})[Pp]").find(quality)?.groupValues?.getOrNull(1)?.toIntOrNull() Regex("(\\d{3,4})[Pp]").find(quality)?.groupValues?.getOrNull(1)?.toIntOrNull()
@ -1443,7 +1444,7 @@ object SoraExtractor : SoraStream() {
callback: (ExtractorLink) -> Unit callback: (ExtractorLink) -> Unit
) { ) {
val fixTitle = title.fixTitle() val fixTitle = title.fixTitle()
val url = if (season == null) { val url = if (season == null || season == 1) {
"$gMoviesAPI/$fixTitle-$year" "$gMoviesAPI/$fixTitle-$year"
} else { } else {
"$gMoviesAPI/$fixTitle-$year-season-$season" "$gMoviesAPI/$fixTitle-$year-season-$season"
@ -1457,7 +1458,8 @@ object SoraExtractor : SoraStream() {
} }
} else { } else {
doc.select("div.is-content-justification-center").find { doc.select("div.is-content-justification-center").find {
it.previousElementSibling()?.text()?.contains("episode $episode", true) == true it.previousElementSibling()?.text()
?.contains(Regex("(?i)episode\\s?$episode")) == true
}?.select("div.wp-block-button")?.map { }?.select("div.wp-block-button")?.map {
it.select("a").attr("href") to it.text() it.select("a").attr("href") to it.text()
} }
@ -2114,7 +2116,10 @@ object SoraExtractor : SoraStream() {
}) && media.name?.contains( }) && media.name?.contains(
"720p", "720p",
true true
) == false && (media.mimeType == "video/x-matroska" || media.mimeType == "video/mp4") && (media.name.contains( ) == false && (media.mimeType == "video/x-matroska" || media.mimeType == "video/mp4") && (media.name.replace(
"-",
"."
).contains(
dotSlug, dotSlug,
true true
) || media.name.contains(spaceSlug, true)) ) || media.name.contains(spaceSlug, true))