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

[YouTube] Remove deprecated code in YoutubeThrottlingDecrypter

Browse Source 
YoutubeThrottlingDecrypter is now a non-instantiable final class and non-static
attributes have been removed.

The static attributes of this class have been renamed, in order to respect the
naming specification used.
This commit is contained in:
AudricV 2022-08-16 15:01:05 +02:00
parent 76aad92fa5
commit cb64a480cd
No known key found for this signature in database
GPG Key ID: DA92EC7905614198
1 changed files with 16 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,43 +33,18 @@ import java.util.regex.Pattern;
* </p> * </p>
* *
*/ */
public class YoutubeThrottlingDecrypter { public final class YoutubeThrottlingDecrypter {
private static final Pattern N_PARAM_PATTERN = Pattern.compile("[&?]n=([^&]+)"); private static final Pattern N_PARAM_PATTERN = Pattern.compile("[&?]n=([^&]+)");
private static final Pattern FUNCTION_NAME_PATTERN = Pattern.compile( private static final Pattern DECRYPT_FUNCTION_NAME_PATTERN = Pattern.compile(
"\\.get\\(\"n\"\\)\\)&&\\(b=([a-zA-Z0-9$]+)(?:\\[(\\d+)])?\\([a-zA-Z0-9]\\)"); "\\.get\\(\"n\"\\)\\)&&\\(b=([a-zA-Z0-9$]+)(?:\\[(\\d+)])?\\([a-zA-Z0-9]\\)");
private static final Map<String, String> N_PARAMS_CACHE = new HashMap<>(); private static final Map<String, String> N_PARAMS_CACHE = new HashMap<>();
@SuppressWarnings("StaticVariableName") private static String FUNCTION; private static String decryptFunction;
@SuppressWarnings("StaticVariableName") private static String FUNCTION_NAME; private static String decryptFunctionName;
private final String functionName; private YoutubeThrottlingDecrypter() {
private final String function; // No implementation
/**
* <p>
* Use this if you care about the off chance that YouTube tracks with which videoId the cipher
* is requested.
* </p>
* Otherwise use the no-arg constructor which uses a constant value.
*
* @deprecated Use static function instead
*/
public YoutubeThrottlingDecrypter(final String videoId) throws ParsingException {
final String playerJsCode = YoutubeJavaScriptExtractor.extractJavaScriptCode(videoId);
functionName = parseDecodeFunctionName(playerJsCode);
function = parseDecodeFunction(playerJsCode, functionName);
}
/**
* @deprecated Use static function instead
*/
public YoutubeThrottlingDecrypter() throws ParsingException {
final String playerJsCode = YoutubeJavaScriptExtractor.extractJavaScriptCode();
functionName = parseDecodeFunctionName(playerJsCode);
function = parseDecodeFunction(playerJsCode, functionName);
} }
/** /**
@ -91,7 +66,7 @@ public class YoutubeThrottlingDecrypter {
* function. It can be a constant value of any existing video, but a * function. It can be a constant value of any existing video, but a
* constant value is discouraged, because it could allow tracking. * constant value is discouraged, because it could allow tracking.
* @return A streaming URL with the decrypted parameter or the streaming URL itself if no * @return A streaming URL with the decrypted parameter or the streaming URL itself if no
* throttling parameter has been found * throttling parameter has been found.
* @throws ParsingException If the streaming URL contains a throttling parameter and its * @throws ParsingException If the streaming URL contains a throttling parameter and its
* decryption failed * decryption failed
*/ */
@ -102,16 +77,16 @@ public class YoutubeThrottlingDecrypter {
} }
try { try {
if (FUNCTION == null) { if (decryptFunction == null) {
final String playerJsCode final String playerJsCode
= YoutubeJavaScriptExtractor.extractJavaScriptCode(videoId); = YoutubeJavaScriptExtractor.extractJavaScriptCode(videoId);
FUNCTION_NAME = parseDecodeFunctionName(playerJsCode); decryptFunctionName = parseDecodeFunctionName(playerJsCode);
FUNCTION = parseDecodeFunction(playerJsCode, FUNCTION_NAME); decryptFunction = parseDecodeFunction(playerJsCode, decryptFunctionName);
} }
final String oldNParam = parseNParam(streamingUrl); final String oldNParam = parseNParam(streamingUrl);
final String newNParam = decryptNParam(FUNCTION, FUNCTION_NAME, oldNParam); final String newNParam = decryptNParam(decryptFunction, decryptFunctionName, oldNParam);
return replaceNParam(streamingUrl, oldNParam, newNParam); return replaceNParam(streamingUrl, oldNParam, newNParam);
} catch (final Exception e) { } catch (final Exception e) {
throw new ParsingException("Could not parse, decrypt or replace n parameter", e); throw new ParsingException("Could not parse, decrypt or replace n parameter", e);
@ -120,11 +95,10 @@ public class YoutubeThrottlingDecrypter {
private static String parseDecodeFunctionName(final String playerJsCode) private static String parseDecodeFunctionName(final String playerJsCode)
throws Parser.RegexException { throws Parser.RegexException {
final Matcher matcher = FUNCTION_NAME_PATTERN.matcher(playerJsCode); final Matcher matcher = DECRYPT_FUNCTION_NAME_PATTERN.matcher(playerJsCode);
final boolean foundMatch = matcher.find(); if (!matcher.find()) {
if (!foundMatch) {
throw new Parser.RegexException("Failed to find pattern \"" throw new Parser.RegexException("Failed to find pattern \""
+ FUNCTION_NAME_PATTERN + "\""); + DECRYPT_FUNCTION_NAME_PATTERN + "\"");
} }
final String functionName = matcher.group(1); final String functionName = matcher.group(1);
@ -166,17 +140,6 @@ public class YoutubeThrottlingDecrypter {
return "function " + functionName + Parser.matchGroup1(functionPattern, playerJsCode); return "function " + functionName + Parser.matchGroup1(functionPattern, playerJsCode);
} }
@Deprecated
public String apply(final String url) throws ParsingException {
if (containsNParam(url)) {
final String oldNParam = parseNParam(url);
final String newNParam = decryptNParam(function, functionName, oldNParam);
return replaceNParam(url, oldNParam, newNParam);
} else {
return url;
}
}
private static boolean containsNParam(final String url) { private static boolean containsNParam(final String url) {
return Parser.isMatch(N_PARAM_PATTERN, url); return Parser.isMatch(N_PARAM_PATTERN, url);
} }
@ -204,14 +167,14 @@ public class YoutubeThrottlingDecrypter {
} }
/** /**
* @return the number of the cached "n" query parameters. * @return The number of the cached {@code n} query parameters.
*/ */
public static int getCacheSize() { public static int getCacheSize() {
return N_PARAMS_CACHE.size(); return N_PARAMS_CACHE.size();
} }
/** /**
* Clears all stored "n" query parameters. * Clears all stored {@code n} query parameters.
*/ */
public static void clearCache() { public static void clearCache() {
N_PARAMS_CACHE.clear(); N_PARAMS_CACHE.clear();