danvics/ytdlnis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rollback to low size ffmpeg

Browse source
This commit is contained in:
deniscerri 2025-11-19 19:31:19 +01:00
parent 4c2306206b
commit 04ee31b9ad
No known key found for this signature in database
GPG key ID: 95C43D517D830350
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/build.gradle
View file

@ -149,13 +149,13 @@ dependencies {
// implementation "com.github.yausername.youtubedl-android:aria2c:$youtubedlAndroidVer" // implementation "com.github.yausername.youtubedl-android:aria2c:$youtubedlAndroidVer"
implementation "io.github.deniscerri.youtubedl-android:library:0.19.0" implementation "io.github.junkfood02.youtubedl-android:library:0.18.1"
//implementation "io.github.junkfood02.youtubedl-android:ffmpeg:0.18.0" //implementation "io.github.junkfood02.youtubedl-android:ffmpeg:0.18.1"
implementation "io.github.deniscerri.youtubedl-android:aria2c:0.19.0" implementation "io.github.junkfood02.youtubedl-android:aria2c:0.18.1"
// implementation "io.github.junkfood02.youtubedl-android:library:0.17.4" // implementation "io.github.junkfood02.youtubedl-android:library:0.17.4"
implementation "io.github.deniscerri.youtubedl-android:ffmpeg:0.19.0" implementation "io.github.junkfood02.youtubedl-android:ffmpeg:0.17.2"
// implementation "io.github.junkfood02.youtubedl-android:aria2c:0.17.2" // implementation "io.github.junkfood02.youtubedl-android:aria2c:0.17.2"
implementation "androidx.appcompat:appcompat:$appCompatVer" implementation "androidx.appcompat:appcompat:$appCompatVer"

9
app/src/main/java/com/deniscerri/ytdl/database/repository/ResultRepository.kt
View file

@ -174,7 +174,14 @@ class ResultRepository(private val resultDao: ResultDao, private val commandTemp
val res = if (newpipeExtractorResult.isSuccess) { val res = if (newpipeExtractorResult.isSuccess) {
newpipeExtractorResult.getOrNull()!! newpipeExtractorResult.getOrNull()!!
}else{ }else{
ytdlpUtil.getFromYTDL("https://youtu.be/${inputQuery.getIDFromYoutubeURL()}", resultsGenerated = {}) val youtubeID = inputQuery.getIDFromYoutubeURL()
val url = if (youtubeID == null) {
inputQuery
} else {
"https://youtu.be/${youtubeID}"
}
ytdlpUtil.getFromYTDL( url, resultsGenerated = {})
} }
if (resetResults) { if (resetResults) {

4
app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt
View file

@ -768,7 +768,7 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co
}else{ }else{
isPlaylistItem = true isPlaylistItem = true
YoutubeDLRequest(downloadItem.playlistURL!!).apply { YoutubeDLRequest(downloadItem.playlistURL!!).apply {
if(downloadItem.playlistIndex == null || downloadItem.url.isYoutubeURL()){ if(downloadItem.playlistIndex == null || downloadItem.url.isYoutubeURL() && downloadItem.url.getIDFromYoutubeURL() != null){
request.addOption("--match-filter", "id~='${downloadItem.url.getIDFromYoutubeURL()}'") request.addOption("--match-filter", "id~='${downloadItem.url.getIDFromYoutubeURL()}'")
}else{ }else{
request.addOption("-I", "${downloadItem.playlistIndex!!}:${downloadItem.playlistIndex}") request.addOption("-I", "${downloadItem.playlistIndex!!}:${downloadItem.playlistIndex}")
@ -1384,7 +1384,7 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co
} }
if (downloadItem.videoPreferences.embedSubs) { if (downloadItem.videoPreferences.embedSubs) {
if (sharedPreferences.getBoolean("no_keep_subs", false) && !downloadItem.videoPreferences.writeSubs && !downloadItem.videoPreferences.writeAutoSubs) { if (sharedPreferences.getBoolean("no_keep_subs", false)) {
request.addOption("--compat-options", "no-keep-subs") request.addOption("--compat-options", "no-keep-subs")
} }