Skip to content

Commit c921e5d

Browse files
committed
Remove unnecessary collector creation function from search extractor
1 parent 04bfa0e commit c921e5d

6 files changed

Lines changed: 6 additions & 11 deletions

File tree

extractor/src/main/java/org/schabi/newpipe/extractor/search/InfoItemsSearchCollector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class InfoItemsSearchCollector extends InfoItemsCollector<InfoItem, InfoI
5252
private final ChannelInfoItemsCollector userCollector;
5353
private final PlaylistInfoItemsCollector playlistCollector;
5454

55-
InfoItemsSearchCollector(int serviceId) {
55+
public InfoItemsSearchCollector(int serviceId) {
5656
super(serviceId);
5757
streamCollector = new StreamInfoItemsCollector(serviceId);
5858
userCollector = new ChannelInfoItemsCollector(serviceId);

extractor/src/main/java/org/schabi/newpipe/extractor/search/SearchExtractor.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ public String getSearchString() {
2727

2828
public abstract String getSearchSuggestion() throws ParsingException;
2929

30-
protected InfoItemsSearchCollector getInfoItemSearchCollector() {
31-
return new InfoItemsSearchCollector(getService().getServiceId());
32-
}
33-
3430
@Override
3531
public SearchQueryHandler getLinkHandler() {
3632
return (SearchQueryHandler) super.getLinkHandler();

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCSearchExtractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public String getSearchSuggestion() throws ParsingException {
4747
@Nonnull
4848
@Override
4949
public InfoItemsPage<InfoItem> getInitialPage() throws IOException, ExtractionException {
50-
final InfoItemsSearchCollector searchItems = getInfoItemSearchCollector();
50+
final InfoItemsSearchCollector searchItems = new InfoItemsSearchCollector(getServiceId());
5151

5252
if (getLinkHandler().getContentFilters().contains(CONFERENCES)
5353
|| getLinkHandler().getContentFilters().contains(ALL)

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeSearchExtractor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ public InfoItemsPage<InfoItem> getInitialPage() throws IOException, ExtractionEx
4747
}
4848

4949
private InfoItemsCollector<InfoItem, InfoItemExtractor> collectStreamsFrom(JsonObject json) throws ParsingException {
50-
51-
final InfoItemsSearchCollector collector = getInfoItemSearchCollector();
50+
final InfoItemsSearchCollector collector = new InfoItemsSearchCollector(getServiceId());
5251

5352
JsonArray contents;
5453
try {

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchExtractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void onFetchPage(@Nonnull Downloader downloader) throws IOException, Extr
7878
}
7979

8080
private InfoItemsCollector<InfoItem, InfoItemExtractor> collectItems(JsonArray searchCollection) {
81-
final InfoItemsSearchCollector collector = getInfoItemSearchCollector();
81+
final InfoItemsSearchCollector collector = new InfoItemsSearchCollector(getServiceId());
8282

8383
for (Object result : searchCollection) {
8484
if (!(result instanceof JsonObject)) continue;

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
@@ -79,7 +79,7 @@ public String getSearchSuggestion() throws ParsingException {
7979
@Nonnull
8080
@Override
8181
public InfoItemsPage<InfoItem> getInitialPage() throws ExtractionException {
82-
InfoItemsSearchCollector collector = getInfoItemSearchCollector();
82+
final InfoItemsSearchCollector collector = new InfoItemsSearchCollector(getServiceId());
8383
JsonArray sections = initialData.getObject("contents").getObject("twoColumnSearchResultsRenderer")
8484
.getObject("primaryContents").getObject("sectionListRenderer").getArray("contents");
8585

@@ -103,7 +103,7 @@ public InfoItemsPage<InfoItem> getPage(String pageUrl) throws IOException, Extra
103103
throw new ExtractionException(new IllegalArgumentException("Page url is empty or null"));
104104
}
105105

106-
InfoItemsSearchCollector collector = getInfoItemSearchCollector();
106+
final InfoItemsSearchCollector collector = new InfoItemsSearchCollector(getServiceId());
107107
final JsonArray ajaxJson = getJsonResponse(pageUrl, getExtractorLocalization());
108108

109109
JsonObject itemSectionRenderer = ajaxJson.getObject(1).getObject("response")

0 commit comments

Comments
 (0)