Merge branch 'master' of https://github.com/BlenderViking/NewPipeExtr…

…actor into play

StreamingService.java

@@ -2,6 +2,7 @@
 
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.playlist.PlayListExtractor;
 import org.schabi.newpipe.extractor.search.SearchEngine;
 import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
 
@@ -52,8 +53,11 @@ public abstract StreamExtractor getExtractorInstance(String url)
     public abstract SearchEngine getSearchEngineInstance();
     public abstract UrlIdHandler getStreamUrlIdHandlerInstance();
     public abstract UrlIdHandler getChannelUrlIdHandlerInstance();
+    public abstract UrlIdHandler getPlayListUrlIdHandlerInstance();
     public abstract ChannelExtractor getChannelExtractorInstance(String url, int page)
             throws ExtractionException, IOException;
+    public abstract PlayListExtractor getPlayListExtractorInstance(String url, int page)
+            throws ExtractionException, IOException;
     public abstract SuggestionExtractor getSuggestionExtractorInstance();
 
     public final int getServiceId() {
@@ -66,11 +70,14 @@ public final int getServiceId() {
     public final LinkType getLinkTypeByUrl(String url) {
         UrlIdHandler sH = getStreamUrlIdHandlerInstance();
         UrlIdHandler cH = getChannelUrlIdHandlerInstance();
+        UrlIdHandler pH = getPlayListUrlIdHandlerInstance();
 
         if(sH.acceptUrl(url)) {
             return LinkType.STREAM;
         } else if(cH.acceptUrl(url)) {
             return LinkType.CHANNEL;
+        } else if (pH.acceptUrl(url)) {
+            return LinkType.PLAYLIST;
         } else {
             return LinkType.NONE;
         }

playlist/PlayListExtractor.java

@@ -0,0 +1,41 @@
+package org.schabi.newpipe.extractor.playlist;
+
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
+
+import java.io.IOException;
+
+public abstract class PlayListExtractor {
+
+    private int serviceId;
+    private String url;
+    private UrlIdHandler urlIdHandler;
+    private StreamInfoItemCollector previewInfoCollector;
+    private int page = -1;
+
+    public PlayListExtractor(UrlIdHandler urlIdHandler, String url, int page, int serviceId)
+            throws ExtractionException, IOException {
+        this.url = url;
+        this.page = page;
+        this.serviceId = serviceId;
+        this.urlIdHandler = urlIdHandler;
+        previewInfoCollector = new StreamInfoItemCollector(urlIdHandler, serviceId);
+    }
+
+    public String getUrl() { return url; }
+    public UrlIdHandler getUrlIdHandler() { return urlIdHandler; }
+    public StreamInfoItemCollector getStreamPreviewInfoCollector() {
+        return previewInfoCollector;
+    }
+
+    public abstract String getName() throws ParsingException;
+    public abstract String getAvatarUrl() throws ParsingException;
+    public abstract String getBannerUrl() throws ParsingException;
+    public abstract StreamInfoItemCollector getStreams() throws ParsingException;
+    public abstract boolean hasNextPage() throws ParsingException;
+    public int getServiceId() {
+        return serviceId;
+    }
+}

playlist/PlayListInfo.java

@@ -0,0 +1,51 @@
+package org.schabi.newpipe.extractor.playlist;
+
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
+
+import java.util.List;
+import java.util.Vector;
+
+public class PlayListInfo {
+
+    public void addException(Exception e) {
+        errors.add(e);
+    }
+
+    public static PlayListInfo getInfo(PlayListExtractor extractor) throws ParsingException {
+        PlayListInfo info = new PlayListInfo();
+
+        info.playList_name = extractor.getName();
+        info.hasNextPage = extractor.hasNextPage();
+
+        try {
+            info.avatar_url = extractor.getAvatarUrl();
+        } catch (Exception e) {
+            info.errors.add(e);
+        }
+        try {
+            info.banner_url = extractor.getBannerUrl();
+        } catch (Exception e) {
+            info.errors.add(e);
+        }
+        try {
+            StreamInfoItemCollector c = extractor.getStreams();
+            info.related_streams = c.getItemList();
+            info.errors.addAll(c.getErrors());
+        } catch(Exception e) {
+            info.errors.add(e);
+        }
+
+        return info;
+    }
+
+    public int service_id = -1;
+    public String playList_name = "";
+    public String avatar_url = "";
+    public String banner_url = "";
+    public List<InfoItem> related_streams = null;
+    public boolean hasNextPage = false;
+
+    public List<Throwable> errors = new Vector<>();
+}

playlist/PlayListInfoItem.java

@@ -0,0 +1,21 @@
+package org.schabi.newpipe.extractor.playlist;
+
+import org.schabi.newpipe.extractor.InfoItem;
+
+public class PlayListInfoItem implements InfoItem {
+
+    public int serviceId = -1;
+    public String name = "";
+    public String thumbnailUrl = "";
+    public String webPageUrl = "";
+
+    public InfoType infoType() {
+        return InfoType.PLAYLIST;
+    }
+    public String getTitle() {
+        return name;
+    }
+    public String getLink() {
+        return webPageUrl;
+    }
+}

playlist/PlayListInfoItemCollector.java

@@ -0,0 +1,33 @@
+package org.schabi.newpipe.extractor.playlist;
+
+import org.schabi.newpipe.extractor.InfoItemCollector;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
+public class PlayListInfoItemCollector extends InfoItemCollector {
+    public PlayListInfoItemCollector(int serviceId) {
+        super(serviceId);
+    }
+
+    public PlayListInfoItem extract(PlayListInfoItemExtractor extractor) throws ParsingException {
+        final PlayListInfoItem resultItem = new PlayListInfoItem();
+
+        resultItem.name = extractor.getPlayListName();
+        resultItem.serviceId = getServiceId();
+        resultItem.webPageUrl = extractor.getWebPageUrl();
+        try {
+            resultItem.thumbnailUrl = extractor.getThumbnailUrl();
+        } catch (Exception e) {
+            addError(e);
+        }
+        return resultItem;
+    }
+
+    public void commit(PlayListInfoItemExtractor extractor) throws ParsingException {
+        try {
+            addItem(extract(extractor));
+        } catch (Exception e) {
+            addError(e);
+        }
+    }
+}

playlist/PlayListInfoItemExtractor.java

@@ -0,0 +1,9 @@
+package org.schabi.newpipe.extractor.playlist;
+
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
+public interface PlayListInfoItemExtractor {
+    String getThumbnailUrl() throws ParsingException;
+    String getPlayListName() throws ParsingException;
+    String getWebPageUrl() throws ParsingException;
+}