Apply code review suggestions.

TeamNewPipe · Jan 4, 2023 · e8216b2 · e8216b2
1 parent e3062d7
commit e8216b2
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 29 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -2056,6 +2056,7 @@ public void useVideoSource(final boolean videoEnabled) {
 
             setRecovery();
         }, () -> {
+            // This is executed when the current stream info is not available.
             reloadPlayQueueManager();
             setRecovery();
         });

diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
@@ -21,7 +21,6 @@
 import org.schabi.newpipe.player.playqueue.events.PlayQueueEvent;
 import org.schabi.newpipe.player.playqueue.events.RemoveEvent;
 import org.schabi.newpipe.player.playqueue.events.ReorderEvent;
-import org.schabi.newpipe.util.ServiceHelper;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -42,6 +41,7 @@
 import static org.schabi.newpipe.player.mediasource.FailedMediaSource.MediaSourceResolutionException;
 import static org.schabi.newpipe.player.mediasource.FailedMediaSource.StreamInfoLoadException;
 import static org.schabi.newpipe.player.playqueue.PlayQueue.DEBUG;
+import static org.schabi.newpipe.util.ServiceHelper.getCacheExpirationMillis;
 
 public class MediaSourceManager {
     @NonNull
@@ -420,34 +420,39 @@ private void maybeLoadItem(@NonNull final PlayQueueItem item) {
     }
 
     private Single<ManagedMediaSource> getLoadedMediaSource(@NonNull final PlayQueueItem stream) {
-        return stream.getStream().map(streamInfo -> {
-            final var source = playbackListener.sourceOf(stream, streamInfo);
-
-            return Optional.ofNullable(source)
-                    .flatMap(source1 -> MediaItemTag.from(source1.getMediaItem()))
-                    .<ManagedMediaSource>map(tag -> {
-                        final long expiration = System.currentTimeMillis()
-                                + ServiceHelper.getCacheExpirationMillis(streamInfo.getServiceId());
-                        return new LoadedMediaSource(source, tag, stream, expiration);
-                    })
-                    .orElseGet(() -> {
-                        final String message = "Unable to resolve source from stream info. "
-                                + "URL: " + stream.getUrl() + ", "
-                                + "audio count: " + streamInfo.getAudioStreams().size() + ", "
-                                + "video count: " + streamInfo.getVideoOnlyStreams().size() + ", "
-                                + streamInfo.getVideoStreams().size();
-                        return FailedMediaSource.of(stream, new MediaSourceResolutionException(
-                                message));
-                    });
-        }).onErrorReturn(throwable -> {
-            if (throwable instanceof ExtractionException) {
-                return FailedMediaSource.of(stream, new StreamInfoLoadException(throwable));
-            }
-            // Non-source related error expected here (e.g. network),
-            // should allow retry shortly after the error.
-            return FailedMediaSource.of(stream, new Exception(throwable),
-                    /*allowRetryIn=*/TimeUnit.MILLISECONDS.convert(3, TimeUnit.SECONDS));
-        });
+        return stream.getStream()
+                .map(streamInfo -> Optional
+                        .ofNullable(playbackListener.sourceOf(stream, streamInfo))
+                        .<ManagedMediaSource>flatMap(source ->
+                                MediaItemTag.from(source.getMediaItem())
+                                        .map(tag -> {
+                                            final int serviceId = streamInfo.getServiceId();
+                                            final long expiration = System.currentTimeMillis()
+                                                    + getCacheExpirationMillis(serviceId);
+                                            return new LoadedMediaSource(source, tag, stream,
+                                                    expiration);
+                                        })
+                        )
+                        .orElseGet(() -> {
+                            final String message = "Unable to resolve source from stream info. "
+                                    + "URL: " + stream.getUrl()
+                                    + ", audio count: " + streamInfo.getAudioStreams().size()
+                                    + ", video count: " + streamInfo.getVideoOnlyStreams().size()
+                                    + ", " + streamInfo.getVideoStreams().size();
+                            return FailedMediaSource.of(stream,
+                                    new MediaSourceResolutionException(message));
+                        })
+                )
+                .onErrorReturn(throwable -> {
+                    if (throwable instanceof ExtractionException) {
+                        return FailedMediaSource.of(stream, new StreamInfoLoadException(throwable));
+                    }
+                    // Non-source related error expected here (e.g. network),
+                    // should allow retry shortly after the error.
+                    final long allowRetryIn = TimeUnit.MILLISECONDS.convert(3,
+                            TimeUnit.SECONDS);
+                    return FailedMediaSource.of(stream, new Exception(throwable), allowRetryIn);
+                });
     }
 
     private void onMediaSourceReceived(@NonNull final PlayQueueItem item,