Skip to content

Commit 03f5dd7

Browse files
authored
Merge pull request TeamNewPipe#9499 from pratyaksh1610/branch-9466
Added Language suffix for subtitle downloads
2 parents ad605e2 + 2afbe58 commit 03f5dd7

2 files changed

Lines changed: 35 additions & 0 deletions

File tree

app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
import java.util.List;
7676
import java.util.Locale;
7777
import java.util.Objects;
78+
import java.util.Optional;
7879

7980
import icepick.Icepick;
8081
import icepick.State;
@@ -560,6 +561,39 @@ public void onItemSelected(final AdapterView<?> parent,
560561
selectedSubtitleIndex = position;
561562
break;
562563
}
564+
onItemSelectedSetFileName();
565+
}
566+
567+
private void onItemSelectedSetFileName() {
568+
final String fileName = FilenameUtils.createFilename(getContext(), currentInfo.getName());
569+
final String prevFileName = Optional.ofNullable(dialogBinding.fileName.getText())
570+
.map(Object::toString)
571+
.orElse("");
572+
573+
if (prevFileName.isEmpty()
574+
|| prevFileName.equals(fileName)
575+
|| prevFileName.startsWith(getString(R.string.caption_file_name, fileName, ""))) {
576+
// only update the file name field if it was not edited by the user
577+
578+
switch (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()) {
579+
case R.id.audio_button:
580+
case R.id.video_button:
581+
if (!prevFileName.equals(fileName)) {
582+
// since the user might have switched between audio and video, the correct
583+
// text might already be in place, so avoid resetting the cursor position
584+
dialogBinding.fileName.setText(fileName);
585+
}
586+
break;
587+
588+
case R.id.subtitle_button:
589+
final String setSubtitleLanguageCode = subtitleStreamsAdapter
590+
.getItem(selectedSubtitleIndex).getLanguageTag();
591+
// this will reset the cursor position, which is bad UX, but it can't be avoided
592+
dialogBinding.fileName.setText(getString(
593+
R.string.caption_file_name, fileName, setSubtitleLanguageCode));
594+
break;
595+
}
596+
}
563597
}
564598

565599
@Override

app/src/main/res/values/donottranslate.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@
2727
<string name="soundcloud">SoundCloud</string>
2828
<string name="preferred_open_action_share_menu_title">@string/app_name</string>
2929
<string name="leakcanary">LeakCanary</string>
30+
<string name="caption_file_name">%1$s-%2$s</string>
3031
</resources>

0 commit comments

Comments
 (0)