replace uiHandler name with linkhandler

theScrabi · theScrabi · commit dc0d0bda244d · 2018-09-15T22:29:28.000+02:00
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/Extractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/Extractor.java
@@ -15,17 +15,17 @@ public abstract class Extractor {
      */
     private final StreamingService service;
 
-    private final LinkHandler uIHandler;
+    private final LinkHandler linkHandler;
 
     @Nullable
     private boolean pageFetched = false;
     private final Downloader downloader;
 
-    public Extractor(final StreamingService service, final LinkHandler uIHandler) {
+    public Extractor(final StreamingService service, final LinkHandler linkHandler) {
         if(service == null) throw new NullPointerException("service is null");
-        if(uIHandler == null) throw new NullPointerException("LinkHandler is null");
+        if(linkHandler == null) throw new NullPointerException("LinkHandler is null");
         this.service = service;
-        this.uIHandler = uIHandler;
+        this.linkHandler = linkHandler;
         this.downloader = NewPipe.getDownloader();
         if(downloader == null) throw new NullPointerException("downloader is null");
     }
@@ -34,8 +34,8 @@ public Extractor(final StreamingService service, final LinkHandler uIHandler) {
      * @return The {@link LinkHandler} of the current extractor object (e.g. a ChannelExtractor should return a channel url handler).
      */
     @Nonnull
-    public LinkHandler getUIHandler() {
-        return uIHandler;
+    public LinkHandler getLinkHandler() {
+        return linkHandler;
     }
 
     /**
@@ -67,7 +67,7 @@ protected boolean isPageFetched() {
 
     @Nonnull
     public String getId() throws ParsingException {
-        return uIHandler.getId();
+        return linkHandler.getId();
     }
 
     /**
@@ -80,12 +80,12 @@ public String getId() throws ParsingException {
 
     @Nonnull
     public String getOriginalUrl() throws ParsingException {
-        return uIHandler.getOriginalUrl();
+        return linkHandler.getOriginalUrl();
     }
 
     @Nonnull
     public String getUrl() throws ParsingException {
-        return uIHandler.getUrl();
+        return linkHandler.getUrl();
     }
 
     @Nonnull
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/ListExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/ListExtractor.java
@@ -13,8 +13,8 @@
  */
 public abstract class ListExtractor<R extends InfoItem> extends Extractor {
 
-    public ListExtractor(StreamingService service, ListLinkHandler uiHandler) {
-        super(service, uiHandler);
+    public ListExtractor(StreamingService service, ListLinkHandler linkHandler) {
+        super(service, linkHandler);
     }
 
     /**
@@ -51,8 +51,8 @@ public boolean hasNextPage() throws IOException, ExtractionException {
     }
 
     @Override
-    public ListLinkHandler getUIHandler() {
-        return (ListLinkHandler) super.getUIHandler();
+    public ListLinkHandler getLinkHandler() {
+        return (ListLinkHandler) super.getLinkHandler();
     }
 
     /*//////////////////////////////////////////////////////////////////////////
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java
@@ -55,7 +55,7 @@ public static InfoItemsPage<StreamInfoItem> getMoreItems(StreamingService servic
     public static ChannelInfo getInfo(ChannelExtractor extractor) throws IOException, ExtractionException {
 
         ChannelInfo info = new ChannelInfo(extractor.getServiceId(),
-                extractor.getUIHandler(),
+                extractor.getLinkHandler(),
                 extractor.getName());
 
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskInfo.java
@@ -68,7 +68,7 @@ public static KioskInfo getInfo(StreamingService service,
     public static KioskInfo getInfo(KioskExtractor extractor) throws ExtractionException {
 
         final KioskInfo info = new KioskInfo(extractor.getServiceId(),
-                extractor.getUIHandler(),
+                extractor.getLinkHandler(),
                 extractor.getName());
 
         final ListExtractor.InfoItemsPage<StreamInfoItem> itemsPage = ExtractorHelper.getItemsPageOrLogError(info, extractor);
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfo.java
@@ -41,7 +41,7 @@ public static PlaylistInfo getInfo(PlaylistExtractor extractor) throws Extractio
 
         final PlaylistInfo info = new PlaylistInfo(
                 extractor.getServiceId(),
-                extractor.getUIHandler(),
+                extractor.getLinkHandler(),
                 extractor.getName());
 
         try {
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/search/SearchExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/search/SearchExtractor.java
@@ -25,7 +25,7 @@ public SearchExtractor(StreamingService service, SearchQueryHandler urlIdHandler
     }
 
     public String getSearchString() {
-        return getUIHandler().getSearchString();
+        return getLinkHandler().getSearchString();
     }
 
     public abstract String getSearchSuggestion() throws ParsingException;
@@ -35,13 +35,13 @@ protected InfoItemsSearchCollector getInfoItemSearchCollector() {
     }
 
     @Override
-    public SearchQueryHandler getUIHandler() {
-        return (SearchQueryHandler) super.getUIHandler();
+    public SearchQueryHandler getLinkHandler() {
+        return (SearchQueryHandler) super.getLinkHandler();
     }
 
     @Override
     public String getName() {
-        return getUIHandler().getSearchString();
+        return getLinkHandler().getSearchString();
     }
 
     protected String getContentCountry() {
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/search/SearchInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/search/SearchInfo.java
@@ -33,7 +33,7 @@ public static SearchInfo getInfo(StreamingService service, SearchQueryHandler se
     public static SearchInfo getInfo(SearchExtractor extractor) throws ExtractionException, IOException {
         final SearchInfo info = new SearchInfo(
                 extractor.getServiceId(),
-                extractor.getUIHandler(),
+                extractor.getLinkHandler(),
                 extractor.getSearchString());
 
         try {
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java
@@ -31,7 +31,7 @@ public SoundcloudChannelExtractor(StreamingService service, ListLinkHandler urlI
     @Override
     public void onFetchPage(@Nonnull Downloader downloader) throws IOException, ExtractionException {
 
-        userId = getUIHandler().getId();
+        userId = getLinkHandler().getId();
         String apiUrl = "https://api-v2.soundcloud.com/users/" + userId +
                 "?client_id=" + SoundcloudParsingHelper.clientId();
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java
@@ -30,7 +30,7 @@ public SoundcloudPlaylistExtractor(StreamingService service, ListLinkHandler url
     @Override
     public void onFetchPage(@Nonnull Downloader downloader) throws IOException, ExtractionException {
 
-        playlistId = getUIHandler().getId();
+        playlistId = getLinkHandler().getId();
         String apiUrl = "https://api.soundcloud.com/playlists/" + playlistId +
                 "?client_id=" + SoundcloudParsingHelper.clientId() +
                 "&representation=compact";
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java
@@ -21,8 +21,8 @@
 public class SoundcloudStreamExtractor extends StreamExtractor {
     private JsonObject track;
 
-    public SoundcloudStreamExtractor(StreamingService service, LinkHandler uIHandler) {
-        super(service, uIHandler);
+    public SoundcloudStreamExtractor(StreamingService service, LinkHandler linkHandler) {
+        super(service, linkHandler);
     }
 
     @Override
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Localization.java b/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Localization.java
@@ -0,0 +1,19 @@
+package org.schabi.newpipe.extractor.utils;
+
+public class Localization {
+    private final String country;
+    private final String language;
+
+    public Localization(String country, String language) {
+        this.country = country;
+        this.language = language;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+}
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchCountTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchCountTest.java
@@ -3,7 +3,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeSearchExtractor;
@@ -25,8 +24,7 @@ public static void setUpClass() throws Exception {
         }
 
         @Test
-        public void testViewCount() throws Exception {
-            boolean foundKnownChannel = false;
+        public void testViewCount() {
             ChannelInfoItem ci = (ChannelInfoItem) itemsPage.getItems().get(0);
             assertTrue("Count does not fit: " + Long.toString(ci.getSubscriberCount()),
                     65043316 < ci.getSubscriberCount() && ci.getSubscriberCount() < 68043316);

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`*/`
`14`	`14`	`public abstract class ListExtractor<R extends InfoItem> extends Extractor {`
`15`	`15`
`16`		`- public ListExtractor(StreamingService service, ListLinkHandler uiHandler) {`
`17`		`- super(service, uiHandler);`
	`16`	`+ public ListExtractor(StreamingService service, ListLinkHandler linkHandler) {`
	`17`	`+ super(service, linkHandler);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`/**`
`@@ -51,8 +51,8 @@ public boolean hasNextPage() throws IOException, ExtractionException {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@Override`
`54`		`- public ListLinkHandler getUIHandler() {`
`55`		`- return (ListLinkHandler) super.getUIHandler();`
	`54`	`+ public ListLinkHandler getLinkHandler() {`
	`55`	`+ return (ListLinkHandler) super.getLinkHandler();`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/*//////////////////////////////////////////////////////////////////////////`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public SearchExtractor(StreamingService service, SearchQueryHandler urlIdHandler`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public String getSearchString() {`
`28`		`- return getUIHandler().getSearchString();`
	`28`	`+ return getLinkHandler().getSearchString();`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public abstract String getSearchSuggestion() throws ParsingException;`
`@@ -35,13 +35,13 @@ protected InfoItemsSearchCollector getInfoItemSearchCollector() {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Override`
`38`		`- public SearchQueryHandler getUIHandler() {`
`39`		`- return (SearchQueryHandler) super.getUIHandler();`
	`38`	`+ public SearchQueryHandler getLinkHandler() {`
	`39`	`+ return (SearchQueryHandler) super.getLinkHandler();`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`
`43`	`43`	`public String getName() {`
`44`		`- return getUIHandler().getSearchString();`
	`44`	`+ return getLinkHandler().getSearchString();`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`protected String getContentCountry() {`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@`
`21`	`21`	`public class SoundcloudStreamExtractor extends StreamExtractor {`
`22`	`22`	`private JsonObject track;`
`23`	`23`
`24`		`- public SoundcloudStreamExtractor(StreamingService service, LinkHandler uIHandler) {`
`25`		`- super(service, uIHandler);`
	`24`	`+ public SoundcloudStreamExtractor(StreamingService service, LinkHandler linkHandler) {`
	`25`	`+ super(service, linkHandler);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@Override`