kavin/NewPipeExtractor
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipeExtractor.git synced 2024-12-13 05:40:34 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #1242 from TeamNewPipe/revert-1205-feature-branch

Browse Source 
Revert "Refactored Identifiers"
This commit is contained in:
Stypox 2024-11-16 14:01:10 +01:00 committed by GitHub
commit ea1a1d1375
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extractor/src/main/java/org/schabi/newpipe/extractor/Extractor.java
View File

@ -28,7 +28,7 @@ public abstract class Extractor {
@Nullable @Nullable
private ContentCountry forcedContentCountry = null; private ContentCountry forcedContentCountry = null;
private boolean isPageFetched = false; private boolean pageFetched = false;
// called like this to prevent checkstyle errors about "hiding a field" // called like this to prevent checkstyle errors about "hiding a field"
private final Downloader downloader; private final Downloader downloader;
@ -54,21 +54,21 @@ public abstract class Extractor {
* @throws ExtractionException if the pages content is not understood * @throws ExtractionException if the pages content is not understood
*/ */
public void fetchPage() throws IOException, ExtractionException { public void fetchPage() throws IOException, ExtractionException {
if (isPageFetched) { if (pageFetched) {
return; return;
} }
onFetchPage(downloader); onFetchPage(downloader);
isPageFetched = true; pageFetched = true;
} }
protected void assertPageFetched() { protected void assertPageFetched() {
if (!isPageFetched) { if (!pageFetched) {
throw new IllegalStateException("Page is not fetched. Make sure you call fetchPage()"); throw new IllegalStateException("Page is not fetched. Make sure you call fetchPage()");
} }
} }
protected boolean isPageFetched() { protected boolean isPageFetched() {
return isPageFetched; return pageFetched;
} }
/** /**

12
extractor/src/main/java/org/schabi/newpipe/extractor/stream/AudioStream.java
View File

@ -35,7 +35,7 @@ public final class AudioStream extends Stream {
// Fields for DASH // Fields for DASH
private int itag = ITAG_NOT_AVAILABLE_OR_NOT_APPLICABLE; private int itag = ITAG_NOT_AVAILABLE_OR_NOT_APPLICABLE;
private int bitRate; private int bitrate;
private int initStart; private int initStart;
private int initEnd; private int initEnd;
private int indexStart; private int indexStart;
@ -351,7 +351,7 @@ public final class AudioStream extends Stream {
this.itagItem = itagItem; this.itagItem = itagItem;
this.itag = itagItem.id; this.itag = itagItem.id;
this.quality = itagItem.getQuality(); this.quality = itagItem.getQuality();
this.bitRate = itagItem.getBitrate(); this.bitrate = itagItem.getBitrate();
this.initStart = itagItem.getInitStart(); this.initStart = itagItem.getInitStart();
this.initEnd = itagItem.getInitEnd(); this.initEnd = itagItem.getInitEnd();
this.indexStart = itagItem.getIndexStart(); this.indexStart = itagItem.getIndexStart();
@ -369,8 +369,8 @@ public final class AudioStream extends Stream {
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
public boolean areStatsEqual(final Stream cmp) { public boolean equalStats(final Stream cmp) {
return super.areStatsEqual(cmp) && cmp instanceof AudioStream return super.equalStats(cmp) && cmp instanceof AudioStream
&& averageBitrate == ((AudioStream) cmp).averageBitrate && averageBitrate == ((AudioStream) cmp).averageBitrate
&& Objects.equals(audioTrackId, ((AudioStream) cmp).audioTrackId) && Objects.equals(audioTrackId, ((AudioStream) cmp).audioTrackId)
&& audioTrackType == ((AudioStream) cmp).audioTrackType && audioTrackType == ((AudioStream) cmp).audioTrackType
@ -405,8 +405,8 @@ public final class AudioStream extends Stream {
* *
* @return the bitrate set from the {@link ItagItem} passed in the constructor of the stream. * @return the bitrate set from the {@link ItagItem} passed in the constructor of the stream.
*/ */
public int getBitRate() { public int getBitrate() {
return bitRate; return bitrate;
} }
/** /**

4
extractor/src/main/java/org/schabi/newpipe/extractor/stream/Stream.java
View File

@ -74,7 +74,7 @@ public abstract class Stream implements Serializable {
return false; return false;
} }
for (final Stream cmpStream : streamList) { for (final Stream cmpStream : streamList) {
if (stream.areStatsEqual(cmpStream)) { if (stream.equalStats(cmpStream)) {
return true; return true;
} }
} }
@ -97,7 +97,7 @@ public abstract class Stream implements Serializable {
* @param other the stream object to be compared to this stream object * @param other the stream object to be compared to this stream object
* @return whether the stream have the same stats or not, based on the criteria above * @return whether the stream have the same stats or not, based on the criteria above
*/ */
public boolean areStatsEqual(@Nullable final Stream other) { public boolean equalStats(@Nullable final Stream other) {
if (other == null || mediaFormat == null || other.mediaFormat == null) { if (other == null || mediaFormat == null || other.mediaFormat == null) {
return false; return false;
} }

4
extractor/src/main/java/org/schabi/newpipe/extractor/stream/SubtitlesStream.java
View File

@ -265,8 +265,8 @@ public final class SubtitlesStream extends Stream {
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
public boolean areStatsEqual(final Stream cmp) { public boolean equalStats(final Stream cmp) {
return super.areStatsEqual(cmp) return super.equalStats(cmp)
&& cmp instanceof SubtitlesStream && cmp instanceof SubtitlesStream
&& code.equals(((SubtitlesStream) cmp).code) && code.equals(((SubtitlesStream) cmp).code)
&& autoGenerated == ((SubtitlesStream) cmp).autoGenerated; && autoGenerated == ((SubtitlesStream) cmp).autoGenerated;

4
extractor/src/main/java/org/schabi/newpipe/extractor/stream/VideoStream.java
View File

@ -326,8 +326,8 @@ public final class VideoStream extends Stream {
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
public boolean areStatsEqual(final Stream cmp) { public boolean equalStats(final Stream cmp) {
return super.areStatsEqual(cmp) return super.equalStats(cmp)
&& cmp instanceof VideoStream && cmp instanceof VideoStream
&& resolution.equals(((VideoStream) cmp).resolution) && resolution.equals(((VideoStream) cmp).resolution)
&& isVideoOnly == ((VideoStream) cmp).isVideoOnly; && isVideoOnly == ((VideoStream) cmp).isVideoOnly;