Merge pull request #14 from mauriciocolli/refactor-extractor

Fix dash parser and more refactor
TeamNewPipe · Jul 12, 2017 · b5b25a4 · b5b25a4
2 parents bda65e8 + b1989c0
commit b5b25a4
Show file tree

Hide file tree

Showing 41 changed files with 791 additions and 740 deletions.
diff --git a/Extractor.java b/Extractor.java
@@ -14,7 +14,7 @@ public Extractor(UrlIdHandler urlIdHandler, int serviceId, String url) {
         this.urlIdHandler = urlIdHandler;
         this.serviceId = serviceId;
         this.url = url;
-        this.previewInfoCollector = new StreamInfoItemCollector(urlIdHandler, serviceId);
+        this.previewInfoCollector = new StreamInfoItemCollector(serviceId);
     }
 
     public String getUrl() {

diff --git a/Info.java b/Info.java
@@ -11,9 +11,9 @@ public abstract class Info implements Serializable {
      * 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 String id;
+    public String url;
+    public String name;
 
     public List<Throwable> errors = new Vector<>();
 }
diff --git a/InfoItem.java b/InfoItem.java
@@ -1,7 +1,5 @@
 package org.schabi.newpipe.extractor;
 
-import java.io.Serializable;
-
 /*
  * Created by the-scrabi on 11.02.17.
  *
@@ -22,14 +20,21 @@
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public interface InfoItem extends Serializable {
-    enum InfoType {
+import java.io.Serializable;
+
+public abstract class InfoItem implements Serializable {
+    public enum InfoType {
         STREAM,
         PLAYLIST,
         CHANNEL
     }
 
-    InfoType infoType();
-    String getTitle();
-    String getLink();
+    public InfoItem(InfoType infoType) {
+        this.info_type = infoType;
+    }
+
+    public final InfoType info_type;
+    public int service_id = -1;
+    public String url;
+    public String name;
 }
diff --git a/InfoItemCollector.java b/InfoItemCollector.java
@@ -25,7 +25,7 @@
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class InfoItemCollector {
+public abstract class InfoItemCollector {
     private List<InfoItem> itemList = new Vector<>();
     private List<Throwable> errors = new Vector<>();
     private int serviceId = -1;

diff --git a/MediaFormat.java b/MediaFormat.java
@@ -91,4 +91,17 @@ public static String getMimeById(int ident) {
         }
         return "";
     }
+
+    /**
+     * Return the MediaFormat with the supplied mime type
+     *
+     * @return MediaFormat associated with this mime type,
+     * or null if none match it.
+     */
+    public static MediaFormat getFromMimeType(String mimeType) {
+        for (MediaFormat vf : MediaFormat.values()) {
+            if (vf.mimeType.equals(mimeType)) return vf;
+        }
+        return null;
+    }
 }
diff --git a/channel/ChannelExtractor.java b/channel/ChannelExtractor.java
@@ -1,6 +1,5 @@
 package org.schabi.newpipe.extractor.channel;
 
-import org.schabi.newpipe.extractor.Extractor;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;

diff --git a/channel/ChannelInfo.java b/channel/ChannelInfo.java
@@ -29,21 +29,16 @@
 
 public class ChannelInfo extends Info {
 
-    public static ChannelInfo getInfo(ChannelExtractor extractor)
-            throws ParsingException {
+    public static ChannelInfo getInfo(ChannelExtractor extractor) throws ParsingException {
         ChannelInfo info = new ChannelInfo();
 
         // important data
         info.service_id = extractor.getServiceId();
         info.url = extractor.getUrl();
+        info.id = extractor.getChannelId();
         info.name = extractor.getChannelName();
-        info.hasMoreStreams = extractor.hasMoreStreams();
+        info.has_more_streams = extractor.hasMoreStreams();
 
-        try {
-            info.id = extractor.getChannelId();
-        } catch (Exception e) {
-            info.errors.add(e);
-        }
         try {
             info.avatar_url = extractor.getAvatarUrl();
         } catch (Exception e) {
@@ -75,10 +70,10 @@ public static ChannelInfo getInfo(ChannelExtractor extractor)
         return info;
     }
 
-    public String avatar_url = "";
-    public String banner_url = "";
-    public String feed_url = "";
-    public List<InfoItem> related_streams = null;
+    public String avatar_url;
+    public String banner_url;
+    public String feed_url;
+    public List<InfoItem> related_streams;
     public long subscriber_count = -1;
-    public boolean hasMoreStreams = false;
+    public boolean has_more_streams = false;
 }
diff --git a/channel/ChannelInfoItem.java b/channel/ChannelInfoItem.java
@@ -22,25 +22,14 @@
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class ChannelInfoItem implements InfoItem {
+public class ChannelInfoItem extends InfoItem {
 
-    public int serviceId = -1;
-    public String channelName = "";
-    public String thumbnailUrl = "";
-    public String webPageUrl = "";
-    public String description = "";
-    public long subscriberCount = -1;
-    public long viewCount = -1;
+    public String thumbnail_url;
+    public String description;
+    public long subscriber_count = -1;
+    public long view_count = -1;
 
-    public InfoType infoType() {
-        return InfoType.CHANNEL;
-    }
-
-    public String getTitle() {
-        return channelName;
-    }
-
-    public String getLink() {
-        return webPageUrl;
+    public ChannelInfoItem() {
+        super(InfoType.CHANNEL);
     }
 }
diff --git a/channel/ChannelInfoItemCollector.java b/channel/ChannelInfoItemCollector.java
@@ -31,24 +31,24 @@ public ChannelInfoItemCollector(int serviceId) {
     public ChannelInfoItem extract(ChannelInfoItemExtractor extractor) throws ParsingException {
         ChannelInfoItem resultItem = new ChannelInfoItem();
         // important information
-        resultItem.channelName = extractor.getChannelName();
+        resultItem.name = extractor.getChannelName();
 
-        resultItem.serviceId = getServiceId();
-        resultItem.webPageUrl = extractor.getWebPageUrl();
+        resultItem.service_id = getServiceId();
+        resultItem.url = extractor.getWebPageUrl();
 
         // optional information
         try {
-            resultItem.subscriberCount = extractor.getSubscriberCount();
+            resultItem.subscriber_count = extractor.getSubscriberCount();
         } catch (Exception e) {
             addError(e);
         }
         try {
-            resultItem.viewCount = extractor.getViewCount();
+            resultItem.view_count = extractor.getViewCount();
         } catch (Exception e) {
             addError(e);
         }
         try {
-            resultItem.thumbnailUrl = extractor.getThumbnailUrl();
+            resultItem.thumbnail_url = extractor.getThumbnailUrl();
         } catch (Exception e) {
             addError(e);
         }

diff --git a/exceptions/ContentNotAvailableException.java b/exceptions/ContentNotAvailableException.java
@@ -0,0 +1,11 @@
+package org.schabi.newpipe.extractor.exceptions;
+
+public class ContentNotAvailableException extends ParsingException {
+    public ContentNotAvailableException(String message) {
+        super(message);
+    }
+
+    public ContentNotAvailableException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/playlist/PlaylistExtractor.java b/playlist/PlaylistExtractor.java
@@ -1,6 +1,5 @@
 package org.schabi.newpipe.extractor.playlist;
 
-import org.schabi.newpipe.extractor.Extractor;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;

diff --git a/playlist/PlaylistInfo.java b/playlist/PlaylistInfo.java
@@ -14,14 +14,10 @@ public static PlaylistInfo getInfo(PlaylistExtractor extractor) throws ParsingEx
 
         info.service_id = extractor.getServiceId();
         info.url = extractor.getUrl();
+        info.id = extractor.getPlaylistId();
         info.name = extractor.getPlaylistName();
-        info.hasMoreStreams = extractor.hasMoreStreams();
+        info.has_more_streams = extractor.hasMoreStreams();
 
-        try {
-            info.id = extractor.getPlaylistId();
-        } catch (Exception e) {
-            info.errors.add(e);
-        }
         try {
             info.streams_count = extractor.getStreamsCount();
         } catch (Exception e) {
@@ -63,12 +59,12 @@ public static PlaylistInfo getInfo(PlaylistExtractor extractor) throws ParsingEx
         return info;
     }
 
-    public String avatar_url = "";
-    public String banner_url = "";
-    public String uploader_url = "";
-    public String uploader_name = "";
-    public String uploader_avatar_url = "";
+    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;
+    public List<InfoItem> related_streams;
+    public boolean has_more_streams;
 }
diff --git a/playlist/PlaylistInfoItem.java b/playlist/PlaylistInfoItem.java
@@ -2,22 +2,15 @@
 
 import org.schabi.newpipe.extractor.InfoItem;
 
-public class PlaylistInfoItem implements InfoItem {
+public class PlaylistInfoItem extends InfoItem {
 
-    public int serviceId = -1;
-    public String name = "";
-    public String thumbnailUrl = "";
-    public String webPageUrl = "";
+    public String thumbnail_url;
+    /**
+     * How many streams this playlist have
+     */
+    public long streams_count = 0;
 
-    public InfoType infoType() {
-        return InfoType.PLAYLIST;
-    }
-
-    public String getTitle() {
-        return name;
-    }
-
-    public String getLink() {
-        return webPageUrl;
+    public PlaylistInfoItem() {
+        super(InfoType.PLAYLIST);
     }
 }
diff --git a/playlist/PlaylistInfoItemCollector.java b/playlist/PlaylistInfoItemCollector.java
@@ -1,6 +1,7 @@
 package org.schabi.newpipe.extractor.playlist;
 
 import org.schabi.newpipe.extractor.InfoItemCollector;
+import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
 public class PlaylistInfoItemCollector extends InfoItemCollector {
@@ -12,10 +13,16 @@ public PlaylistInfoItem extract(PlaylistInfoItemExtractor extractor) throws Pars
         final PlaylistInfoItem resultItem = new PlaylistInfoItem();
 
         resultItem.name = extractor.getPlaylistName();
-        resultItem.serviceId = getServiceId();
-        resultItem.webPageUrl = extractor.getWebPageUrl();
+        resultItem.service_id = getServiceId();
+        resultItem.url = extractor.getWebPageUrl();
+
+        try {
+            resultItem.thumbnail_url = extractor.getThumbnailUrl();
+        } catch (Exception e) {
+            addError(e);
+        }
         try {
-            resultItem.thumbnailUrl = extractor.getThumbnailUrl();
+            resultItem.streams_count = extractor.getStreamsCount();
         } catch (Exception e) {
             addError(e);
         }

diff --git a/playlist/PlaylistInfoItemExtractor.java b/playlist/PlaylistInfoItemExtractor.java
@@ -6,4 +6,5 @@ public interface PlaylistInfoItemExtractor {
     String getThumbnailUrl() throws ParsingException;
     String getPlaylistName() throws ParsingException;
     String getWebPageUrl() throws ParsingException;
+    long getStreamsCount() throws ParsingException;
 }
diff --git a/search/InfoItemSearchCollector.java b/search/InfoItemSearchCollector.java
@@ -1,7 +1,6 @@
 package org.schabi.newpipe.extractor.search;
 
 import org.schabi.newpipe.extractor.InfoItemCollector;
-import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItemCollector;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
@@ -30,15 +29,15 @@
  */
 
 public class InfoItemSearchCollector extends InfoItemCollector {
-    private String suggestion = "";
+    private String suggestion;
     private StreamInfoItemCollector streamCollector;
     private ChannelInfoItemCollector channelCollector;
 
-    SearchResult result = new SearchResult();
+    private SearchResult result = new SearchResult();
 
-    InfoItemSearchCollector(UrlIdHandler handler, int serviceId) {
+    InfoItemSearchCollector(int serviceId) {
         super(serviceId);
-        streamCollector = new StreamInfoItemCollector(handler, serviceId);
+        streamCollector = new StreamInfoItemCollector(serviceId);
         channelCollector = new ChannelInfoItemCollector(serviceId);
     }
 

diff --git a/search/SearchEngine.java b/search/SearchEngine.java
@@ -1,6 +1,5 @@
 package org.schabi.newpipe.extractor.search;
 
-import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 
 import java.io.IOException;
@@ -28,7 +27,7 @@
 
 public abstract class SearchEngine {
     public enum Filter {
-        STREAM, CHANNEL, PLAY_LIST
+        STREAM, CHANNEL, PLAYLIST
     }
 
     public static class NothingFoundException extends ExtractionException {
@@ -39,8 +38,8 @@ public NothingFoundException(String message) {
 
     private InfoItemSearchCollector collector;
 
-    public SearchEngine(UrlIdHandler urlIdHandler, int serviceId) {
-        collector = new InfoItemSearchCollector(urlIdHandler, serviceId);
+    public SearchEngine(int serviceId) {
+        collector = new InfoItemSearchCollector(serviceId);
     }
 
     protected InfoItemSearchCollector getInfoItemSearchCollector() {

diff --git a/search/SearchResult.java b/search/SearchResult.java
@@ -49,7 +49,7 @@ public static SearchResult getSearchResult(SearchEngine engine, String query,
         return result;
     }
 
-    public String suggestion = "";
+    public String suggestion;
     public List<InfoItem> resultList = new Vector<>();
     public List<Throwable> errors = new Vector<>();
 }