Rename baseUrl to removeQueryParameters

Remove read override as not needed anymore
Remove some TODOs

Author: absurdlylongusername

app/src/main/java/org/schabi/newpipe/player/Player.java

@@ -1055,24 +1055,6 @@ private Disposable getProgressUpdateDisposable() {
 
     //endregion
 
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Playback states
-    //////////////////////////////////////////////////////////////////////////*/
-    //region Playback states
-    @Override
-    public void onPlayWhenReadyChanged(final boolean playWhenReady, final int reason) {
-        if (DEBUG) {
-            Log.d(TAG, "ExoPlayer - onPlayWhenReadyChanged() called with: "
-                    + "playWhenReady = [" + playWhenReady + "], "
-                    + "reason = [" + reason + "]");
-        }
-        final int playbackState = exoPlayerIsNull()
-                ? com.google.android.exoplayer2.Player.STATE_IDLE
-                : simpleExoPlayer.getPlaybackState();
-        updatePlaybackState(playWhenReady, playbackState);
-    }
-
     public static String exoplayerStateToString(final int playbackState) {
         return switch (playbackState) {
             case com.google.android.exoplayer2.Player.STATE_IDLE -> // 1
@@ -1101,6 +1083,24 @@ public static String stateToString(final int state) {
         };
     }
 
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Playback states
+    //////////////////////////////////////////////////////////////////////////*/
+    //region Playback states
+    @Override
+    public void onPlayWhenReadyChanged(final boolean playWhenReady, final int reason) {
+        if (DEBUG) {
+            Log.d(TAG, "ExoPlayer - onPlayWhenReadyChanged() called with: "
+                    + "playWhenReady = [" + playWhenReady + "], "
+                    + "reason = [" + reason + "]");
+        }
+        final int playbackState = exoPlayerIsNull()
+                ? com.google.android.exoplayer2.Player.STATE_IDLE
+                : simpleExoPlayer.getPlaybackState();
+        updatePlaybackState(playWhenReady, playbackState);
+    }
+
     @Override
     public void onPlaybackStateChanged(final int playbackState) {
         if (DEBUG) {
@@ -1114,7 +1114,7 @@ private void updatePlaybackState(final boolean playWhenReady, final int playback
         if (DEBUG) {
             Log.d(TAG, "ExoPlayer - updatePlaybackState() called with: "
                     + "playWhenReady = [" + playWhenReady + "], "
-                    + "playbackState = [" + playbackState + "]");
+                    + "playbackState = [" + exoplayerStateToString(playbackState) + "]");
         }
 
         if (currentState == STATE_PAUSED_SEEK) {

app/src/main/java/org/schabi/newpipe/player/datasource/RefreshableHlsHttpDataSource.java

@@ -31,7 +31,6 @@ public class RefreshableHlsHttpDataSource extends LoggingHttpDataSource {
     private final RefreshableStream refreshableStream;
     private final String originalPlaylistUrl;
     private final Map<String, String> chunkUrlMap = new LinkedHashMap<>();
-    private int readsCalled;
     private boolean isError;
 
     public RefreshableHlsHttpDataSource(final RefreshableStream refreshableStream) {
@@ -55,12 +54,6 @@ public RefreshableHlsHttpDataSource(final RefreshableStream refreshableStream,
         originalPlaylistUrl = refreshableStream.initialUrl();
     }
 
-    @Override
-    public int read(@NonNull final byte[] buffer, final int offset, final int length)
-            throws HttpDataSourceException {
-        return super.read(buffer, offset, length);
-    }
-
     @Override
     public long open(final DataSpec dataSpec) throws HttpDataSourceException {
         final var url = dataSpec.uri.toString();
@@ -101,10 +94,6 @@ private long openInternal(final DataSpec dataSpec) throws HttpDataSourceExceptio
             try {
                 refreshPlaylist();
             } catch (final ExtractionException | IOException ex) {
-                // TODO: better error here
-                // TODO: so what happens when we throw exception here
-                //  and this method gets called again in this class?
-                //  if we want to prevent open being called again we need to throw a runtime
                 throw new HttpDataSourceException("Error refreshing Hls playlist: "
                                                   + originalPlaylistUrl,
                                                   new IOException(ex), dataSpec,
@@ -139,7 +128,7 @@ private static void initializeChunkMappings(final Map<String, String> chunkMap,
                                                 final List<String> newChunks) {
         for (int i = 0; i < newChunks.size(); ++i) {
             final var newUrl = newChunks.get(i);
-            chunkMap.put(getBaseUrl(newUrl), newUrl);
+            chunkMap.put(removeQueryParameters(newUrl), newUrl);
         }
     }
 
@@ -158,19 +147,18 @@ private static void updateChunkMap(final Map<String, String> chunkMap,
         }
     }
 
-    private static String getBaseUrl(final String url) {
+    private static String removeQueryParameters(final String url) {
         final int idx = url.indexOf('?');
         return idx == -1 ? url : url.substring(0, idx);
     }
 
-    // TODO: better name
     private DataSpec getUpdatedDataSpec(final DataSpec dataSpec) {
         final var currentUrl = dataSpec.uri.toString();
         if (DEBUG) {
             Log.d(TAG, "getUpdatedDataSpec(" + currentUrl + ')');
         }
-        // Playlist has expired, so get mapping for new url
-        final var baseUrl = getBaseUrl(currentUrl);
+
+        final var baseUrl = removeQueryParameters(currentUrl);
 
         if (baseUrl.equals(currentUrl)) {
             if (DEBUG) {
@@ -181,7 +169,6 @@ private DataSpec getUpdatedDataSpec(final DataSpec dataSpec) {
         final var updatedUrl = chunkUrlMap.get(baseUrl);
         if (updatedUrl == null) {
             throw new IllegalStateException("baseUrl not found in mappings: " + baseUrl);
-            // TODO: problemo
         }
         if (DEBUG) {
             Log.d(TAG, "updated url:" + updatedUrl);

app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java

@@ -447,11 +447,6 @@ private Single<ManagedMediaSource> getLoadedMediaSource(@NonNull final PlayQueue
                                 MediaItemTag.from(source.getMediaItem())
                                         .map(tag -> {
                                             final int serviceId = streamInfo.getServiceId();
-                                            // CHECKSTYLE:OFF
-    // TODO: So this expiration is false. Expiration starts from when stream is extracted
-    //  But here it is giving it fresh expiration as though the stream info is new, but it's not
-    //  So cache expiration is not 1-1 with stream expiration, but is it supposed to be?
-                                            // CHECKSTYLE:ON
                                             final long expiration = System.currentTimeMillis()
                                                     + getCacheExpirationMillis(serviceId);
                                             return new LoadedMediaSource(source, tag, stream,

app/src/main/java/org/schabi/newpipe/util/InfoCache.java

@@ -90,7 +90,6 @@ private static Info getInfo(@NonNull final String key) {
         }
 
         if (data.isExpired()) {
-            // TODO: oh so we do check expiry on retrieval!
             LRU_CACHE.remove(key);
             return null;
         }
@@ -117,9 +116,6 @@ public void putInfo(final int serviceId,
                         @NonNull final Info info,
                         @NonNull final Type cacheType) {
         final long expirationMillis = ServiceHelper.getCacheExpirationMillis(info.getServiceId());
-        // CHECKSTYLE:OFF
-        // TODO: Expired items get refreshed by being put again; they are not removed when they expire
-        // CHECKSTYLE:ON
         if (DEBUG) {
             final var expiryDateInstant = Instant.now().plusMillis(expirationMillis);
             final var expiryDate = LocalDateTime.ofInstant(expiryDateInstant,

app/src/main/java/org/schabi/newpipe/util/ListHelper.java

@@ -304,7 +304,7 @@ public static List<AudioStream> getFilteredAudioStreams(
         for (final AudioStream stream : audioStreams) {
             // TODO: this doesn't add HLS OPUS streams, but soundcloud has that.
             // Meaning it never actually plays the OPUS soundcloud streams, only
-            // progressive and hls mp3
+            // progressive and hls mp3. So should we change this to allow HLS OPUS?
             if (stream.getDeliveryMethod() == DeliveryMethod.TORRENT
                     || (stream.getDeliveryMethod() == DeliveryMethod.HLS
                     && stream.getFormat() == MediaFormat.OPUS)) {