added getBaseUrl method to linkhandler

yausername · yausername · commit bc75c6603b9d · 2019-11-23T00:05:49.000+05:30
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/Extractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/Extractor.java
@@ -1,5 +1,10 @@
 package org.schabi.newpipe.extractor;
 
+import java.io.IOException;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
@@ -8,11 +13,6 @@
 import org.schabi.newpipe.extractor.localization.Localization;
 import org.schabi.newpipe.extractor.localization.TimeAgoParser;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.io.IOException;
-import java.io.Serializable;
-
 public abstract class Extractor{ 
     /**
      * {@link StreamingService} currently related to this extractor.<br>
@@ -93,6 +93,11 @@ public String getOriginalUrl() throws ParsingException {
     public String getUrl() throws ParsingException {
         return linkHandler.getUrl();
     }
+   
+    @Nonnull
+    public String getBaseUrl() throws ParsingException {
+       return linkHandler.getBaseUrl();
+    }
 
     @Nonnull
     public StreamingService getService() {
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/LinkHandler.java b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/LinkHandler.java
@@ -2,6 +2,9 @@
 
 import java.io.Serializable;
 
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.utils.Utils;
+
 public class LinkHandler implements Serializable {
     protected final String originalUrl;
     protected final String url;
@@ -28,4 +31,8 @@ public String getUrl() {
     public String getId() {
         return id;
     }
+    
+    public String getBaseUrl() throws ParsingException {
+       return Utils.getBaseUrl(url);
+    }
 }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeService.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeService.java
@@ -122,7 +122,7 @@ public String getBaseUrl() {
         return instance.getUrl();
     }
     
-    public void setInstance(PeertubeInstance instance) throws IOException {
+    public void setInstance(PeertubeInstance instance) {
         this.instance = instance;
         this.getServiceInfo().setName(instance.getName());
     }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java
@@ -16,7 +16,6 @@
 import org.schabi.newpipe.extractor.utils.JsonUtils;
 import org.schabi.newpipe.extractor.utils.Parser;
 import org.schabi.newpipe.extractor.utils.Parser.RegexException;
-import org.schabi.newpipe.extractor.utils.Utils;
 
 import com.grack.nanojson.JsonArray;
 import com.grack.nanojson.JsonObject;
@@ -38,7 +37,7 @@ public class PeertubeChannelExtractor extends ChannelExtractor {
 
     public PeertubeChannelExtractor(StreamingService service, ListLinkHandler linkHandler) throws ParsingException {
         super(service, linkHandler);
-        this.baseUrl = Utils.getBaseUrl(getUrl());
+        this.baseUrl = getBaseUrl();
     }
 
     @Override
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsExtractor.java
@@ -56,7 +56,7 @@ private void collectStreamsFrom(CommentsInfoItemsCollector collector, JsonObject
         for(Object c: contents) {
             if(c instanceof JsonObject) {
                 final JsonObject item = (JsonObject) c;
-                PeertubeCommentsInfoItemExtractor extractor = new PeertubeCommentsInfoItemExtractor(item, pageUrl);
+                PeertubeCommentsInfoItemExtractor extractor = new PeertubeCommentsInfoItemExtractor(item, this);
                 collector.commit(extractor);
             }
         }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java
@@ -8,7 +8,6 @@
 import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper;
 import org.schabi.newpipe.extractor.utils.JsonUtils;
-import org.schabi.newpipe.extractor.utils.Utils;
 
 import com.grack.nanojson.JsonObject;
 
@@ -19,10 +18,10 @@ public class PeertubeCommentsInfoItemExtractor implements CommentsInfoItemExtrac
     private final String url;
     private final String baseUrl;
 
-    public PeertubeCommentsInfoItemExtractor(JsonObject item, String url) throws ParsingException {
+    public PeertubeCommentsInfoItemExtractor(JsonObject item, PeertubeCommentsExtractor extractor) throws ParsingException {
         this.item = item;
-        this.url = url;
-        this.baseUrl = Utils.getBaseUrl(url);
+        this.url = extractor.getUrl();
+        this.baseUrl = extractor.getBaseUrl();
     }
 
     @Override
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeSearchExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeSearchExtractor.java
@@ -17,7 +17,6 @@
 import org.schabi.newpipe.extractor.utils.JsonUtils;
 import org.schabi.newpipe.extractor.utils.Parser;
 import org.schabi.newpipe.extractor.utils.Parser.RegexException;
-import org.schabi.newpipe.extractor.utils.Utils;
 
 import com.grack.nanojson.JsonArray;
 import com.grack.nanojson.JsonObject;
@@ -59,7 +58,7 @@ private InfoItemsCollector<InfoItem, InfoItemExtractor> collectStreamsFrom(JsonO
             throw new ParsingException("unable to extract search info", e);
         }
         
-        String baseUrl = Utils.getBaseUrl(getUrl());
+        String baseUrl = getBaseUrl();
         for(Object c: contents) {
             if(c instanceof JsonObject) {
                 final JsonObject item = (JsonObject) c;
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java
@@ -45,7 +45,7 @@ public class PeertubeStreamExtractor extends StreamExtractor {
     
     public PeertubeStreamExtractor(StreamingService service, LinkHandler linkHandler) throws ParsingException {
         super(service, linkHandler);
-        this.baseUrl = Utils.getBaseUrl(getUrl());
+        this.baseUrl = getBaseUrl();
     }
     
     @Override
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeTrendingExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeTrendingExtractor.java
@@ -15,7 +15,6 @@
 import org.schabi.newpipe.extractor.utils.JsonUtils;
 import org.schabi.newpipe.extractor.utils.Parser;
 import org.schabi.newpipe.extractor.utils.Parser.RegexException;
-import org.schabi.newpipe.extractor.utils.Utils;
 
 import com.grack.nanojson.JsonArray;
 import com.grack.nanojson.JsonObject;
@@ -54,7 +53,7 @@ private void collectStreamsFrom(StreamInfoItemsCollector collector, JsonObject j
             throw new ParsingException("unable to extract kiosk info", e);
         }
         
-        String baseUrl = Utils.getBaseUrl(getUrl());
+        String baseUrl = getBaseUrl();
         for(Object c: contents) {
             if(c instanceof JsonObject) {
                 final JsonObject item = (JsonObject) c;

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public String getBaseUrl() {`
`122`	`122`	`return instance.getUrl();`
`123`	`123`	`}`
`124`	`124`
`125`		`- public void setInstance(PeertubeInstance instance) throws IOException {`
	`125`	`+ public void setInstance(PeertubeInstance instance) {`
`126`	`126`	`this.instance = instance;`
`127`	`127`	`this.getServiceInfo().setName(instance.getName());`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ private void collectStreamsFrom(CommentsInfoItemsCollector collector, JsonObject`
`56`	`56`	`for(Object c: contents) {`
`57`	`57`	`if(c instanceof JsonObject) {`
`58`	`58`	`final JsonObject item = (JsonObject) c;`
`59`		`- PeertubeCommentsInfoItemExtractor extractor = new PeertubeCommentsInfoItemExtractor(item, pageUrl);`
	`59`	`+ PeertubeCommentsInfoItemExtractor extractor = new PeertubeCommentsInfoItemExtractor(item, this);`
`60`	`60`	`collector.commit(extractor);`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public class PeertubeStreamExtractor extends StreamExtractor {`
`45`	`45`
`46`	`46`	`public PeertubeStreamExtractor(StreamingService service, LinkHandler linkHandler) throws ParsingException {`
`47`	`47`	`super(service, linkHandler);`
`48`		`- this.baseUrl = Utils.getBaseUrl(getUrl());`
	`48`	`+ this.baseUrl = getBaseUrl();`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Override`