kavin/NewPipeExtractor
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipeExtractor.git synced 2025-04-28 07:50:34 +05:30
Code Issues Projects Releases Wiki Activity

Typos, comments and formatting

Browse Source
This commit is contained in:
TobiGr 2020-01-24 01:27:54 +01:00
parent 29a4cc78bf
commit 9b45c61103
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ public abstract class Extractor{
} }
protected void assertPageFetched() { protected void assertPageFetched() {
if(!pageFetched) throw new IllegalStateException("Page is not fetched. Make sure you call fetchPage()"); if (!pageFetched) throw new IllegalStateException("Page is not fetched. Make sure you call fetchPage()");
} }
protected boolean isPageFetched() { protected boolean isPageFetched() {

10
extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
View File

@ -773,7 +773,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
private JsonObject getPlayerResponse() throws ParsingException { private JsonObject getPlayerResponse() throws ParsingException {
try { try {
String playerResponseStr; String playerResponseStr;
if(playerArgs != null) { if (playerArgs != null) {
playerResponseStr = playerArgs.getString("player_response"); playerResponseStr = playerArgs.getString("player_response");
} else { } else {
playerResponseStr = videoInfoPage.get("player_response"); playerResponseStr = videoInfoPage.get("player_response");
@ -805,7 +805,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
final String sts = Parser.matchGroup1(stsPattern, embedPageContent); final String sts = Parser.matchGroup1(stsPattern, embedPageContent);
return new EmbeddedInfo(playerUrl, sts); return new EmbeddedInfo(playerUrl, sts);
} catch (Exception i) { } catch (Exception i) {
// if it failes we simply reply with no sts as then it does not seem to be necessary // if it fails we simply reply with no sts as then it does not seem to be necessary
return new EmbeddedInfo(playerUrl, ""); return new EmbeddedInfo(playerUrl, "");
} }
@ -871,7 +871,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
String decryptionFunctionName; String decryptionFunctionName;
// Cascading things in catch is ugly, but its faster than running a match before getting the actual name // Cascading things in catch is ugly, but its faster than running a match before getting the actual name
// to se if the function can actually be found with the given regex. // to se if the function can actually be found with the given regex.
// However if this cascading should propably be cleaned up somehow as it looks a bit weird. // However if this cascading should probably be cleaned up somehow as it looks a bit weird.
try { try {
decryptionFunctionName = Parser.matchGroup1(DECRYPTION_SIGNATURE_FUNCTION_REGEX, playerCode); decryptionFunctionName = Parser.matchGroup1(DECRYPTION_SIGNATURE_FUNCTION_REGEX, playerCode);
} catch (Parser.RegexException re) { } catch (Parser.RegexException re) {
@ -891,7 +891,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
@Nonnull @Nonnull
private List<SubtitlesInfo> getAvailableSubtitlesInfo() throws SubtitlesException { private List<SubtitlesInfo> getAvailableSubtitlesInfo() throws SubtitlesException {
// If the video is age restricted getPlayerConfig will fail // If the video is age restricted getPlayerConfig will fail
if(isAgeRestricted) return Collections.emptyList(); if (isAgeRestricted) return Collections.emptyList();
final JsonObject captions; final JsonObject captions;
if (!playerResponse.has("captions")) { if (!playerResponse.has("captions")) {
@ -908,7 +908,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
// This check is necessary since there may be cases where subtitles metadata do not contain caption track info // This check is necessary since there may be cases where subtitles metadata do not contain caption track info
// e.g. https://www.youtube.com/watch?v=-Vpwatutnko // e.g. https://www.youtube.com/watch?v=-Vpwatutnko
final int captionsSize = captionsArray.size(); final int captionsSize = captionsArray.size();
if(captionsSize == 0) return Collections.emptyList(); if (captionsSize == 0) return Collections.emptyList();
List<SubtitlesInfo> result = new ArrayList<>(); List<SubtitlesInfo> result = new ArrayList<>();
for (int i = 0; i < captionsSize; i++) { for (int i = 0; i < captionsSize; i++) {

1
extractor/src/main/java/org/schabi/newpipe/extractor/utils/Parser.java
View File

@ -67,6 +67,7 @@ public class Parser {
if (foundMatch) { if (foundMatch) {
return mat.group(group); return mat.group(group);
} else { } else {
// only pass input to exception message when it is not too long
if (input.length() > 1024) { if (input.length() > 1024) {
throw new RegexException("failed to find pattern \"" + pat.pattern()); throw new RegexException("failed to find pattern \"" + pat.pattern());
} else { } else {