lasers
/
NewPipeExtractor
mirror of https://github.com/TeamNewPipe/NewPipeExtractor
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use json array looping to extract clientVersion to prevent DE crash

This commit is contained in:
Owen Roberts 2022-11-21 15:40:37 -07:00
parent c953e23414
commit 0727b97119
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
View File

@ -607,13 +607,8 @@ public final class YoutubeParsingHelper {
final JsonArray serviceTrackingParams = initialData.getObject("responseContext")
.getArray("serviceTrackingParams");
// Try to get version from initial data first
final Stream<JsonObject> serviceTrackingParamsStream = serviceTrackingParams.stream()
.filter(JsonObject.class::isInstance)
.map(JsonObject.class::cast);
clientVersion = getClientVersionFromServiceTrackingParam(
serviceTrackingParamsStream, "CSI", "cver");
clientVersion = getClientVersionFromServiceTrackingParams(
serviceTrackingParams, "CSI", "cver");
if (clientVersion == null) {
try {
@ -626,8 +621,8 @@ public final class YoutubeParsingHelper {
// Fallback to get a shortened client version which does not contain the last two
// digits
if (isNullOrEmpty(clientVersion)) {
clientVersion = getClientVersionFromServiceTrackingParam(
serviceTrackingParamsStream, "ECATCHER", "client.version");
clientVersion = getClientVersionFromServiceTrackingParams(
serviceTrackingParams, "ECATCHER", "client.version");
}
try {
@ -652,6 +647,26 @@ public final class YoutubeParsingHelper {
keyAndVersionExtracted = true;
}
@Nullable
private static String getClientVersionFromServiceTrackingParams(
@Nonnull final JsonArray serviceTrackingParams,
@Nonnull final String serviceName,
@Nonnull final String clientVersionKey) {
for (int i = 0 ; i < serviceTrackingParams.size(); i++) {
JsonObject item = serviceTrackingParams.getObject(i);
if (item != null && item.getString("service").equals(serviceName) && item.getArray("params") != null) {
JsonArray paramsArray = item.getArray("params");
for (int j = 0 ; j < paramsArray.size(); j++) {
JsonObject paramItem = paramsArray.getObject(i);
if (paramItem != null && paramItem.getString("key").equals(clientVersionKey)) {
return paramItem.getString("value");
}
}
}
}
return null;
}
@Nullable
private static String getClientVersionFromServiceTrackingParam(
@Nonnull final Stream<JsonObject> serviceTrackingParamsStream,