Refactored Identifiers (#1205)
Extractor.pageFetched -> Extractor.isPageFetched Stream.equalStats(Stream) is renamed to Stream.areStatsEqual(Stream) Stream.getBitrate() is renamed to Stream.getBitRate()
This commit is contained in:
parent
169098432b
commit
0de224124b
|
@ -28,7 +28,7 @@ public abstract class Extractor {
|
|||
@Nullable
|
||||
private ContentCountry forcedContentCountry = null;
|
||||
|
||||
private boolean pageFetched = false;
|
||||
private boolean isPageFetched = false;
|
||||
// called like this to prevent checkstyle errors about "hiding a field"
|
||||
private final Downloader downloader;
|
||||
|
||||
|
@ -54,21 +54,21 @@ public abstract class Extractor {
|
|||
* @throws ExtractionException if the pages content is not understood
|
||||
*/
|
||||
public void fetchPage() throws IOException, ExtractionException {
|
||||
if (pageFetched) {
|
||||
if (isPageFetched) {
|
||||
return;
|
||||
}
|
||||
onFetchPage(downloader);
|
||||
pageFetched = true;
|
||||
isPageFetched = true;
|
||||
}
|
||||
|
||||
protected void assertPageFetched() {
|
||||
if (!pageFetched) {
|
||||
if (!isPageFetched) {
|
||||
throw new IllegalStateException("Page is not fetched. Make sure you call fetchPage()");
|
||||
}
|
||||
}
|
||||
|
||||
protected boolean isPageFetched() {
|
||||
return pageFetched;
|
||||
return isPageFetched;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -35,7 +35,7 @@ public final class AudioStream extends Stream {
|
|||
|
||||
// Fields for DASH
|
||||
private int itag = ITAG_NOT_AVAILABLE_OR_NOT_APPLICABLE;
|
||||
private int bitrate;
|
||||
private int bitRate;
|
||||
private int initStart;
|
||||
private int initEnd;
|
||||
private int indexStart;
|
||||
|
@ -351,7 +351,7 @@ public final class AudioStream extends Stream {
|
|||
this.itagItem = itagItem;
|
||||
this.itag = itagItem.id;
|
||||
this.quality = itagItem.getQuality();
|
||||
this.bitrate = itagItem.getBitrate();
|
||||
this.bitRate = itagItem.getBitrate();
|
||||
this.initStart = itagItem.getInitStart();
|
||||
this.initEnd = itagItem.getInitEnd();
|
||||
this.indexStart = itagItem.getIndexStart();
|
||||
|
@ -369,8 +369,8 @@ public final class AudioStream extends Stream {
|
|||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public boolean equalStats(final Stream cmp) {
|
||||
return super.equalStats(cmp) && cmp instanceof AudioStream
|
||||
public boolean areStatsEqual(final Stream cmp) {
|
||||
return super.areStatsEqual(cmp) && cmp instanceof AudioStream
|
||||
&& averageBitrate == ((AudioStream) cmp).averageBitrate
|
||||
&& Objects.equals(audioTrackId, ((AudioStream) cmp).audioTrackId)
|
||||
&& 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.
|
||||
*/
|
||||
public int getBitrate() {
|
||||
return bitrate;
|
||||
public int getBitRate() {
|
||||
return bitRate;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -74,7 +74,7 @@ public abstract class Stream implements Serializable {
|
|||
return false;
|
||||
}
|
||||
for (final Stream cmpStream : streamList) {
|
||||
if (stream.equalStats(cmpStream)) {
|
||||
if (stream.areStatsEqual(cmpStream)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -97,7 +97,7 @@ public abstract class Stream implements Serializable {
|
|||
* @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
|
||||
*/
|
||||
public boolean equalStats(@Nullable final Stream other) {
|
||||
public boolean areStatsEqual(@Nullable final Stream other) {
|
||||
if (other == null || mediaFormat == null || other.mediaFormat == null) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -265,8 +265,8 @@ public final class SubtitlesStream extends Stream {
|
|||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public boolean equalStats(final Stream cmp) {
|
||||
return super.equalStats(cmp)
|
||||
public boolean areStatsEqual(final Stream cmp) {
|
||||
return super.areStatsEqual(cmp)
|
||||
&& cmp instanceof SubtitlesStream
|
||||
&& code.equals(((SubtitlesStream) cmp).code)
|
||||
&& autoGenerated == ((SubtitlesStream) cmp).autoGenerated;
|
||||
|
|
|
@ -326,8 +326,8 @@ public final class VideoStream extends Stream {
|
|||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public boolean equalStats(final Stream cmp) {
|
||||
return super.equalStats(cmp)
|
||||
public boolean areStatsEqual(final Stream cmp) {
|
||||
return super.areStatsEqual(cmp)
|
||||
&& cmp instanceof VideoStream
|
||||
&& resolution.equals(((VideoStream) cmp).resolution)
|
||||
&& isVideoOnly == ((VideoStream) cmp).isVideoOnly;
|
||||
|
|
Loading…
Reference in New Issue