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

Author: mauriciocolli

Downloader.java

@@ -5,7 +5,7 @@
 import java.io.IOException;
 import java.util.Map;
 
-/**
+/*
  * Created by Christian Schabesberger on 28.01.16.
  *
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
@@ -27,26 +27,35 @@
 
 public interface Downloader {
 
-    /**Download the text file at the supplied URL as in download(String),
+    /**
+     * Download the text file at the supplied URL as in download(String),
      * but set the HTTP header field "Accept-Language" to the supplied string.
-     * @param siteUrl the URL of the text file to return the contents of
+     *
+     * @param siteUrl  the URL of the text file to return the contents of
      * @param language the language (usually a 2-character code) to set as the preferred language
      * @return the contents of the specified text file
-     * @throws IOException*/
+     * @throws IOException
+     */
     String download(String siteUrl, String language) throws IOException, ReCaptchaException;
 
-    /**Download the text file at the supplied URL as in download(String),
+    /**
+     * Download the text file at the supplied URL as in download(String),
      * but set the HTTP header field "Accept-Language" to the supplied string.
-     * @param siteUrl the URL of the text file to return the contents of
+     *
+     * @param siteUrl          the URL of the text file to return the contents of
      * @param customProperties set request header properties
      * @return the contents of the specified text file
-     * @throws IOException*/
+     * @throws IOException
+     */
     String download(String siteUrl, Map<String, String> customProperties) throws IOException, ReCaptchaException;
 
-    /**Download (via HTTP) the text file located at the supplied URL, and return its contents.
+    /**
+     * Download (via HTTP) the text file located at the supplied URL, and return its contents.
      * Primarily intended for downloading web pages.
+     *
      * @param siteUrl the URL of the text file to download
      * @return the contents of the specified text file
-     * @throws IOException*/
+     * @throws IOException
+     */
     String download(String siteUrl) throws IOException, ReCaptchaException;
 }

Extractor.java

@@ -0,0 +1,35 @@
+package org.schabi.newpipe.extractor;
+
+import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
+
+import java.io.Serializable;
+
+public abstract class Extractor implements Serializable {
+    private final int serviceId;
+    private final String url;
+    private final UrlIdHandler urlIdHandler;
+    private final StreamInfoItemCollector previewInfoCollector;
+
+    public Extractor(UrlIdHandler urlIdHandler, int serviceId, String url) {
+        this.urlIdHandler = urlIdHandler;
+        this.serviceId = serviceId;
+        this.url = url;
+        this.previewInfoCollector = new StreamInfoItemCollector(urlIdHandler, serviceId);
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public UrlIdHandler getUrlIdHandler() {
+        return urlIdHandler;
+    }
+
+    public int getServiceId() {
+        return serviceId;
+    }
+
+    protected StreamInfoItemCollector getStreamPreviewInfoCollector() {
+        return previewInfoCollector;
+    }
+}

Info.java

@@ -0,0 +1,19 @@
+package org.schabi.newpipe.extractor;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Vector;
+
+public abstract class Info implements Serializable {
+
+    public int service_id = -1;
+    /**
+     * Id of this Info object <br>
+     * e.g. Youtube:  https://www.youtube.com/watch?v=RER5qCTzZ7     >    RER5qCTzZ7
+     */
+    public String id = "";
+    public String url = "";
+    public String name = "";
+
+    public List<Throwable> errors = new Vector<>();
+}

InfoItem.java

@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-/**
+/*
  * Created by the-scrabi on 11.02.17.
  *
  * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
@@ -22,7 +22,7 @@
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public interface InfoItem extends Serializable{
+public interface InfoItem extends Serializable {
     enum InfoType {
         STREAM,
         PLAYLIST,

InfoItemCollector.java

@@ -5,7 +5,7 @@
 import java.util.List;
 import java.util.Vector;
 
-/**
+/*
  * Created by Christian Schabesberger on 12.02.17.
  *
  * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
@@ -37,24 +37,29 @@ public InfoItemCollector(int serviceId) {
     public List<InfoItem> getItemList() {
         return itemList;
     }
+
     public List<Throwable> getErrors() {
         return errors;
     }
+
     protected void addFromCollector(InfoItemCollector otherC) throws ExtractionException {
-        if(serviceId != otherC.serviceId) {
+        if (serviceId != otherC.serviceId) {
             throw new ExtractionException("Service Id does not equal: "
                     + NewPipe.getNameOfService(serviceId)
                     + " and " + NewPipe.getNameOfService(otherC.serviceId));
         }
         errors.addAll(otherC.errors);
         itemList.addAll(otherC.itemList);
     }
+
     protected void addError(Exception e) {
         errors.add(e);
     }
+
     protected void addItem(InfoItem item) {
         itemList.add(item);
     }
+
     protected int getServiceId() {
         return serviceId;
     }

MediaFormat.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.extractor;
 
-/**
+/*
  * Created by Adam Howard on 08/11/15.
  *
  * Copyright (c) Christian Schabesberger <chris.schabesberger@mailbox.org>
@@ -22,7 +22,9 @@
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**Static data about various media formats support by Newpipe, eg mime type, extension*/
+/**
+ * Static data about various media formats support by Newpipe, eg mime type, extension
+ */
 
 public enum MediaFormat {
     //video and audio combined formats
@@ -48,35 +50,44 @@ public enum MediaFormat {
         this.mimeType = mimeType;
     }
 
-    /**Return the friendly name of the media format with the supplied id
+    /**
+     * Return the friendly name of the media format with the supplied id
+     *
      * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
      * @return the friendly name of the MediaFormat associated with this ids,
-     * or an empty String if none match it.*/
+     * or an empty String if none match it.
+     */
     public static String getNameById(int ident) {
         for (MediaFormat vf : MediaFormat.values()) {
-            if(vf.id == ident) return vf.name;
+            if (vf.id == ident) return vf.name;
         }
         return "";
     }
 
-    /**Return the file extension of the media format with the supplied id
+    /**
+     * Return the file extension of the media format with the supplied id
+     *
      * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
      * @return the file extension of the MediaFormat associated with this ids,
-     * or an empty String if none match it.*/
+     * or an empty String if none match it.
+     */
     public static String getSuffixById(int ident) {
         for (MediaFormat vf : MediaFormat.values()) {
-            if(vf.id == ident) return vf.suffix;
+            if (vf.id == ident) return vf.suffix;
         }
         return "";
     }
 
-    /**Return the MIME type of the media format with the supplied id
+    /**
+     * Return the MIME type of the media format with the supplied id
+     *
      * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
      * @return the MIME type of the MediaFormat associated with this ids,
-     * or an empty String if none match it.*/
+     * or an empty String if none match it.
+     */
     public static String getMimeById(int ident) {
         for (MediaFormat vf : MediaFormat.values()) {
-            if(vf.id == ident) return vf.mimeType;
+            if (vf.id == ident) return vf.mimeType;
         }
         return "";
     }

NewPipe.java

@@ -1,9 +1,8 @@
 package org.schabi.newpipe.extractor;
 
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeService;
 
-/**
+/*
  * Created by Christian Schabesberger on 23.08.15.
  *
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
@@ -23,34 +22,37 @@
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**Provides access to the video streaming services supported by NewPipe.
- * Currently only Youtube until the API becomes more stable.*/
+/**
+ * Provides access to the video streaming services supported by NewPipe.
+ * Currently only Youtube until the API becomes more stable.
+ */
 
 @SuppressWarnings("ALL")
 public class NewPipe {
+    private static final String TAG = NewPipe.class.toString();
 
     private NewPipe() {
     }
 
-    private static final String TAG = NewPipe.class.toString();
-
-
     private static Downloader downloader = null;
 
     public static StreamingService[] getServices() {
         return ServiceList.serviceList;
     }
-    public static StreamingService getService(int serviceId)throws ExtractionException {
-        for(StreamingService s : ServiceList.serviceList) {
-            if(s.getServiceId() == serviceId) {
+
+    public static StreamingService getService(int serviceId) throws ExtractionException {
+        for (StreamingService s : ServiceList.serviceList) {
+            if (s.getServiceId() == serviceId) {
                 return s;
             }
         }
         return null;
     }
+
     public static StreamingService getService(String serviceName) throws ExtractionException {
         return ServiceList.serviceList[getIdOfService(serviceName)];
     }
+
     public static String getNameOfService(int id) {
         try {
             return getService(id).getServiceInfo().name;
@@ -60,9 +62,10 @@ public static String getNameOfService(int id) {
             return "";
         }
     }
+
     public static int getIdOfService(String serviceName) {
-        for(int i = 0; i < ServiceList.serviceList.length; i++) {
-            if(ServiceList.serviceList[i].getServiceInfo().name.equals(serviceName)) {
+        for (int i = 0; i < ServiceList.serviceList.length; i++) {
+            if (ServiceList.serviceList[i].getServiceInfo().name.equals(serviceName)) {
                 return i;
             }
         }
@@ -78,8 +81,8 @@ public static Downloader getDownloader() {
     }
 
     public static StreamingService getServiceByUrl(String url) {
-        for(StreamingService s : ServiceList.serviceList) {
-            if(s.getLinkTypeByUrl(url) != StreamingService.LinkType.NONE) {
+        for (StreamingService s : ServiceList.serviceList) {
+            if (s.getLinkTypeByUrl(url) != StreamingService.LinkType.NONE) {
                 return s;
             }
         }

ServiceList.java

@@ -2,7 +2,7 @@
 
 import org.schabi.newpipe.extractor.services.youtube.YoutubeService;
 
-/**
+/*
  * Created by the-scrabi on 18.02.17.
  */