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

fix crash when parsing null subtitles in yt-dlp

Browse source
This commit is contained in:
deniscerri 2025-09-22 20:11:55 +02:00
parent c7a0079737
commit 74e3544526
No known key found for this signature in database
GPG key ID: 95C43D517D830350
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/deniscerri/ytdl/ui/more/settings/MainSettingsFragment.kt
View file

@ -492,7 +492,7 @@ class MainSettingsFragment : PreferenceFragmentCompat() {
val builder = MaterialAlertDialogBuilder(requireContext()) val builder = MaterialAlertDialogBuilder(requireContext())
builder.setTitle(getString(R.string.restore)) builder.setTitle(getString(R.string.restore))
builder.setMessage("${getString(R.string.restore_complete)}\n$restoreDataMessage") builder.setMessage("${getString(R.string.restore_complete)}\n\n$restoreDataMessage")
builder.setCancelable(false) builder.setCancelable(false)
builder.setPositiveButton( builder.setPositiveButton(
getString(R.string.ok) getString(R.string.ok)

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

@ -261,7 +261,9 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co
val availableSubtitles = mutableListOf<String>() val availableSubtitles = mutableListOf<String>()
if (jsonObject.has("subtitles")) { if (jsonObject.has("subtitles")) {
availableSubtitles.addAll(jsonObject.getJSONObject("subtitles").keys().asSequence().toList()) runCatching {
availableSubtitles.addAll(jsonObject.getJSONObject("subtitles").keys().asSequence().toList())
}
} }
val res = ResultItem(0, val res = ResultItem(0,
@ -795,7 +797,8 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co
if (aria2) { if (aria2) {
request.addOption("--downloader", "libaria2c.so") request.addOption("--downloader", "libaria2c.so")
//request.addOption("--external-downloader-args", "aria2c:\"--summary-interval=1\"") //request.addOption("--external-downloader-args", "aria2c:\"--summary-interval=1\"")
request.addOption("--external-downloader-args", "aria2c:\"--check-certificate=false\"") request.addOption("--no-check-certificates")
//request.addOption("--external-downloader-args", "aria2c:\"--check-certificate=false\"")
} }
val concurrentFragments = sharedPreferences.getInt("concurrent_fragments", 1) val concurrentFragments = sharedPreferences.getInt("concurrent_fragments", 1)
@ -831,7 +834,7 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co
} }
} }
if (sharedPreferences.getBoolean("no_check_certificates", false)) { if (sharedPreferences.getBoolean("no_check_certificates", false) && !request.toString().contains("--no-check-certificates")) {
request.addOption("--no-check-certificates") request.addOption("--no-check-certificates")
} }

2
app/src/main/res/layout/search_suggestion_item.xml
View file

@ -27,7 +27,7 @@
android:ellipsize="end" android:ellipsize="end"
android:focusable="true" android:focusable="true"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="2"
android:paddingEnd="20dp" android:paddingEnd="20dp"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"