mirror
/
NewPipeExtractor
kopia lustrzana https://github.com/TeamNewPipe/NewPipeExtractor
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Backport/Sync code from NewPipe implementation

pull/1277/head
litetex 2025-02-09 22:06:41 +01:00
rodzic c892cfaafa
commit ad5ca4eced
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 525B43E6039B3689
1 zmienionych plików z 29 dodań i 34 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

63
extractor/src/test/java/org/schabi/newpipe/downloader/DownloaderTestImpl.java
Wyświetl plik

@ -22,8 +22,8 @@ public final class DownloaderTestImpl extends Downloader {
/** /**
* Should be the latest Firefox ESR version. * Should be the latest Firefox ESR version.
*/ */
private static final String USER_AGENT private static final String USER_AGENT =
= "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0"; "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0";
private static DownloaderTestImpl instance; private static DownloaderTestImpl instance;
private final RateLimitedClientWrapper clientWrapper; private final RateLimitedClientWrapper clientWrapper;
@ -65,41 +65,36 @@ public final class DownloaderTestImpl extends Downloader {
} }
final okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder() final okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder()
.method(httpMethod, requestBody).url(url) .method(httpMethod, requestBody)
.addHeader("User-Agent", USER_AGENT); .url(url)
.addHeader("User-Agent", USER_AGENT);
for (final Map.Entry<String, List<String>> pair : headers.entrySet()) { headers.forEach((headerName, headerValueList) -> {
final String headerName = pair.getKey(); requestBuilder.removeHeader(headerName);
final List<String> headerValueList = pair.getValue(); headerValueList.forEach(headerValue ->
requestBuilder.addHeader(headerName, headerValue));
});
if (headerValueList.size() > 1) { try (okhttp3.Response response =
requestBuilder.removeHeader(headerName); clientWrapper.executeRequestWithLimit(requestBuilder.build())
for (final String headerValue : headerValueList) { ) {
requestBuilder.addHeader(headerName, headerValue); if (response.code() == 429) {
} throw new ReCaptchaException("reCaptcha Challenge requested", url);
} else if (headerValueList.size() == 1) {
requestBuilder.header(headerName, headerValueList.get(0));
} }
String responseBodyToReturn = null;
try (ResponseBody body = response.body()) {
if (body != null) {
responseBodyToReturn = body.string();
}
}
return new Response(
response.code(),
response.message(),
response.headers().toMultimap(),
responseBodyToReturn,
response.request().url().toString());
} }
final okhttp3.Response response =
clientWrapper.executeRequestWithLimit(requestBuilder.build());
if (response.code() == 429) {
response.close();
throw new ReCaptchaException("reCaptcha Challenge requested", url);
}
final ResponseBody body = response.body();
String responseBodyToReturn = null;
if (body != null) {
responseBodyToReturn = body.string();
}
final String latestUrl = response.request().url().toString();
return new Response(response.code(), response.message(), response.headers().toMultimap(),
responseBodyToReturn, latestUrl);
} }
} }