+ * (b=String.fromCharCode(110),c=a.get(b))&&(c=BDa[0](c) + *
+ * Array access is optional, but needs to be handled, since the actual function is inside the + * array. + */ + // CHECKSTYLE:OFF + private static final Pattern[] DEOBFUSCATION_FUNCTION_NAME_REGEXES = { + Pattern.compile("\\(" + SINGLE_CHAR_VARIABLE_REGEX + "=String\\.fromCharCode\\(110\\)," + + SINGLE_CHAR_VARIABLE_REGEX + "=" + SINGLE_CHAR_VARIABLE_REGEX + "\\.get\\(" + + SINGLE_CHAR_VARIABLE_REGEX + "\\)\\)" + "&&\\(" + SINGLE_CHAR_VARIABLE_REGEX + + "=(" + FUNCTION_NAME_REGEX + ")" + "(?:" + ARRAY_ACCESS_REGEX + ")?\\(" + + SINGLE_CHAR_VARIABLE_REGEX + "\\)"), + Pattern.compile("\\.get\\(\"n\"\\)\\)&&\\(" + SINGLE_CHAR_VARIABLE_REGEX + + "=(" + FUNCTION_NAME_REGEX + ")(?:" + ARRAY_ACCESS_REGEX + ")?\\(" + + SINGLE_CHAR_VARIABLE_REGEX + "\\)"), + }; + // CHECKSTYLE:ON + // Escape the curly end brace to allow compatibility with Android's regex engine // See https://stackoverflow.com/q/45074813 @@ -48,11 +73,13 @@ private YoutubeThrottlingParameterUtils() { @Nonnull static String getDeobfuscationFunctionName(@Nonnull final String javaScriptPlayerCode) throws ParsingException { - final Matcher matcher = DEOBFUSCATION_FUNCTION_NAME_PATTERN.matcher(javaScriptPlayerCode); - if (!matcher.find()) { - throw new ParsingException("Failed to find deobfuscation function name pattern \"" - + DEOBFUSCATION_FUNCTION_NAME_PATTERN - + "\" in the base JavaScript player code"); + final Matcher matcher; + try { + matcher = matchMultiplePatterns(DEOBFUSCATION_FUNCTION_NAME_REGEXES, + javaScriptPlayerCode); + } catch (final Parser.RegexException e) { + throw new ParsingException("Could not find deobfuscation function with any of the " + + "known patterns in the base JavaScript player code", e); } final String functionName = matcher.group(1); diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/dashmanifestcreators/YoutubePostLiveStreamDvrDashManifestCreator.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/dashmanifestcreators/YoutubePostLiveStreamDvrDashManifestCreator.java index 07367e43b..3d2a808be 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/dashmanifestcreators/YoutubePostLiveStreamDvrDashManifestCreator.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/dashmanifestcreators/YoutubePostLiveStreamDvrDashManifestCreator.java @@ -75,19 +75,17 @@ private YoutubePostLiveStreamDvrDashManifestCreator() { * parsed from the first sequence of the stream. * * - * - *
In order to generate the DASH manifest, this method will: - *
* If the duration cannot be extracted, the {@code durationSecondsFallback} value will be used diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Parser.java b/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Parser.java index 6efc74f2d..cde9b3b62 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Parser.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Parser.java @@ -78,6 +78,37 @@ public static String matchGroup(@Nonnull final Pattern pat, } } + public static String matchGroup1MultiplePatterns(final Pattern[] patterns, final String input) + throws RegexException { + return matchMultiplePatterns(patterns, input).group(1); + } + + public static Matcher matchMultiplePatterns(final Pattern[] patterns, final String input) + throws RegexException { + Parser.RegexException exception = null; + for (final Pattern pattern : patterns) { + final Matcher matcher = pattern.matcher(input); + if (matcher.find()) { + return matcher; + } else if (exception == null) { + // only pass input to exception message when it is not too long + if (input.length() > 1024) { + exception = new RegexException("Failed to find pattern \"" + pattern.pattern() + + "\""); + } else { + exception = new RegexException("Failed to find pattern \"" + pattern.pattern() + + "\" inside of \"" + input + "\""); + } + } + } + + if (exception == null) { + throw new RegexException("Empty patterns array passed to matchMultiplePatterns"); + } else { + throw exception; + } + } + public static boolean isMatch(final String pattern, final String input) { final Pattern pat = Pattern.compile(pattern); final Matcher mat = pat.matcher(input); diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeCommentsExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeCommentsExtractorTest.java index 3485aed78..2663102f9 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeCommentsExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeCommentsExtractorTest.java @@ -48,7 +48,7 @@ void testGetComments() throws IOException, ExtractionException { @Test void testGetCommentsFromCommentsInfo() throws IOException, ExtractionException { - final String comment = "Thanks for this nice video explanation of Peertube!"; + final String comment = "I love this. ❤"; final CommentsInfo commentsInfo = CommentsInfo.getInfo("https://framatube.org/w/kkGMgK9ZtnKfYAgnEtQxbv"); diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorTest.java index b2c27d187..55c616e42 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorTest.java @@ -85,7 +85,7 @@ public void testGetLanguageInformation() throws ParsingException { @Override public long expectedViewCountAtLeast() { return 38600; } @Nullable @Override public String expectedUploadDate() { return "2018-10-01 10:52:46.396"; } @Nullable @Override public String expectedTextualUploadDate() { return "2018-10-01T10:52:46.396Z"; } - @Override public long expectedLikeCountAtLeast() { return 19; } + @Override public long expectedLikeCountAtLeast() { return 18; } @Override public long expectedDislikeCountAtLeast() { return 0; } @Override public String expectedHost() { return "framatube.org"; } @Override public String expectedCategory() { return "Science & Technology"; } diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java index 38fe024e9..da51149df 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java @@ -317,7 +317,7 @@ void testUploaderUrl() { @Test public void testUploaderName() { - assertEquals("user350509423", extractor.getUploaderName()); + assertEquals("Chaazyy", extractor.getUploaderName()); } @Test