android/cloudstream
1
0
Fork 0
mirror of https://github.com/recloudstream/cloudstream.git synced 2025-08-06 11:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed YoutubeExtractor (#1496)

Browse Source
This commit is contained in:
Riccardo Giordano
2025-01-21 22:11:17 +01:00
committed by GitHub
parent cfc219c102
commit 1436c15113
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
View File

@ -4,12 +4,12 @@ import com.lagradost.cloudstream3.SubtitleFile
import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.mvvm.logError
import com.lagradost.cloudstream3.utils.ExtractorApi import com.lagradost.cloudstream3.utils.ExtractorApi
import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.Qualities
import com.lagradost.cloudstream3.utils.schemaStripRegex import com.lagradost.cloudstream3.utils.schemaStripRegex
import org.schabi.newpipe.extractor.ServiceList import org.schabi.newpipe.extractor.ServiceList
import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor
import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeStreamLinkHandlerFactory import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeStreamLinkHandlerFactory
import org.schabi.newpipe.extractor.stream.SubtitlesStream import org.schabi.newpipe.extractor.stream.SubtitlesStream
import org.schabi.newpipe.extractor.stream.VideoStream
class YoutubeShortLinkExtractor : YoutubeExtractor() { class YoutubeShortLinkExtractor : YoutubeExtractor() {
override val mainUrl = "https://youtu.be" override val mainUrl = "https://youtu.be"
@ -22,6 +22,7 @@ class YoutubeShortLinkExtractor : YoutubeExtractor() {
class YoutubeMobileExtractor : YoutubeExtractor() { class YoutubeMobileExtractor : YoutubeExtractor() {
override val mainUrl = "https://m.youtube.com" override val mainUrl = "https://m.youtube.com"
} }
class YoutubeNoCookieExtractor : YoutubeExtractor() { class YoutubeNoCookieExtractor : YoutubeExtractor() {
override val mainUrl = "https://www.youtube-nocookie.com" override val mainUrl = "https://www.youtube-nocookie.com"
} }
@ -32,7 +33,7 @@ open class YoutubeExtractor : ExtractorApi() {
override val name = "YouTube" override val name = "YouTube"
companion object { companion object {
private var ytVideos: MutableMap<String, List<VideoStream>> = mutableMapOf() private var ytVideos: MutableMap<String, String> = mutableMapOf()
private var ytVideosSubtitles: MutableMap<String, List<SubtitlesStream>> = mutableMapOf() private var ytVideosSubtitles: MutableMap<String, List<SubtitlesStream>> = mutableMapOf()
} }
@ -61,7 +62,8 @@ open class YoutubeExtractor : ExtractorApi() {
} }
s.fetchPage() s.fetchPage()
ytVideos[url] = s.videoStreams ytVideos[url] = s.hlsUrl
ytVideosSubtitles[url] = try { ytVideosSubtitles[url] = try {
s.subtitlesDefault.filterNotNull() s.subtitlesDefault.filterNotNull()
} catch (e: Exception) { } catch (e: Exception) {
@ -69,19 +71,24 @@ open class YoutubeExtractor : ExtractorApi() {
emptyList() emptyList()
} }
} }
ytVideos[url]?.mapNotNull { ytVideos[url]?.let {
if (it.isVideoOnly() || it.height <= 0) return@mapNotNull null callback(
ExtractorLink( ExtractorLink(
this.name, this.name,
this.name, this.name,
it.content ?: return@mapNotNull null, it,
"", "",
it.height Qualities.Unknown.value,
isM3u8 = true
) )
}?.forEach(callback) )
}
ytVideosSubtitles[url]?.mapNotNull { ytVideosSubtitles[url]?.mapNotNull {
SubtitleFile(it.languageTag ?: return@mapNotNull null, it.content ?: return@mapNotNull null) SubtitleFile(
it.languageTag ?: return@mapNotNull null,
it.content ?: return@mapNotNull null
)
}?.forEach(subtitleCallback) }?.forEach(subtitleCallback)
} }
} }