be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix comments and rearrange code

This commit is contained in:
Stypox 2022-03-15 15:20:00 +01:00
parent 162a838afc
commit 9b4a67276a
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/src/main/java/org/schabi/newpipe/util/SparseItemUtil.java
View File

@ -40,23 +40,25 @@ public final class SparseItemUtil {
* lightweight method to fetch info, but the info might be incomplete (see * lightweight method to fetch info, but the info might be incomplete (see
* {@link org.schabi.newpipe.local.feed.service.FeedLoadService} for more details). * {@link org.schabi.newpipe.local.feed.service.FeedLoadService} for more details).
* *
* @param context the Android context * @param context Android context
* @param item the item which is checked and eventually loaded completely * @param item item which is checked and eventually loaded completely
* @param callback the callback to call with the single play queue built from the original item * @param callback callback to call with the single play queue built from the original item if
* if all info was available, otherwise from the fetched {@link * all info was available, otherwise from the fetched {@link
* org.schabi.newpipe.extractor.stream.StreamInfo} * org.schabi.newpipe.extractor.stream.StreamInfo}
*/ */
public static void fetchItemInfoIfSparse(@NonNull final Context context, public static void fetchItemInfoIfSparse(@NonNull final Context context,
@NonNull final StreamInfoItem item, @NonNull final StreamInfoItem item,
@NonNull final Consumer<SinglePlayQueue> callback) { @NonNull final Consumer<SinglePlayQueue> callback) {
if ((!(item.getStreamType() == LIVE_STREAM || item.getStreamType() == AUDIO_LIVE_STREAM) if (((item.getStreamType() == LIVE_STREAM || item.getStreamType() == AUDIO_LIVE_STREAM)
&& item.getDuration() < 0) || isNullOrEmpty(item.getUploaderUrl())) { || item.getDuration() >= 0) && !isNullOrEmpty(item.getUploaderUrl())) {
fetchStreamInfoAndSaveToDatabase(context, item.getServiceId(), item.getUrl(), // if the duration is >= 0 (provided that the item is not a livestream) and there is an
streamInfo -> callback.accept(new SinglePlayQueue(streamInfo))); // uploader url, probably all info is already there, so there is no need to fetch it
} else {
// all info is already there, no need to fetch
callback.accept(new SinglePlayQueue(item)); callback.accept(new SinglePlayQueue(item));
} }
// either the duration or the uploader url are not available, so fetch more info
fetchStreamInfoAndSaveToDatabase(context, item.getServiceId(), item.getUrl(),
streamInfo -> callback.accept(new SinglePlayQueue(streamInfo)));
} }
/** /**
@ -65,12 +67,12 @@ public final class SparseItemUtil {
* org.schabi.newpipe.extractor.feed.FeedExtractor}). A toast is shown if loading details is * org.schabi.newpipe.extractor.feed.FeedExtractor}). A toast is shown if loading details is
* required. * required.
* *
* @param context the Android context * @param context Android context
* @param serviceId the serviceId of the item * @param serviceId serviceId of the item
* @param url the item url * @param url item url
* @param uploaderUrl the uploaderUrl of the item; if null or empty will be fetched * @param uploaderUrl uploaderUrl of the item; if null or empty will be fetched
* @param callback the callback called with either the original uploaderUrl, if it was a valid * @param callback callback to be called with either the original uploaderUrl, if it was a
* url, otherwise with the uploader url obtained by fetching the {@link * valid url, otherwise with the uploader url obtained by fetching the {@link
* org.schabi.newpipe.extractor.stream.StreamInfo} corresponding to the item * org.schabi.newpipe.extractor.stream.StreamInfo} corresponding to the item
*/ */
public static void fetchUploaderUrlIfSparse(@NonNull final Context context, public static void fetchUploaderUrlIfSparse(@NonNull final Context context,
@ -91,12 +93,12 @@ public final class SparseItemUtil {
* the database and calls the callback on the main thread with the result. A toast will be shown * the database and calls the callback on the main thread with the result. A toast will be shown
* to the user about loading stream details, so this needs to be called on the main thread. * to the user about loading stream details, so this needs to be called on the main thread.
* *
* @param context the Android context * @param context Android context
* @param serviceId the service id of the stream to load * @param serviceId service id of the stream to load
* @param url the url of the stream to load * @param url url of the stream to load
* @param callback the callback to call with the result * @param callback callback to be called with the result
*/ */
private static void fetchStreamInfoAndSaveToDatabase(final Context context, private static void fetchStreamInfoAndSaveToDatabase(@NonNull final Context context,
final int serviceId, final int serviceId,
@NonNull final String url, @NonNull final String url,
final Consumer<StreamInfo> callback) { final Consumer<StreamInfo> callback) {