Skip to content

Commit 0db12e5

Browse files
TobiGrTobiGr
committed
Rename StreamSizeWrapper to StreamInfoWrapper
1 parent ac5f991 commit 0db12e5

5 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎app/src/androidTest/java/org/schabi/newpipe/util/StreamItemAdapterTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class StreamItemAdapterTest {
8484
@Test
8585
fun subtitleStreams_noIcon() {
8686
val adapter = StreamItemAdapter<SubtitlesStream, Stream>(
87-
StreamItemAdapter.StreamSizeWrapper(
87+
StreamItemAdapter.StreamInfoWrapper(
8888
(0 until 5).map {
8989
SubtitlesStream.Builder()
9090
.setContent("https://example.com", true)
@@ -105,7 +105,7 @@ class StreamItemAdapterTest {
105105
@Test
106106
fun audioStreams_noIcon() {
107107
val adapter = StreamItemAdapter<AudioStream, Stream>(
108-
StreamItemAdapter.StreamSizeWrapper(
108+
StreamItemAdapter.StreamInfoWrapper(
109109
(0 until 5).map {
110110
AudioStream.Builder()
111111
.setId(Stream.ID_UNKNOWN)
@@ -128,7 +128,7 @@ class StreamItemAdapterTest {
128128
* [videoOnly] vararg.
129129
*/
130130
private fun getVideoStreams(vararg videoOnly: Boolean) =
131-
StreamItemAdapter.StreamSizeWrapper(
131+
StreamItemAdapter.StreamInfoWrapper(
132132
videoOnly.map {
133133
VideoStream.Builder()
134134
.setId(Stream.ID_UNKNOWN)
@@ -196,7 +196,7 @@ class StreamItemAdapterTest {
196196
streams.forEachIndexed { index, stream ->
197197
val secondaryStreamHelper: SecondaryStreamHelper<T>? = stream?.let {
198198
SecondaryStreamHelper(
199-
StreamItemAdapter.StreamSizeWrapper(streams, context),
199+
StreamItemAdapter.StreamInfoWrapper(streams, context),
200200
it
201201
)
202202
}

‎app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
import org.schabi.newpipe.util.SecondaryStreamHelper;
6868
import org.schabi.newpipe.util.SimpleOnSeekBarChangeListener;
6969
import org.schabi.newpipe.util.StreamItemAdapter;
70-
import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
70+
import org.schabi.newpipe.util.StreamItemAdapter.StreamInfoWrapper;
7171
import org.schabi.newpipe.util.AudioTrackAdapter;
7272
import org.schabi.newpipe.util.AudioTrackAdapter.AudioTracksWrapper;
7373
import org.schabi.newpipe.util.ThemeHelper;
@@ -97,9 +97,9 @@ public class DownloadDialog extends DialogFragment
9797
@State
9898
StreamInfo currentInfo;
9999
@State
100-
StreamSizeWrapper<VideoStream> wrappedVideoStreams;
100+
StreamInfoWrapper<VideoStream> wrappedVideoStreams;
101101
@State
102-
StreamSizeWrapper<SubtitlesStream> wrappedSubtitleStreams;
102+
StreamInfoWrapper<SubtitlesStream> wrappedSubtitleStreams;
103103
@State
104104
AudioTracksWrapper wrappedAudioTracks;
105105
@State
@@ -187,8 +187,8 @@ public DownloadDialog(@NonNull final Context context, @NonNull final StreamInfo
187187
wrappedAudioTracks.size() > 1
188188
);
189189

190-
this.wrappedVideoStreams = new StreamSizeWrapper<>(videoStreams, context);
191-
this.wrappedSubtitleStreams = new StreamSizeWrapper<>(
190+
this.wrappedVideoStreams = new StreamInfoWrapper<>(videoStreams, context);
191+
this.wrappedSubtitleStreams = new StreamInfoWrapper<>(
192192
getStreamsOfSpecifiedDelivery(info.getSubtitles(), PROGRESSIVE_HTTP), context);
193193

194194
this.selectedVideoIndex = ListHelper.getDefaultResolutionIndex(context, videoStreams);
@@ -258,10 +258,10 @@ public void onServiceDisconnected(final ComponentName name) {
258258
* Update the displayed video streams based on the selected audio track.
259259
*/
260260
private void updateSecondaryStreams() {
261-
final StreamSizeWrapper<AudioStream> audioStreams = getWrappedAudioStreams();
261+
final StreamInfoWrapper<AudioStream> audioStreams = getWrappedAudioStreams();
262262
final var secondaryStreams = new SparseArrayCompat<SecondaryStreamHelper<AudioStream>>(4);
263263
final List<VideoStream> videoStreams = wrappedVideoStreams.getStreamsList();
264-
wrappedVideoStreams.resetSizes();
264+
wrappedVideoStreams.resetInfo();
265265

266266
for (int i = 0; i < videoStreams.size(); i++) {
267267
if (!videoStreams.get(i).isVideoOnly()) {
@@ -396,7 +396,7 @@ public void onSaveInstanceState(@NonNull final Bundle outState) {
396396

397397
private void fetchStreamsSize() {
398398
disposables.clear();
399-
disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedVideoStreams)
399+
disposables.add(StreamInfoWrapper.fetchMoreInfoForWrapper(wrappedVideoStreams)
400400
.subscribe(result -> {
401401
if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()
402402
== R.id.video_button) {
@@ -406,7 +406,7 @@ private void fetchStreamsSize() {
406406
new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
407407
"Downloading video stream size",
408408
currentInfo.getServiceId()))));
409-
disposables.add(StreamSizeWrapper.fetchSizeForWrapper(getWrappedAudioStreams())
409+
disposables.add(StreamInfoWrapper.fetchMoreInfoForWrapper(getWrappedAudioStreams())
410410
.subscribe(result -> {
411411
if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()
412412
== R.id.audio_button) {
@@ -416,7 +416,7 @@ private void fetchStreamsSize() {
416416
new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
417417
"Downloading audio stream size",
418418
currentInfo.getServiceId()))));
419-
disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedSubtitleStreams)
419+
disposables.add(StreamInfoWrapper.fetchMoreInfoForWrapper(wrappedSubtitleStreams)
420420
.subscribe(result -> {
421421
if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()
422422
== R.id.subtitle_button) {
@@ -724,9 +724,9 @@ private void setRadioButtonsState(final boolean enabled) {
724724
dialogBinding.subtitleButton.setEnabled(enabled);
725725
}
726726

727-
private StreamSizeWrapper<AudioStream> getWrappedAudioStreams() {
727+
private StreamInfoWrapper<AudioStream> getWrappedAudioStreams() {
728728
if (selectedAudioTrackIndex < 0 || selectedAudioTrackIndex > wrappedAudioTracks.size()) {
729-
return StreamSizeWrapper.empty();
729+
return StreamInfoWrapper.empty();
730730
}
731731
return wrappedAudioTracks.getTracksList().get(selectedAudioTrackIndex);
732732
}

‎app/src/main/java/org/schabi/newpipe/util/AudioTrackAdapter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import org.schabi.newpipe.R;
1515
import org.schabi.newpipe.extractor.stream.AudioStream;
16-
import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
16+
import org.schabi.newpipe.util.StreamItemAdapter.StreamInfoWrapper;
1717

1818
import java.io.Serializable;
1919
import java.util.List;
@@ -75,15 +75,15 @@ public View getView(final int position, final View convertView, final ViewGroup
7575
}
7676

7777
public static class AudioTracksWrapper implements Serializable {
78-
private final List<StreamSizeWrapper<AudioStream>> tracksList;
78+
private final List<StreamInfoWrapper<AudioStream>> tracksList;
7979

8080
public AudioTracksWrapper(@NonNull final List<List<AudioStream>> groupedAudioStreams,
8181
@Nullable final Context context) {
8282
this.tracksList = groupedAudioStreams.stream().map(streams ->
83-
new StreamSizeWrapper<>(streams, context)).collect(Collectors.toList());
83+
new StreamInfoWrapper<>(streams, context)).collect(Collectors.toList());
8484
}
8585

86-
public List<StreamSizeWrapper<AudioStream>> getTracksList() {
86+
public List<StreamInfoWrapper<AudioStream>> getTracksList() {
8787
return tracksList;
8888
}
8989

‎app/src/main/java/org/schabi/newpipe/util/SecondaryStreamHelper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
import org.schabi.newpipe.extractor.stream.AudioStream;
88
import org.schabi.newpipe.extractor.stream.Stream;
99
import org.schabi.newpipe.extractor.stream.VideoStream;
10-
import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
10+
import org.schabi.newpipe.util.StreamItemAdapter.StreamInfoWrapper;
1111

1212
import java.util.List;
1313

1414
public class SecondaryStreamHelper<T extends Stream> {
1515
private final int position;
16-
private final StreamSizeWrapper<T> streams;
16+
private final StreamInfoWrapper<T> streams;
1717

18-
public SecondaryStreamHelper(@NonNull final StreamSizeWrapper<T> streams,
18+
public SecondaryStreamHelper(@NonNull final StreamInfoWrapper<T> streams,
1919
final T selectedStream) {
2020
this.streams = streams;
2121
this.position = streams.getStreamsList().indexOf(selectedStream);

‎app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*/
4242
public class StreamItemAdapter<T extends Stream, U extends Stream> extends BaseAdapter {
4343
@NonNull
44-
private final StreamSizeWrapper<T> streamsWrapper;
44+
private final StreamInfoWrapper<T> streamsWrapper;
4545
@NonNull
4646
private final SparseArrayCompat<SecondaryStreamHelper<U>> secondaryStreams;
4747

@@ -53,7 +53,7 @@ public class StreamItemAdapter<T extends Stream, U extends Stream> extends BaseA
5353
private final boolean hasAnyVideoOnlyStreamWithNoSecondaryStream;
5454

5555
public StreamItemAdapter(
56-
@NonNull final StreamSizeWrapper<T> streamsWrapper,
56+
@NonNull final StreamInfoWrapper<T> streamsWrapper,
5757
@NonNull final SparseArrayCompat<SecondaryStreamHelper<U>> secondaryStreams
5858
) {
5959
this.streamsWrapper = streamsWrapper;
@@ -63,7 +63,7 @@ public StreamItemAdapter(
6363
checkHasAnyVideoOnlyStreamWithNoSecondaryStream();
6464
}
6565

66-
public StreamItemAdapter(final StreamSizeWrapper<T> streamsWrapper) {
66+
public StreamItemAdapter(final StreamInfoWrapper<T> streamsWrapper) {
6767
this(streamsWrapper, new SparseArrayCompat<>(0));
6868
}
6969

@@ -121,7 +121,7 @@ private View getCustomView(final int position,
121121
final TextView sizeView = convertView.findViewById(R.id.stream_size);
122122

123123
final T stream = getItem(position);
124-
final MediaFormat mediaFormat = stream.getFormat();
124+
final MediaFormat mediaFormat = streamsWrapper.getFormat(position);
125125

126126
int woSoundIconVisibility = View.GONE;
127127
String qualityString;
@@ -221,16 +221,16 @@ private boolean checkHasAnyVideoOnlyStreamWithNoSecondaryStream() {
221221
*
222222
* @param <T> the stream type's class extending {@link Stream}
223223
*/
224-
public static class StreamSizeWrapper<T extends Stream> implements Serializable {
225-
private static final StreamSizeWrapper<Stream> EMPTY =
226-
new StreamSizeWrapper<>(Collections.emptyList(), null);
224+
public static class StreamInfoWrapper<T extends Stream> implements Serializable {
225+
private static final StreamInfoWrapper<Stream> EMPTY =
226+
new StreamInfoWrapper<>(Collections.emptyList(), null);
227227
private static final int SIZE_UNSET = -2;
228228

229229
private final List<T> streamsList;
230230
private final long[] streamSizes;
231231
private final String unknownSize;
232232

233-
public StreamSizeWrapper(@NonNull final List<T> streamList,
233+
public StreamInfoWrapper(@NonNull final List<T> streamList,
234234
@Nullable final Context context) {
235235
this.streamsList = streamList;
236236
this.streamSizes = new long[streamsList.size()];
@@ -249,7 +249,7 @@ public StreamSizeWrapper(@NonNull final List<T> streamList,
249249
*/
250250
@NonNull
251251
public static <X extends Stream> Single<Boolean> fetchSizeForWrapper(
252-
final StreamSizeWrapper<X> streamsWrapper) {
252+
final StreamInfoWrapper<X> streamsWrapper) {
253253
final Callable<Boolean> fetchAndSet = () -> {
254254
boolean hasChanged = false;
255255
for (final X stream : streamsWrapper.getStreamsList()) {
@@ -275,9 +275,9 @@ public void resetSizes() {
275275
Arrays.fill(streamSizes, SIZE_UNSET);
276276
}
277277

278-
public static <X extends Stream> StreamSizeWrapper<X> empty() {
278+
public static <X extends Stream> StreamInfoWrapper<X> empty() {
279279
//noinspection unchecked
280-
return (StreamSizeWrapper<X>) EMPTY;
280+
return (StreamInfoWrapper<X>) EMPTY;
281281
}
282282

283283
public List<T> getStreamsList() {

0 commit comments

Comments
 (0)