be-gay-do-crimes
/
NewPipeExtractor
mirror of https://github.com/TeamNewPipe/NewPipeExtractor
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1076 from AudricV/yt-fix-throttling-parameter-regex 

[YouTube] Support multiple declarations for throttling parameter function name array
This commit is contained in:
Tobi 2023-07-07 12:51:26 +02:00 committed by GitHub
parent d961d349c3 4e22c5ee87
commit d6132a9ed9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeThrottlingDecrypter.java
View File

@ -48,6 +48,9 @@ public final class YoutubeThrottlingDecrypter {
private static final String DECRYPT_FUNCTION_BODY_REGEX = private static final String DECRYPT_FUNCTION_BODY_REGEX =
"=\\s*function([\\S\\s]*?\\}\\s*return [\\w$]+?\\.join\\(\"\"\\)\\s*\\};)"; "=\\s*function([\\S\\s]*?\\}\\s*return [\\w$]+?\\.join\\(\"\"\\)\\s*\\};)";
private static final String DECRYPT_FUNCTION_ARRAY_OBJECT_TYPE_DECLARATION_REGEX = "var ";
private static final String FUNCTION_NAMES_IN_DECRYPT_ARRAY_REGEX = "\\s*=\\s*\\[(.+?)][;,]";
private static final Map<String, String> N_PARAMS_CACHE = new HashMap<>(); private static final Map<String, String> N_PARAMS_CACHE = new HashMap<>();
private static String decryptFunction; private static String decryptFunction;
private static String decryptFunctionName; private static String decryptFunctionName;
@ -117,7 +120,8 @@ public final class YoutubeThrottlingDecrypter {
final int arrayNum = Integer.parseInt(matcher.group(2)); final int arrayNum = Integer.parseInt(matcher.group(2));
final Pattern arrayPattern = Pattern.compile( final Pattern arrayPattern = Pattern.compile(
"var " + Pattern.quote(functionName) + "\\s*=\\s*\\[(.+?)];"); DECRYPT_FUNCTION_ARRAY_OBJECT_TYPE_DECLARATION_REGEX + Pattern.quote(functionName)
+ FUNCTION_NAMES_IN_DECRYPT_ARRAY_REGEX);
final String arrayStr = Parser.matchGroup1(arrayPattern, playerJsCode); final String arrayStr = Parser.matchGroup1(arrayPattern, playerJsCode);
final String[] names = arrayStr.split(","); final String[] names = arrayStr.split(",");
return names[arrayNum]; return names[arrayNum];