Skip to content

Add settings for default download media type. #3901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vmazoyer wants to merge 2 commits into from
Closed

Add settings for default download media type. #3901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a17d0c
Add new setting for default download media type.
vmazoyer Jul 18, 2020
fa3bad3
Add "remember last used" option for default download media type.
vmazoyer Jul 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,27 @@ protected void setupDownloadOptions() {
videoButton.setVisibility(isVideoStreamsAvailable ? View.VISIBLE : View.GONE);
subtitleButton.setVisibility(isSubtitleStreamsAvailable ? View.VISIBLE : View.GONE);

if (isVideoStreamsAvailable) {
prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
String defaultMedia = prefs.getString(getString(R.string.default_download_type),
getString(R.string.default_download_type_default));

if (defaultMedia.equals(getString(R.string.select_last_used_download_type))) {
defaultMedia = prefs.getString(getString(R.string.last_used_download_type),
getString(R.string.default_download_type_default));
}

assert defaultMedia != null;
if (isVideoStreamsAvailable && (defaultMedia.equals(getString(R.string.video)))) {
videoButton.setChecked(true);
setupVideoSpinner();
} else if (isAudioStreamsAvailable && (defaultMedia.equals(getString(R.string.audio)))) {
audioButton.setChecked(true);
setupAudioSpinner();
} else if (isSubtitleStreamsAvailable
&& (defaultMedia.equals(getString(R.string.caption_setting_title)))) {
subtitleButton.setChecked(true);
setupSubtitleSpinner();
} else if (isVideoStreamsAvailable) {
videoButton.setChecked(true);
setupVideoSpinner();
} else if (isAudioStreamsAvailable) {
Expand Down Expand Up @@ -594,6 +614,7 @@ private void prepareSelectedDownload() {
StoredDirectoryHelper mainStorage;
MediaFormat format;
String mime;
String selectedMediaType;

// first, build the filename and get the output folder (if possible)
// later, run a very very very large file checking logic
Expand All @@ -602,6 +623,7 @@ private void prepareSelectedDownload() {

switch (radioStreamsGroup.getCheckedRadioButtonId()) {
case R.id.audio_button:
selectedMediaType = getString(R.string.audio);
mainStorage = mainStorageAudio;
format = audioStreamsAdapter.getItem(selectedAudioIndex).getFormat();
switch (format) {
Expand All @@ -616,12 +638,14 @@ private void prepareSelectedDownload() {
}
break;
case R.id.video_button:
selectedMediaType = getString(R.string.video);
mainStorage = mainStorageVideo;
format = videoStreamsAdapter.getItem(selectedVideoIndex).getFormat();
mime = format.mimeType;
filename += format.suffix;
break;
case R.id.subtitle_button:
selectedMediaType = getString(R.string.caption_setting_title);
mainStorage = mainStorageVideo; // subtitle & video files go together
format = subtitleStreamsAdapter.getItem(selectedSubtitleIndex).getFormat();
mime = format.mimeType;
Expand Down Expand Up @@ -663,6 +687,11 @@ private void prepareSelectedDownload() {

// check for existing file with the same name
checkSelectedDownload(mainStorage, mainStorage.findFile(filename), filename, mime);

// remember the last media type downloaded by the user
SharedPreferences.Editor editor = prefs.edit();
editor.putString(getString(R.string.last_used_download_type), selectedMediaType);
editor.apply();
}

private void checkSelectedDownload(final StoredDirectoryHelper mainStorage,
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,4 +614,7 @@
<string name="show_original_time_ago_title">Afficher la date originelle sur les items</string>
<string name="youtube_restricted_mode_enabled_title">Mode restreint de YouTube</string>
<string name="feed_group_show_only_ungrouped_subscriptions">Afficher les abonnements sans groupes uniquement</string>
<string name="default_download_type_msg">Média par défaut</string>
<string name="default_download_type_desc">Type de média à télécharger par défaut</string>
<string name="select_last_used_download_type">Se souvenir du choix précédent</string>
</resources>
10 changes: 10 additions & 0 deletions app/src/main/res/values/settings_keys.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,16 @@
<string name="clear_playback_states_key" translatable="false">clear_playback_states</string>
<string name="clear_search_history_key" translatable="false">clear_search_history</string>

<string name="default_download_type" translatable="false">default_download</string>
<string name="default_download_type_default" translatable="false">@string/video</string>
<string-array name="default_download_type_list" translatable="false">
<item>@string/video</item>
<item>@string/audio</item>
<item>@string/caption_setting_title</item>
<item>@string/select_last_used_download_type</item>
</string-array>
<string name="last_used_download_type" translatable="false">@string/video</string>

<string name="downloads_storage_ask" translatable="false">downloads_storage_ask</string>
<string name="storage_use_saf" translatable="false">storage_use_saf</string>

Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,9 @@
<string name="delete_downloaded_files">Delete downloaded files</string>
<string name="deleted_downloads">Deleted %1$d downloads</string>
<string name="stop">Stop</string>
<string name="default_download_type_msg">Default download</string>
<string name="default_download_type_desc">Media type to download by default</string>
<string name="select_last_used_download_type">Remember last used</string>
<string name="max_retry_msg">Maximum retries</string>
<string name="max_retry_desc">Maximum number of attempts before canceling the download</string>
<string name="pause_downloads_on_mobile">Interrupt on metered networks</string>
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/res/xml/download_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/settings_category_downloads_title">

<ListPreference
app:iconSpaceReserved="false"
android:defaultValue="@string/default_download_type_default"
android:entries="@array/default_download_type_list"
android:entryValues="@array/default_download_type_list"
android:key="@string/default_download_type"
android:summary="@string/default_download_type_desc"
android:title="@string/default_download_type_msg" />

<CheckBoxPreference
app:iconSpaceReserved="false"
Expand Down