Fix YouTube's channel extractor

TeamNewPipe · Sep 26, 2017 · 1df3f67 · 1df3f67
1 parent 466d87c
commit 1df3f67
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractor.java
@@ -51,6 +51,8 @@ public class YoutubeChannelExtractor extends ChannelExtractor {
      */
     private Document nextStreamsAjax;
 
+    private boolean fetchingNextStreams;
+
     public YoutubeChannelExtractor(StreamingService service, String url, String nextStreamsUrl) throws IOException, ExtractionException {
         super(service, url, nextStreamsUrl);
     }
@@ -63,14 +65,17 @@ public void fetchPage() throws IOException, ExtractionException {
         String pageContent = downloader.download(channelUrl);
         doc = Jsoup.parse(pageContent, channelUrl);
 
-        nextStreamsUrl = getNextStreamsUrlFrom(doc);
+        if (!fetchingNextStreams) {
+            nextStreamsUrl = getNextStreamsUrlFrom(doc);
+        }
         nextStreamsAjax = null;
     }
 
     @Override
     protected boolean fetchPageUponCreation() {
         // Unfortunately, we have to fetch the page even if we are getting only next streams,
         // as they don't deliver enough information on their own (the channel name, for example).
+        fetchingNextStreams = nextStreamsUrl != null && !nextStreamsUrl.isEmpty();
         return true;
     }