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

Use a lightweight request to check if the client_id is valid 

Request the api-v2 host with the client_id instead of checking if the streams of a SoundCloud track are not empty: if it is valid, the API returns 404, otherwise it should return 401.
This commit is contained in:
TiA4f8R 2021-05-15 19:25:17 +02:00
parent c5c190500c
commit 86308d0603
No known key found for this signature in database
GPG Key ID: E6D3E7F5949450DD
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelper.java
View File

@ -44,6 +44,7 @@ public class SoundcloudParsingHelper {
private static final String HARDCODED_CLIENT_ID = private static final String HARDCODED_CLIENT_ID =
"NcIaRZItQCNQp3Vq9Plvzf7tvjmVJnF6"; // Updated on 26/04/21 "NcIaRZItQCNQp3Vq9Plvzf7tvjmVJnF6"; // Updated on 26/04/21
private static String clientId; private static String clientId;
public static final String SOUNDCLOUD_API_V2 = "https://api-v2.soundcloud.com/";
private SoundcloudParsingHelper() { private SoundcloudParsingHelper() {
} }
@ -88,17 +89,12 @@ public class SoundcloudParsingHelper {
throw new ExtractionException("Couldn't extract client id"); throw new ExtractionException("Couldn't extract client id");
} }
static boolean checkIfHardcodedClientIdIsValid() { static boolean checkIfHardcodedClientIdIsValid() throws IOException, ReCaptchaException {
try { final int responseCode = NewPipe.getDownloader().get(SOUNDCLOUD_API_V2 + "?client_id="
SoundcloudStreamExtractor e = (SoundcloudStreamExtractor) SoundCloud + HARDCODED_CLIENT_ID).responseCode();
.getStreamExtractor( // If the response code is 404, it means that the client_id is valid; otherwise,
"https://soundcloud.com/liluzivert/do-what-i-want-produced-by-maaly-raw-don-cannon"); // it should be not valid
e.fetchPage(); return responseCode == 404;
return !e.getAudioStreams().isEmpty();
} catch (final Exception ignored) {
// No need to throw an exception here. If something went wrong, the client_id is wrong
return false;
}
} }
public static OffsetDateTime parseDateFrom(final String textualUploadDate) public static OffsetDateTime parseDateFrom(final String textualUploadDate)
@ -123,7 +119,7 @@ public class SoundcloudParsingHelper {
*/ */
public static JsonObject resolveFor(@Nonnull final Downloader downloader, final String url) public static JsonObject resolveFor(@Nonnull final Downloader downloader, final String url)
throws IOException, ExtractionException { throws IOException, ExtractionException {
final String apiUrl = "https://api-v2.soundcloud.com/resolve" + "?url=" final String apiUrl = SOUNDCLOUD_API_V2 + "resolve" + "?url="
+ URLEncoder.encode(url, UTF_8) + "&client_id=" + clientId(); + URLEncoder.encode(url, UTF_8) + "&client_id=" + clientId();
try { try {