mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-12-23 08:30:44 +00:00
Load full stream info when enqueuing a stream
This commit calls getStreamInfo causing a full network fetch of stream info (I believe only if required) when adding a stream item to the queue. This should prevent UI issues of missing metadata when queueing videos that have been fast-loaded and are missing metadata. Fixes #7035
This commit is contained in:
parent
8272b2508b
commit
62d36126ea
@ -2,6 +2,7 @@ package org.schabi.newpipe.util;
|
|||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
|
import android.util.Log;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import androidx.fragment.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
@ -20,6 +21,7 @@ import java.util.Collections;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
|
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
|
||||||
|
import io.reactivex.rxjava3.disposables.Disposable;
|
||||||
import io.reactivex.rxjava3.schedulers.Schedulers;
|
import io.reactivex.rxjava3.schedulers.Schedulers;
|
||||||
|
|
||||||
import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
|
import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
|
||||||
@ -60,11 +62,15 @@ public enum StreamDialogEntry {
|
|||||||
* Info: Add this entry within showStreamDialog.
|
* Info: Add this entry within showStreamDialog.
|
||||||
*/
|
*/
|
||||||
enqueue(R.string.enqueue_stream, (fragment, item) -> {
|
enqueue(R.string.enqueue_stream, (fragment, item) -> {
|
||||||
NavigationHelper.enqueueOnPlayer(fragment.getContext(), new SinglePlayQueue(item));
|
fetchItemInfoIfSparse(item,
|
||||||
|
fullItem -> NavigationHelper.enqueueOnPlayer(fragment.getContext(), fullItem)
|
||||||
|
);
|
||||||
}),
|
}),
|
||||||
|
|
||||||
enqueue_next(R.string.enqueue_next_stream, (fragment, item) -> {
|
enqueue_next(R.string.enqueue_next_stream, (fragment, item) -> {
|
||||||
NavigationHelper.enqueueNextOnPlayer(fragment.getContext(), new SinglePlayQueue(item));
|
fetchItemInfoIfSparse(item,
|
||||||
|
fullItem -> NavigationHelper.enqueueNextOnPlayer(fragment.getContext(), fullItem)
|
||||||
|
);
|
||||||
}),
|
}),
|
||||||
|
|
||||||
start_here_on_background(R.string.start_here_on_background, (fragment, item) ->
|
start_here_on_background(R.string.start_here_on_background, (fragment, item) ->
|
||||||
@ -203,4 +209,31 @@ public enum StreamDialogEntry {
|
|||||||
fragment.requireActivity().getSupportFragmentManager(),
|
fragment.requireActivity().getSupportFragmentManager(),
|
||||||
item.getServiceId(), uploaderUrl, item.getUploaderName());
|
item.getServiceId(), uploaderUrl, item.getUploaderName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/////////////////////////////////////////////
|
||||||
|
// helper functions //
|
||||||
|
/////////////////////////////////////////////
|
||||||
|
|
||||||
|
private interface InfoCallback {
|
||||||
|
void onInfo(SinglePlayQueue item);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void fetchItemInfoIfSparse(final StreamInfoItem item,
|
||||||
|
final InfoCallback callback) {
|
||||||
|
if (item.getDuration() < 0) {
|
||||||
|
// Sparse item: fetched by fast fetch
|
||||||
|
final Disposable currentWorker = ExtractorHelper.getStreamInfo(
|
||||||
|
item.getServiceId(),
|
||||||
|
item.getUrl(),
|
||||||
|
false
|
||||||
|
)
|
||||||
|
.subscribeOn(Schedulers.io())
|
||||||
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
|
.subscribe(result -> {
|
||||||
|
callback.onInfo(new SinglePlayQueue(result));
|
||||||
|
}, throwable -> Log.e("StreamDialogEntry", throwable.toString()));
|
||||||
|
} else {
|
||||||
|
callback.onInfo(new SinglePlayQueue(item));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user