baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

SponsorBlock: Getting segments now uses video ID hash

Browse source 
When querying the SponsorBlock API for video segments, the first chunk of characters of the video ID SHA-256 hash is sent instead of the video ID.
This commit is contained in:
polymorphicshade 2020-09-16 22:31:27 -06:00
parent 129d72d97a
commit 5dc035b9cb
1 changed files with 59 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
app/src/main/java/org/schabi/newpipe/SponsorBlockApiTask.java
View file

@ -15,6 +15,8 @@ import org.schabi.newpipe.util.VideoSegment;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@ -65,24 +67,48 @@ public class SponsorBlockApiTask extends AsyncTask<String, Void, JsonArray> {
String categoryParams = "[\"" + TextUtils.join("\",\"", categoryParamList) + "\"]"; String categoryParams = "[\"" + TextUtils.join("\",\"", categoryParamList) + "\"]";
categoryParams = URLEncoder.encode(categoryParams, "utf-8"); categoryParams = URLEncoder.encode(categoryParams, "utf-8");
final String params = "skipSegments?videoID=" + videoId + "&categories=" + categoryParams; final String videoIdHash = toSha256(videoId);
final JsonArray arrayObj = execute(params).get(); if (videoIdHash == null) {
return null;
}
final String params = "skipSegments/" + videoIdHash.substring(0, 8)
+ "?categories=" + categoryParams;
final JsonArray responseArray = execute(params).get();
final ArrayList<VideoSegment> result = new ArrayList<>(); final ArrayList<VideoSegment> result = new ArrayList<>();
for (int i = 0; i < arrayObj.size(); i++) { for (final Object obj1 : responseArray) {
final JsonObject obj = (JsonObject) arrayObj.get(i); final JsonObject jObj1 = (JsonObject) obj1;
final JsonArray segments = (JsonArray) obj.get("segment");
final double startTime = segments.getDouble(0) * 1000; final String responseVideoId = (String) jObj1.getString("videoID");
final double endTime = segments.getDouble(1) * 1000; if (!responseVideoId.equals(videoId)) {
final String category = obj.getString("category"); continue;
}
final JsonArray segmentArray = (JsonArray) jObj1.get("segments");
if (segmentArray == null) {
continue;
}
for (final Object obj2 : segmentArray) {
final JsonObject jObj2 = (JsonObject) obj2;
final JsonArray segmentInfo = (JsonArray) jObj2.get("segment");
if (segmentInfo == null) {
continue;
}
final double startTime = segmentInfo.getDouble(0) * 1000;
final double endTime = segmentInfo.getDouble(1) * 1000;
final String category = jObj2.getString("category");
final VideoSegment segment = new VideoSegment(startTime, endTime, category); final VideoSegment segment = new VideoSegment(startTime, endTime, category);
result.add(segment); result.add(segment);
} }
}
return result.toArray(new VideoSegment[0]); return result.toArray(new VideoSegment[0]);
} }
@ -117,4 +143,27 @@ public class SponsorBlockApiTask extends AsyncTask<String, Void, JsonArray> {
return cm.getActiveNetworkInfo() != null return cm.getActiveNetworkInfo() != null
&& cm.getActiveNetworkInfo().isConnected(); && cm.getActiveNetworkInfo().isConnected();
} }
private String toSha256(final String videoId) {
try {
final MessageDigest digest = MessageDigest.getInstance("SHA-256");
final byte[] bytes = digest.digest(videoId.getBytes(StandardCharsets.UTF_8));
final StringBuilder sb = new StringBuilder();
for (final byte b : bytes) {
final String hex = Integer.toHexString(0xff & b);
if (hex.length() == 1) {
sb.append('0');
}
sb.append(hex);
}
return sb.toString();
} catch (final Exception e) {
Log.e("SPONSOR_BLOCK", "Error getting video ID hash.", e);
return null;
}
}
} }