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

channel/ChannelExtractor.java

@@ -1,13 +1,14 @@
 package org.schabi.newpipe.extractor.channel;
 
+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_info.StreamInfoItemCollector;
+import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
 
 import java.io.IOException;
 
-/**
+/*
  * Created by Christian Schabesberger on 25.07.16.
  *
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
@@ -27,36 +28,20 @@ import java.io.IOException;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public abstract class ChannelExtractor {
-    private int serviceId;
-    private String url;
-    private UrlIdHandler urlIdHandler;
-    private StreamInfoItemCollector previewInfoCollector;
-    private int page = -1;
+public abstract class ChannelExtractor extends Extractor {
 
-    public ChannelExtractor(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 ChannelExtractor(UrlIdHandler urlIdHandler, String url, int serviceId) throws ExtractionException, IOException {
+        super(urlIdHandler, serviceId, url);
     }
 
+    public abstract String getChannelId() throws ParsingException;
     public abstract String getChannelName() throws ParsingException;
     public abstract String getAvatarUrl() throws ParsingException;
     public abstract String getBannerUrl() throws ParsingException;
     public abstract String getFeedUrl() throws ParsingException;
     public abstract StreamInfoItemCollector getStreams() throws ParsingException;
     public abstract long getSubscriberCount() throws ParsingException;
-    public abstract boolean hasNextPage() throws ParsingException;
-    public int getServiceId() {
-        return serviceId;
-    }
+    public abstract boolean hasMoreStreams();
+    public abstract StreamInfoItemCollector getNextStreams() throws ExtractionException, IOException;
+
 }

channel/ChannelInfo.java

@@ -1,14 +1,13 @@
 package org.schabi.newpipe.extractor.channel;
 
+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_info.StreamInfoItemCollector;
+import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
 
-import java.io.Serializable;
 import java.util.List;
-import java.util.Vector;
 
-/**
+/*
  * Created by Christian Schabesberger on 31.07.16.
  *
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
@@ -28,20 +27,23 @@ import java.util.Vector;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class ChannelInfo implements Serializable{
-    public void addException(Exception e) {
-        errors.add(e);
-    }
+public class ChannelInfo extends Info {
 
     public static ChannelInfo getInfo(ChannelExtractor extractor)
-        throws ParsingException {
+            throws ParsingException {
         ChannelInfo info = new ChannelInfo();
 
         // important data
         info.service_id = extractor.getServiceId();
-        info.channel_name = extractor.getChannelName();
-        info.hasNextPage = extractor.hasNextPage();
+        info.url = extractor.getUrl();
+        info.name = extractor.getChannelName();
+        info.hasMoreStreams = extractor.hasMoreStreams();
 
+        try {
+            info.id = extractor.getChannelId();
+        } catch (Exception e) {
+            info.errors.add(e);
+        }
         try {
             info.avatar_url = extractor.getAvatarUrl();
         } catch (Exception e) {
@@ -54,18 +56,18 @@ public class ChannelInfo implements Serializable{
         }
         try {
             info.feed_url = extractor.getFeedUrl();
-        } catch(Exception e) {
+        } 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) {
+        } catch (Exception e) {
             info.errors.add(e);
         }
         try {
-            info.subscriberCount = extractor.getSubscriberCount();
+            info.subscriber_count = extractor.getSubscriberCount();
         } catch (Exception e) {
             info.errors.add(e);
         }
@@ -73,14 +75,10 @@ public class ChannelInfo implements Serializable{
         return info;
     }
 
-    public int service_id = -1;
-    public String channel_name = "";
     public String avatar_url = "";
     public String banner_url = "";
     public String feed_url = "";
     public List<InfoItem> related_streams = null;
-    public long subscriberCount = -1;
-    public boolean hasNextPage = false;
-
-    public List<Throwable> errors = new Vector<>();
+    public long subscriber_count = -1;
+    public boolean hasMoreStreams = false;
 }

channel/ChannelInfoItem.java

@@ -2,7 +2,7 @@ package org.schabi.newpipe.extractor.channel;
 
 import org.schabi.newpipe.extractor.InfoItem;
 
-/**
+/*
  * Created by Christian Schabesberger on 11.02.17.
  *
  * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
@@ -30,14 +30,16 @@ public class ChannelInfoItem implements InfoItem {
     public String webPageUrl = "";
     public String description = "";
     public long subscriberCount = -1;
-    public int videoAmount = -1;
+    public long viewCount = -1;
 
     public InfoType infoType() {
         return InfoType.CHANNEL;
     }
+
     public String getTitle() {
         return channelName;
     }
+
     public String getLink() {
         return webPageUrl;
     }

channel/ChannelInfoItemCollector.java

@@ -1,13 +1,9 @@
 package org.schabi.newpipe.extractor.channel;
 
 import org.schabi.newpipe.extractor.InfoItemCollector;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.exceptions.FoundAdException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.stream_info.StreamInfoItem;
-import org.schabi.newpipe.extractor.stream_info.StreamInfoItemExtractor;
 
-/**
+/*
  * Created by Christian Schabesberger on 12.02.17.
  *
  * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
@@ -47,7 +43,7 @@ public class ChannelInfoItemCollector extends InfoItemCollector {
             addError(e);
         }
         try {
-            resultItem.videoAmount = extractor.getVideoAmount();
+            resultItem.viewCount = extractor.getViewCount();
         } catch (Exception e) {
             addError(e);
         }

channel/ChannelInfoItemExtractor.java

@@ -2,7 +2,7 @@ package org.schabi.newpipe.extractor.channel;
 
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
-/**
+/*
  * Created by Christian Schabesberger on 12.02.17.
  *
  * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
@@ -28,5 +28,5 @@ public interface ChannelInfoItemExtractor {
     String getWebPageUrl() throws ParsingException;
     String getDescription() throws ParsingException;
     long getSubscriberCount() throws ParsingException;
-    int getVideoAmount() throws ParsingException;
+    long getViewCount() throws ParsingException;
 }