Skip to content

Commit 3a86574

Browse files
theScrabitheScrabi
committed
fix issues Kiosk issue about localization, nad rename to preferred localization
1 parent 5223aec commit 3a86574

9 files changed

Lines changed: 41 additions & 38 deletions

File tree

‎extractor/src/main/java/org/schabi/newpipe/extractor/NewPipe.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public static void setLocalization(Localization localization) {
103103
NewPipe.localization = localization;
104104
}
105105

106-
public static Localization getLocalization() {
106+
public static Localization getPreferredLocalization() {
107107
return localization;
108108
}
109109
}

‎extractor/src/main/java/org/schabi/newpipe/extractor/StreamingService.java‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public String toString() {
8080
public abstract SearchExtractor getSearchExtractor(SearchQueryHandler queryHandler, Localization localization);
8181
public abstract SuggestionExtractor getSuggestionExtractor(Localization localization);
8282
public abstract SubscriptionExtractor getSubscriptionExtractor();
83-
public abstract KioskList getKioskList(Localization localization) throws ExtractionException;
83+
public abstract KioskList getKioskList() throws ExtractionException;
8484

8585
public abstract ChannelExtractor getChannelExtractor(ListLinkHandler linkHandler,
8686
Localization localization) throws ExtractionException;
@@ -93,27 +93,23 @@ public abstract StreamExtractor getStreamExtractor(LinkHandler linkHandler,
9393
////////////////////////////////////////////
9494

9595
public SearchExtractor getSearchExtractor(SearchQueryHandler queryHandler) {
96-
return getSearchExtractor(queryHandler, NewPipe.getLocalization());
96+
return getSearchExtractor(queryHandler, NewPipe.getPreferredLocalization());
9797
}
9898

9999
public SuggestionExtractor getSuggestionExtractor() {
100-
return getSuggestionExtractor(NewPipe.getLocalization());
101-
}
102-
103-
public KioskList getKioskList() throws ExtractionException {
104-
return getKioskList(NewPipe.getLocalization());
100+
return getSuggestionExtractor(NewPipe.getPreferredLocalization());
105101
}
106102

107103
public ChannelExtractor getChannelExtractor(ListLinkHandler linkHandler) throws ExtractionException {
108-
return getChannelExtractor(linkHandler, NewPipe.getLocalization());
104+
return getChannelExtractor(linkHandler, NewPipe.getPreferredLocalization());
109105
}
110106

111107
public PlaylistExtractor getPlaylistExtractor(ListLinkHandler linkHandler) throws ExtractionException {
112-
return getPlaylistExtractor(linkHandler, NewPipe.getLocalization());
108+
return getPlaylistExtractor(linkHandler, NewPipe.getPreferredLocalization());
113109
}
114110

115111
public StreamExtractor getStreamExtractor(LinkHandler linkHandler) throws ExtractionException {
116-
return getStreamExtractor(linkHandler, NewPipe.getLocalization());
112+
return getStreamExtractor(linkHandler, NewPipe.getPreferredLocalization());
117113
}
118114

119115
////////////////////////////////////////////
@@ -154,19 +150,19 @@ public PlaylistExtractor getPlaylistExtractor(String id,
154150
////////////////////////////////////////////
155151

156152
public SearchExtractor getSearchExtractor(String query) throws ExtractionException {
157-
return getSearchExtractor(getSearchQHFactory().fromQuery(query), NewPipe.getLocalization());
153+
return getSearchExtractor(getSearchQHFactory().fromQuery(query), NewPipe.getPreferredLocalization());
158154
}
159155

160156
public ChannelExtractor getChannelExtractor(String url) throws ExtractionException {
161-
return getChannelExtractor(getChannelLHFactory().fromUrl(url), NewPipe.getLocalization());
157+
return getChannelExtractor(getChannelLHFactory().fromUrl(url), NewPipe.getPreferredLocalization());
162158
}
163159

164160
public PlaylistExtractor getPlaylistExtractor(String url) throws ExtractionException {
165-
return getPlaylistExtractor(getPlaylistLHFactory().fromUrl(url), NewPipe.getLocalization());
161+
return getPlaylistExtractor(getPlaylistLHFactory().fromUrl(url), NewPipe.getPreferredLocalization());
166162
}
167163

168164
public StreamExtractor getStreamExtractor(String url) throws ExtractionException {
169-
return getStreamExtractor(getStreamLHFactory().fromUrl(url), NewPipe.getLocalization());
165+
return getStreamExtractor(getStreamLHFactory().fromUrl(url), NewPipe.getPreferredLocalization());
170166
}
171167

172168

‎extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ public static ChannelInfo getInfo(StreamingService service, String url) throws I
5151

5252
public static InfoItemsPage<StreamInfoItem> getMoreItems(StreamingService service,
5353
String url,
54-
String pageUrl,
55-
Localization localization) throws IOException, ExtractionException {
54+
String pageUrl) throws IOException, ExtractionException {
5655
return service.getChannelExtractor(url).getPage(pageUrl);
5756
}
5857

‎extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskInfo.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,20 @@ private KioskInfo(int serviceId, ListLinkHandler linkHandler, String name) throw
3737

3838
public static ListExtractor.InfoItemsPage<StreamInfoItem> getMoreItems(StreamingService service,
3939
String url,
40-
String pageUrl,
41-
String contentCountry) throws IOException, ExtractionException {
40+
String pageUrl) throws IOException, ExtractionException {
4241
KioskList kl = service.getKioskList();
4342
KioskExtractor extractor = kl.getExtractorByUrl(url, pageUrl);
44-
extractor.setContentCountry(contentCountry);
4543
return extractor.getPage(pageUrl);
4644
}
4745

48-
public static KioskInfo getInfo(String url,
49-
String contentCountry) throws IOException, ExtractionException {
50-
return getInfo(NewPipe.getServiceByUrl(url), url, contentCountry);
46+
public static KioskInfo getInfo(String url) throws IOException, ExtractionException {
47+
return getInfo(NewPipe.getServiceByUrl(url), url);
5148
}
5249

5350
public static KioskInfo getInfo(StreamingService service,
54-
String url,
55-
String contentCountry) throws IOException, ExtractionException {
51+
String url) throws IOException, ExtractionException {
5652
KioskList kl = service.getKioskList();
5753
KioskExtractor extractor = kl.getExtractorByUrl(url, null);
58-
extractor.setContentCountry(contentCountry);
5954
extractor.fetchPage();
6055
return getInfo(extractor);
6156
}

‎extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskList.java‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ KioskExtractor createNewKiosk(final StreamingService streamingService,
2323
private final int service_id;
2424
private final HashMap<String, KioskEntry> kioskList = new HashMap<>();
2525
private String defaultKiosk = null;
26-
private final Localization localization;
2726

2827
private class KioskEntry {
2928
public KioskEntry(KioskExtractorFactory ef, ListLinkHandlerFactory h) {
@@ -34,9 +33,8 @@ public KioskEntry(KioskExtractorFactory ef, ListLinkHandlerFactory h) {
3433
final ListLinkHandlerFactory handlerFactory;
3534
}
3635

37-
public KioskList(int service_id, Localization localization) {
36+
public KioskList(int service_id) {
3837
this.service_id = service_id;
39-
this.localization = localization;
4038
}
4139

4240
public void addKioskEntry(KioskExtractorFactory extractorFactory, ListLinkHandlerFactory handlerFactory, String id)
@@ -53,13 +51,18 @@ public void setDefaultKiosk(String kioskType) {
5351

5452
public KioskExtractor getDefaultKioskExtractor(String nextPageUrl)
5553
throws ExtractionException, IOException {
54+
return getDefaultKioskExtractor(nextPageUrl, NewPipe.getPreferredLocalization());
55+
}
56+
57+
public KioskExtractor getDefaultKioskExtractor(String nextPageUrl, Localization localization)
58+
throws ExtractionException, IOException {
5659
if(defaultKiosk != null && !defaultKiosk.equals("")) {
57-
return getExtractorById(defaultKiosk, nextPageUrl);
60+
return getExtractorById(defaultKiosk, nextPageUrl, localization);
5861
} else {
5962
if(!kioskList.isEmpty()) {
6063
// if not set get any entry
6164
Object[] keySet = kioskList.keySet().toArray();
62-
return getExtractorById(keySet[0].toString(), nextPageUrl);
65+
return getExtractorById(keySet[0].toString(), nextPageUrl, localization);
6366
} else {
6467
return null;
6568
}
@@ -72,6 +75,11 @@ public String getDefaultKioskId() {
7275

7376
public KioskExtractor getExtractorById(String kioskId, String nextPageUrl)
7477
throws ExtractionException, IOException {
78+
return getExtractorById(kioskId, nextPageUrl, NewPipe.getPreferredLocalization());
79+
}
80+
81+
public KioskExtractor getExtractorById(String kioskId, String nextPageUrl, Localization localization)
82+
throws ExtractionException, IOException {
7583
KioskEntry ke = kioskList.get(kioskId);
7684
if(ke == null) {
7785
throw new ExtractionException("No kiosk found with the type: " + kioskId);
@@ -86,11 +94,16 @@ public Set<String> getAvailableKiosks() {
8694
}
8795

8896
public KioskExtractor getExtractorByUrl(String url, String nextPageUrl)
97+
throws ExtractionException, IOException{
98+
return getExtractorByUrl(url, nextPageUrl, NewPipe.getPreferredLocalization());
99+
}
100+
101+
public KioskExtractor getExtractorByUrl(String url, String nextPageUrl, Localization localization)
89102
throws ExtractionException, IOException {
90103
for(Map.Entry<String, KioskEntry> e : kioskList.entrySet()) {
91104
KioskEntry ke = e.getValue();
92105
if(ke.handlerFactory.acceptUrl(url)) {
93-
return getExtractorById(e.getKey(), nextPageUrl);
106+
return getExtractorById(e.getKey(), nextPageUrl, localization);
94107
}
95108
}
96109
throw new ExtractionException("Could not find a kiosk that fits to the url: " + url);

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public SuggestionExtractor getSuggestionExtractor(Localization localization) {
6868
}
6969

7070
@Override
71-
public KioskList getKioskList(Localization localization) throws ExtractionException {
71+
public KioskList getKioskList() throws ExtractionException {
7272
KioskList.KioskExtractorFactory chartsFactory = new KioskList.KioskExtractorFactory() {
7373
@Override
7474
public KioskExtractor createNewKiosk(StreamingService streamingService,
@@ -81,7 +81,7 @@ public KioskExtractor createNewKiosk(StreamingService streamingService,
8181
}
8282
};
8383

84-
KioskList list = new KioskList(getServiceId(), localization);
84+
KioskList list = new KioskList(getServiceId());
8585

8686
// add kiosks here e.g.:
8787
final SoundcloudChartsLinkHandlerFactory h = new SoundcloudChartsLinkHandlerFactory();

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ public SuggestionExtractor getSuggestionExtractor(Localization localization) {
9090
}
9191

9292
@Override
93-
public KioskList getKioskList(final Localization localization) throws ExtractionException {
94-
KioskList list = new KioskList(getServiceId(), localization);
93+
public KioskList getKioskList() throws ExtractionException {
94+
KioskList list = new KioskList(getServiceId());
9595

9696
// add kiosks here e.g.:
9797
try {

‎extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public static class DescriptionTestPewdiepie {
177177
public static void setUp() throws Exception {
178178
NewPipe.init(Downloader.getInstance(), new Localization("GB", "en"));
179179
extractor = (YoutubeStreamExtractor) YouTube
180-
.getStreamExtractor("https://www.youtube.com/watch?v=LzR8Sf5PK2Q");
180+
.getStreamExtractor("https://www.youtube.com/watch?v=fBc4Q_htqPg");
181181
extractor.fetchPage();
182182
}
183183

‎extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingKioskInfoTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static void setUp()
4646
StreamingService service = YouTube;
4747
LinkHandlerFactory LinkHandlerFactory = service.getKioskList().getListLinkHandlerFactoryByType("Trending");
4848

49-
kioskInfo = KioskInfo.getInfo(YouTube, LinkHandlerFactory.fromId("Trending").getUrl(), null);
49+
kioskInfo = KioskInfo.getInfo(YouTube, LinkHandlerFactory.fromId("Trending").getUrl());
5050
}
5151

5252
@Test

0 commit comments

Comments
 (0)