Refactor extractor

- Refactor info classes and extractors
- Reformat and fix indentation
- Organize packages and classes
- Rename variables/methods and fix regex
- Change the capitalization
- Add methods to playlist extractor

playlist/PlayListExtractor.java

@@ -1,41 +0,0 @@
-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

@@ -1,51 +0,0 @@
-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/PlaylistExtractor.java

@@ -0,0 +1,29 @@
+package org.schabi.newpipe.extractor.playlist;
+
+import org.schabi.newpipe.extractor.Extractor;
+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.StreamInfoItemCollector;
+
+import java.io.IOException;
+
+public abstract class PlaylistExtractor extends Extractor {
+
+    public PlaylistExtractor(UrlIdHandler urlIdHandler, String url, int serviceId) throws ExtractionException, IOException {
+        super(urlIdHandler, serviceId, url);
+    }
+
+    public abstract String getPlaylistId() throws ParsingException;
+    public abstract String getPlaylistName() throws ParsingException;
+    public abstract String getAvatarUrl() throws ParsingException;
+    public abstract String getBannerUrl() throws ParsingException;
+    public abstract String getUploaderUrl() throws ParsingException;
+    public abstract String getUploaderName() throws ParsingException;
+    public abstract String getUploaderAvatarUrl() throws ParsingException;
+    public abstract StreamInfoItemCollector getStreams() throws ParsingException;
+    public abstract long getStreamsCount() throws ParsingException;
+    public abstract boolean hasMoreStreams();
+    public abstract StreamInfoItemCollector getNextStreams() throws ExtractionException, IOException;
+
+}

playlist/PlaylistInfo.java

@@ -0,0 +1,74 @@
+package org.schabi.newpipe.extractor.playlist;
+
+import org.schabi.newpipe.extractor.Info;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
+
+import java.util.List;
+
+public class PlaylistInfo extends Info {
+
+    public static PlaylistInfo getInfo(PlaylistExtractor extractor) throws ParsingException {
+        PlaylistInfo info = new PlaylistInfo();
+
+        info.service_id = extractor.getServiceId();
+        info.url = extractor.getUrl();
+        info.name = extractor.getPlaylistName();
+        info.hasMoreStreams = extractor.hasMoreStreams();
+
+        try {
+            info.id = extractor.getPlaylistId();
+        } catch (Exception e) {
+            info.errors.add(e);
+        }
+        try {
+            info.streams_count = extractor.getStreamsCount();
+        } catch (Exception e) {
+            info.errors.add(e);
+        }
+        try {
+            info.avatar_url = extractor.getAvatarUrl();
+        } catch (Exception e) {
+            info.errors.add(e);
+        }
+        try {
+            info.uploader_url = extractor.getUploaderUrl();
+        } catch (Exception e) {
+            info.errors.add(e);
+        }
+        try {
+            info.uploader_name = extractor.getUploaderName();
+        } catch (Exception e) {
+            info.errors.add(e);
+        }
+        try {
+            info.uploader_avatar_url = extractor.getUploaderAvatarUrl();
+        } 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 String avatar_url = "";
+    public String banner_url = "";
+    public String uploader_url = "";
+    public String uploader_name = "";
+    public String uploader_avatar_url = "";
+    public long streams_count = 0;
+    public List<InfoItem> related_streams = null;
+    public boolean hasMoreStreams = false;
+}

playlist/PlaylistInfoItem.java

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

playlist/PlaylistInfoItemCollector.java

@@ -1,18 +1,17 @@
 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) {
+public class PlaylistInfoItemCollector extends InfoItemCollector {
+    public PlaylistInfoItemCollector(int serviceId) {
         super(serviceId);
     }
 
-    public PlayListInfoItem extract(PlayListInfoItemExtractor extractor) throws ParsingException {
-        final PlayListInfoItem resultItem = new PlayListInfoItem();
+    public PlaylistInfoItem extract(PlaylistInfoItemExtractor extractor) throws ParsingException {
+        final PlaylistInfoItem resultItem = new PlaylistInfoItem();
 
-        resultItem.name = extractor.getPlayListName();
+        resultItem.name = extractor.getPlaylistName();
         resultItem.serviceId = getServiceId();
         resultItem.webPageUrl = extractor.getWebPageUrl();
         try {
@@ -23,7 +22,7 @@ public class PlayListInfoItemCollector extends InfoItemCollector {
         return resultItem;
     }
 
-    public void commit(PlayListInfoItemExtractor extractor) throws ParsingException {
+    public void commit(PlaylistInfoItemExtractor extractor) throws ParsingException {
         try {
             addItem(extract(extractor));
         } catch (Exception e) {

playlist/PlaylistInfoItemExtractor.java

@@ -2,8 +2,8 @@ package org.schabi.newpipe.extractor.playlist;
 
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
-public interface PlayListInfoItemExtractor {
+public interface PlaylistInfoItemExtractor {
     String getThumbnailUrl() throws ParsingException;
-    String getPlayListName() throws ParsingException;
+    String getPlaylistName() throws ParsingException;
     String getWebPageUrl() throws ParsingException;
 }