From c69715f0eaec9dda3419b3d135340e250c88c20d Mon Sep 17 00:00:00 2001 From: deniscerri <64997243+deniscerri@users.noreply.github.com> Date: Sat, 10 May 2025 15:32:36 +0200 Subject: [PATCH] bump newpipe extractor && label stylizations --- app/build.gradle | 2 +- .../deniscerri/ytdl/util/extractors/YTDLPUtil.kt | 9 ++++++++- app/src/main/res/values-sq-rAL/strings.xml | 2 +- app/src/main/res/values/arrays.xml | 2 +- app/src/main/res/values/strings.xml | 16 ++++++++-------- app/src/main/res/xml/downloading_preferences.xml | 2 +- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c90da14d..0ffa78fe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -215,5 +215,5 @@ dependencies { implementation 'androidx.compose.material3:material3-android:1.3.1' implementation "io.noties.markwon:core:4.6.2" implementation("org.greenrobot:eventbus:3.3.1") - implementation("com.github.teamnewpipe:newpipeextractor:0.24.5") + implementation("com.github.teamnewpipe:newpipeextractor:0.24.6") } diff --git a/app/src/main/java/com/deniscerri/ytdl/util/extractors/YTDLPUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/extractors/YTDLPUtil.kt index 21ca526b..83b8f70e 100644 --- a/app/src/main/java/com/deniscerri/ytdl/util/extractors/YTDLPUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdl/util/extractors/YTDLPUtil.kt @@ -999,6 +999,10 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co formatSorting.add(0, "abr:${abrSort}") } + if (downloadItem.downloadSections.isNotBlank()) { + formatSorting.add(0, "proto:https") + } + if(formatSorting.isNotEmpty()) { request.addOption("-S", formatSorting.joinToString(",")) } @@ -1015,7 +1019,6 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co request.addOption("--split-chapters") request.addOption("-o", "chapter:%(section_title)s.%(ext)s") }else{ - if (embedMetadata){ metadataCommands.addOption("--embed-metadata") @@ -1296,6 +1299,10 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co // formatSorting.add("lang:${preferredLanguage}") // } + if (downloadItem.downloadSections.isNotBlank()) { + formatSorting.add(0, "proto:https") + } + if (formatSorting.isNotEmpty()) { request.addOption("-S", formatSorting.joinToString(",")) } diff --git a/app/src/main/res/values-sq-rAL/strings.xml b/app/src/main/res/values-sq-rAL/strings.xml index ffe45117..adeec322 100644 --- a/app/src/main/res/values-sq-rAL/strings.xml +++ b/app/src/main/res/values-sq-rAL/strings.xml @@ -44,7 +44,7 @@ Po shkarkohet Limito Shpejtësinë Shpejtësia maksimale e shkarkimit (në byte për sekond), p.sh 50K ose 4.2M - Përdor Aria2c si shkarkues në vend të atij normal + Përdor aria2c si shkarkues në vend të atij normal Proçesimi Modelet e Komandave Terminali diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 727e7ee9..f1d30b74 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -1146,7 +1146,7 @@ @string/disabled NewPipe - Youtube API + YouTube API @string/ytdlp_watch_later @string/ytdlp_recommnedations @string/ytdlp_liked diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 70422c3e..428b024b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -68,8 +68,8 @@ URL Link copied to clipboard Use API Key - Video Recommendations from Youtube API - Announce new versions of the app when it is opened. The data is extracted from the official Github Repository + Video Recommendations from YouTube API + Announce new versions of the app when it is opened. The data is extracted from the official GitHub Repository Downloads Remove Deleted Remove Duplicates @@ -260,7 +260,7 @@ Appearance Backup And Restore Use the specified HTTP/HTTPS/SOCKS proxy - Socks5 Proxy URL + SOCKS5 Proxy URL Search Suggestions Get search suggestions from Google Select the format with this ID in the download card @@ -309,7 +309,7 @@ Preferred Video Codec Preferred Audio Codec Loading - Sponsorblock API URL + SponsorBlock API URL Remember Download Type Select the last opened download type for the current item User-Agent header @@ -442,10 +442,10 @@ Enable command templates to be used for data fetching as extra commands Disable Write Info Json (Not Recommended) Every time you restart / resume the download, yt-dlp will re-download json data from the servers. - YT-DLP Youtube Watch Later (needs cookies) - YT-DLP Youtube Recommendations (needs cookies) - YT-DLP Youtube Liked Videos (needs cookies) - YT-DLP Youtube Watch History (needs cookies) + yt-dlp YouTube Watch Later (needs cookies) + yt-dlp YouTube Recommendations (needs cookies) + yt-dlp YouTube Liked Videos (needs cookies) + yt-dlp YouTube Watch History (needs cookies) Suppress HTTPS certificate validation Live Stream Live From Start diff --git a/app/src/main/res/xml/downloading_preferences.xml b/app/src/main/res/xml/downloading_preferences.xml index b2d89c46..eb965616 100644 --- a/app/src/main/res/xml/downloading_preferences.xml +++ b/app/src/main/res/xml/downloading_preferences.xml @@ -148,7 +148,7 @@ android:key="aria2" app:summary="@string/aria2_summary" android:disableDependentsState="true" - app:title="Aria2" /> + app:title="aria2c" />