From cac66f9807592d8412e7ccb5371deb7b029a8167 Mon Sep 17 00:00:00 2001 From: IndusAryan Date: Thu, 21 Dec 2023 17:36:59 +0530 Subject: [PATCH] upgrade newpipe extractor and fix geturl deprecation --- app/build.gradle.kts | 2 +- .../lagradost/cloudstream3/extractors/YoutubeExtractor.kt | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b1bc69d4..1ae76cad 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -199,7 +199,7 @@ dependencies { // PlayBack implementation("com.jaredrummler:colorpicker:1.1.0") // Subtitle Color Picker implementation("com.github.recloudstream:media-ffmpeg:1.1.0") // Custom FF-MPEG Lib for Audio Codecs - implementation("com.github.teamnewpipe:NewPipeExtractor:eac850") /* For Trailers + implementation("com.github.teamnewpipe:NewPipeExtractor:0.23.0") /* For Trailers ^ Update to Latest Commits if Trailers Misbehave, github.com/TeamNewPipe/NewPipeExtractor/commits/dev */ implementation("com.github.albfernandez:juniversalchardet:2.4.0") // Subtitle Decoding diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt index 23704e90..4e854630 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt @@ -70,19 +70,18 @@ open class YoutubeExtractor : ExtractorApi() { } } ytVideos[url]?.mapNotNull { - if (it.isVideoOnly || it.height <= 0) return@mapNotNull null + if (it.isVideoOnly() || it.height <= 0) return@mapNotNull null ExtractorLink( this.name, this.name, - it.url ?: return@mapNotNull null, + it.content ?: return@mapNotNull null, "", it.height ) }?.forEach(callback) ytVideosSubtitles[url]?.mapNotNull { - SubtitleFile(it.languageTag ?: return@mapNotNull null, it.url ?: return@mapNotNull null) + SubtitleFile(it.languageTag ?: return@mapNotNull null, it.content ?: return@mapNotNull null) }?.forEach(subtitleCallback) } - } \ No newline at end of file