Skip to content

Commit 45df824

Browse files
committed
Use Localization in getJsonResponse()
1 parent 157055f commit 45df824

6 files changed

Lines changed: 11 additions & 10 deletions

File tree

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public YoutubeChannelExtractor(StreamingService service, ListLinkHandler linkHan
5757
public void onFetchPage(@Nonnull Downloader downloader) throws IOException, ExtractionException {
5858
final String url = super.getUrl() + "/videos?pbj=1&view=0&flow=grid";
5959

60-
final JsonArray ajaxJson = getJsonResponse(url);
60+
final JsonArray ajaxJson = getJsonResponse(url, getExtractorLocalization());
6161

6262
initialData = ajaxJson.getObject(1).getObject("response");
6363
}
@@ -194,7 +194,7 @@ public InfoItemsPage<StreamInfoItem> getPage(String pageUrl) throws IOException,
194194
fetchPage();
195195

196196
StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
197-
final JsonArray ajaxJson = getJsonResponse(pageUrl);
197+
final JsonArray ajaxJson = getJsonResponse(pageUrl, getExtractorLocalization());
198198

199199
JsonObject sectionListContinuation = ajaxJson.getObject(1).getObject("response")
200200
.getObject("continuationContents").getObject("gridContinuation");

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubePlaylistExtractor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public YoutubePlaylistExtractor(StreamingService service, ListLinkHandler linkHa
3636
public void onFetchPage(@Nonnull Downloader downloader) throws IOException, ExtractionException {
3737
final String url = getUrl() + "&pbj=1";
3838

39-
final JsonArray ajaxJson = getJsonResponse(url);
39+
final JsonArray ajaxJson = getJsonResponse(url, getExtractorLocalization());
4040

4141
initialData = ajaxJson.getObject(1).getObject("response");
4242
playlistInfo = getPlaylistInfo();
@@ -186,7 +186,7 @@ public InfoItemsPage<StreamInfoItem> getPage(final String pageUrl) throws IOExce
186186
}
187187

188188
StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
189-
final JsonArray ajaxJson = getJsonResponse(pageUrl);
189+
final JsonArray ajaxJson = getJsonResponse(pageUrl, getExtractorLocalization());
190190

191191
JsonObject sectionListContinuation = ajaxJson.getObject(1).getObject("response")
192192
.getObject("continuationContents").getObject("playlistVideoListContinuation");

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public YoutubeSearchExtractor(StreamingService service, SearchQueryHandler linkH
5151
public void onFetchPage(@Nonnull Downloader downloader) throws IOException, ExtractionException {
5252
final String url = getUrl() + "&pbj=1";
5353

54-
final JsonArray ajaxJson = getJsonResponse(url);
54+
final JsonArray ajaxJson = getJsonResponse(url, getExtractorLocalization());
5555

5656
initialData = ajaxJson.getObject(1).getObject("response");
5757
}
@@ -104,7 +104,7 @@ public InfoItemsPage<InfoItem> getPage(String pageUrl) throws IOException, Extra
104104
}
105105

106106
InfoItemsSearchCollector collector = getInfoItemSearchCollector();
107-
final JsonArray ajaxJson = getJsonResponse(pageUrl);
107+
final JsonArray ajaxJson = getJsonResponse(pageUrl, getExtractorLocalization());
108108

109109
JsonObject itemSectionRenderer = ajaxJson.getObject(1).getObject("response")
110110
.getObject("continuationContents").getObject("itemSectionContinuation");

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ public String getErrorMessage() {
580580
public void onFetchPage(@Nonnull Downloader downloader) throws IOException, ExtractionException {
581581
final String url = getUrl() + "&pbj=1";
582582

583-
initialAjaxJson = getJsonResponse(url);
583+
initialAjaxJson = getJsonResponse(url, getExtractorLocalization());
584584

585585
final String playerUrl;
586586

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeTrendingExtractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void onFetchPage(@Nonnull Downloader downloader) throws IOException, Extr
5454
final String url = getUrl() + "?pbj=1&gl="
5555
+ getExtractorContentCountry().getCountryCode();
5656

57-
final JsonArray ajaxJson = getJsonResponse(url);
57+
final JsonArray ajaxJson = getJsonResponse(url, getExtractorLocalization());
5858

5959
initialData = ajaxJson.getObject(1).getObject("response");
6060
}

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeParsingHelper.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
1313
import org.schabi.newpipe.extractor.exceptions.ParsingException;
1414
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
15+
import org.schabi.newpipe.extractor.localization.Localization;
1516
import org.schabi.newpipe.extractor.utils.Parser;
1617
import org.schabi.newpipe.extractor.utils.Utils;
1718

@@ -346,12 +347,12 @@ public static String fixThumbnailUrl(String thumbnailUrl) {
346347
return thumbnailUrl;
347348
}
348349

349-
public static JsonArray getJsonResponse(String url) throws IOException, ExtractionException {
350+
public static JsonArray getJsonResponse(String url, Localization localization) throws IOException, ExtractionException {
350351
Map<String, List<String>> headers = new HashMap<>();
351352
headers.put("X-YouTube-Client-Name", Collections.singletonList("1"));
352353
headers.put("X-YouTube-Client-Version",
353354
Collections.singletonList(YoutubeParsingHelper.getClientVersion()));
354-
final String response = getDownloader().get(url, headers).responseBody();
355+
final String response = getDownloader().get(url, headers, localization).responseBody();
355356

356357
if (response.length() < 50) { // ensure to have a valid response
357358
throw new ParsingException("JSON response is too short");

0 commit comments

Comments
 (0)