Create InfoItemExtractor

mauriciocolli · mauriciocolli · commit 82824cdd72bf · 2017-08-11T15:21:49.000-03:00
diff --git a/src/main/java/org/schabi/newpipe/extractor/Info.java b/src/main/java/org/schabi/newpipe/extractor/Info.java
@@ -16,4 +16,9 @@ public abstract class Info implements Serializable {
     public String name;
 
     public List<Throwable> errors = new ArrayList<>();
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "[url=\"" + url + "\", name=\"" + name + "\"]";
+    }
 }
diff --git a/src/main/java/org/schabi/newpipe/extractor/InfoItem.java b/src/main/java/org/schabi/newpipe/extractor/InfoItem.java
@@ -38,4 +38,10 @@ public InfoItem(InfoType infoType) {
     public int service_id = -1;
     public String url;
     public String name;
+    public String thumbnail_url;
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "[url=\"" + url + "\", name=\"" + name + "\"]";
+    }
 }
diff --git a/src/main/java/org/schabi/newpipe/extractor/InfoItemExtractor.java b/src/main/java/org/schabi/newpipe/extractor/InfoItemExtractor.java
@@ -0,0 +1,9 @@
+package org.schabi.newpipe.extractor;
+
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
+public interface InfoItemExtractor {
+    String getName() throws ParsingException;
+    String getUrl() throws ParsingException;
+    String getThumbnailUrl() throws ParsingException;
+}
diff --git a/src/main/java/org/schabi/newpipe/extractor/StreamingService.java b/src/main/java/org/schabi/newpipe/extractor/StreamingService.java
@@ -1,10 +1,10 @@
 package org.schabi.newpipe.extractor;
 
+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.StreamExtractor;
-import org.schabi.newpipe.extractor.channel.ChannelExtractor;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java b/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java
@@ -108,5 +108,5 @@ public static ChannelInfo getInfo(ChannelExtractor extractor) throws ParsingExce
     public String banner_url;
     public String feed_url;
     public long subscriber_count = -1;
-    public String description = "";
+    public String description;
 }
diff --git a/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItem.java b/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItem.java
@@ -24,7 +24,6 @@
 
 public class ChannelInfoItem extends InfoItem {
 
-    public String thumbnail_url;
     public String description;
     public long subscriber_count = -1;
     public long stream_count = -1;
diff --git a/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemCollector.java b/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemCollector.java
@@ -32,8 +32,8 @@ public ChannelInfoItem extract(ChannelInfoItemExtractor extractor) throws Parsin
         ChannelInfoItem resultItem = new ChannelInfoItem();
         // important information
         resultItem.service_id = getServiceId();
-        resultItem.name = extractor.getChannelName();
-        resultItem.url = extractor.getWebPageUrl();
+        resultItem.name = extractor.getName();
+        resultItem.url = extractor.getUrl();
 
         // optional information
         try {
diff --git a/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemExtractor.java b/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemExtractor.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.extractor.channel;
 
+import org.schabi.newpipe.extractor.InfoItemExtractor;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
 /*
@@ -22,11 +23,9 @@
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public interface ChannelInfoItemExtractor {
-    String getThumbnailUrl() throws ParsingException;
-    String getChannelName() throws ParsingException;
-    String getWebPageUrl() throws ParsingException;
+public interface ChannelInfoItemExtractor extends InfoItemExtractor {
     String getDescription() throws ParsingException;
+
     long getSubscriberCount() throws ParsingException;
     long getStreamCount() throws ParsingException;
 }
diff --git a/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItem.java b/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItem.java
@@ -5,7 +5,6 @@
 public class PlaylistInfoItem extends InfoItem {
 
     public String uploader_name;
-    public String thumbnail_url;
     /**
      * How many streams this playlist have
      */
diff --git a/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItemCollector.java b/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItemCollector.java
@@ -11,9 +11,9 @@ public PlaylistInfoItemCollector(int serviceId) {
     public PlaylistInfoItem extract(PlaylistInfoItemExtractor extractor) throws ParsingException {
         final PlaylistInfoItem resultItem = new PlaylistInfoItem();
 
-        resultItem.name = extractor.getPlaylistName();
+        resultItem.name = extractor.getName();
         resultItem.service_id = getServiceId();
-        resultItem.url = extractor.getWebPageUrl();
+        resultItem.url = extractor.getUrl();
 
         try {
             resultItem.uploader_name = extractor.getUploaderName();
diff --git a/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItemExtractor.java b/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItemExtractor.java
@@ -1,11 +1,9 @@
 package org.schabi.newpipe.extractor.playlist;
 
+import org.schabi.newpipe.extractor.InfoItemExtractor;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
-public interface PlaylistInfoItemExtractor {
-    String getThumbnailUrl() throws ParsingException;
+public interface PlaylistInfoItemExtractor extends InfoItemExtractor {
     String getUploaderName() throws ParsingException;
-    String getPlaylistName() throws ParsingException;
-    String getWebPageUrl() throws ParsingException;
     long getStreamCount() throws ParsingException;
 }
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java
@@ -72,7 +72,7 @@ public String getFeedUrl() throws ParsingException {
 
     @Override
     public long getSubscriberCount() {
-        return user.optLong("followers_count", 0L);
+        return user.optLong("followers_count");
     }
 
     @Override
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelInfoItemExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelInfoItemExtractor.java
@@ -11,28 +11,28 @@ public SoundcloudChannelInfoItemExtractor(JSONObject searchResult) {
     }
 
     @Override
-    public String getThumbnailUrl() {
-        return searchResult.optString("avatar_url");
+    public String getName() {
+        return searchResult.getString("username");
     }
 
     @Override
-    public String getChannelName() {
-        return searchResult.getString("username");
+    public String getUrl() {
+        return searchResult.getString("permalink_url");
     }
 
     @Override
-    public String getWebPageUrl() {
-        return searchResult.getString("permalink_url");
+    public String getThumbnailUrl() {
+        return searchResult.optString("avatar_url");
     }
 
     @Override
     public long getSubscriberCount() {
-        return searchResult.optLong("followers_count", 0L);
+        return searchResult.optLong("followers_count");
     }
 
     @Override
     public long getStreamCount() {
-        return searchResult.getLong("track_count");
+        return searchResult.optLong("track_count");
     }
 
     @Override
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java
@@ -14,18 +14,18 @@ public SoundcloudStreamInfoItemExtractor(JSONObject searchResult) {
     }
 
     @Override
-    public String getWebPageUrl() {
+    public String getUrl() {
         return searchResult.getString("permalink_url");
     }
 
     @Override
-    public String getTitle() {
+    public String getName() {
         return searchResult.getString("title");
     }
 
     @Override
-    public int getDuration() {
-        return searchResult.getInt("duration") / 1000;
+    public long getDuration() {
+        return searchResult.getLong("duration") / 1000L;
     }
 
     @Override
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/ItagItem.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/ItagItem.java
@@ -3,14 +3,8 @@
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
-import static org.schabi.newpipe.extractor.MediaFormat.M4A;
-import static org.schabi.newpipe.extractor.MediaFormat.MPEG_4;
-import static org.schabi.newpipe.extractor.MediaFormat.WEBM;
-import static org.schabi.newpipe.extractor.MediaFormat.WEBMA;
-import static org.schabi.newpipe.extractor.MediaFormat.v3GPP;
-import static org.schabi.newpipe.extractor.services.youtube.ItagItem.ItagType.AUDIO;
-import static org.schabi.newpipe.extractor.services.youtube.ItagItem.ItagType.VIDEO;
-import static org.schabi.newpipe.extractor.services.youtube.ItagItem.ItagType.VIDEO_ONLY;
+import static org.schabi.newpipe.extractor.MediaFormat.*;
+import static org.schabi.newpipe.extractor.services.youtube.ItagItem.ItagType.*;
 
 public class ItagItem {
     /**
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractor.java
@@ -196,7 +196,7 @@ private void collectStreamsFrom(StreamInfoItemCollector collector, Element eleme
             if (li.select("div[class=\"feed-item-dismissable\"]").first() != null) {
                 collector.commit(new YoutubeStreamInfoItemExtractor(li) {
                     @Override
-                    public String getWebPageUrl() throws ParsingException {
+                    public String getUrl() throws ParsingException {
                         try {
                             Element el = li.select("div[class=\"feed-item-dismissable\"]").first();
                             Element dl = el.select("h3").first().select("a").first();
@@ -207,7 +207,7 @@ public String getWebPageUrl() throws ParsingException {
                     }
 
                     @Override
-                    public String getTitle() throws ParsingException {
+                    public String getName() throws ParsingException {
                         try {
                             Element el = li.select("div[class=\"feed-item-dismissable\"]").first();
                             Element dl = el.select("h3").first().select("a").first();
@@ -219,7 +219,7 @@ public String getTitle() throws ParsingException {
 
                     @Override
                     public String getUploaderName() throws ParsingException {
-                        return getName();
+                        return YoutubeChannelExtractor.this.getName();
                     }
 
                     @Override
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelInfoItemExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelInfoItemExtractor.java
@@ -46,13 +46,13 @@ public String getThumbnailUrl() throws ParsingException {
     }
 
     @Override
-    public String getChannelName() throws ParsingException {
+    public String getName() throws ParsingException {
         return el.select("a[class*=\"yt-uix-tile-link\"]").first()
                 .text();
     }
 
     @Override
-    public String getWebPageUrl() throws ParsingException {
+    public String getUrl() throws ParsingException {
         return el.select("a[class*=\"yt-uix-tile-link\"]").first()
                 .attr("abs:href");
     }
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
@@ -28,7 +28,7 @@ public class YoutubeParsingHelper {
     private YoutubeParsingHelper() {
     }
 
-    public static int parseDurationString(String input)
+    public static long parseDurationString(String input)
             throws ParsingException, NumberFormatException {
         String[] splitInput = input.split(":");
         String days = "0";
@@ -58,9 +58,9 @@ public static int parseDurationString(String input)
             default:
                 throw new ParsingException("Error duration string with unknown format: " + input);
         }
-        return ((((Integer.parseInt(days) * 24)
-                + Integer.parseInt(hours) * 60)
-                + Integer.parseInt(minutes)) * 60)
-                + Integer.parseInt(seconds);
+        return ((((Long.parseLong(days) * 24)
+                + Long.parseLong(hours) * 60)
+                + Long.parseLong(minutes)) * 60)
+                + Long.parseLong(seconds);
     }
 }
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java
@@ -205,7 +205,7 @@ public boolean isAd() throws ParsingException {
                 }
 
                 @Override
-                public String getWebPageUrl() throws ParsingException {
+                public String getUrl() throws ParsingException {
                     try {
                         return streamUrlIdHandler.getUrl(li.attr("data-video-id"));
                     } catch (Exception e) {
@@ -214,7 +214,7 @@ public String getWebPageUrl() throws ParsingException {
                 }
 
                 @Override
-                public String getTitle() throws ParsingException {
+                public String getName() throws ParsingException {
                     try {
                         return li.attr("data-title");
                     } catch (Exception e) {
@@ -223,7 +223,7 @@ public String getTitle() throws ParsingException {
                 }
 
                 @Override
-                public int getDuration() throws ParsingException {
+                public long getDuration() throws ParsingException {
                     try {
                         if (getStreamType() == StreamType.LIVE_STREAM) return -1;
 
@@ -236,7 +236,7 @@ public int getDuration() throws ParsingException {
 
                         return YoutubeParsingHelper.parseDurationString(first.text());
                     } catch (Exception e) {
-                        throw new ParsingException("Could not get Duration: " + getTitle(), e);
+                        throw new ParsingException("Could not get duration" + getUrl(), e);
                     }
                 }
 
@@ -258,7 +258,7 @@ public long getViewCount() throws ParsingException {
                 @Override
                 public String getThumbnailUrl() throws ParsingException {
                     try {
-                        return "https://i.ytimg.com/vi/" + streamUrlIdHandler.getId(getWebPageUrl()) + "/hqdefault.jpg";
+                        return "https://i.ytimg.com/vi/" + streamUrlIdHandler.getId(getUrl()) + "/hqdefault.jpg";
                     } catch (Exception e) {
                         throw new ParsingException("Could not get thumbnail url", e);
                     }
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
@@ -3,11 +3,11 @@
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.SuggestionExtractor;
 import org.schabi.newpipe.extractor.UrlIdHandler;
+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.StreamExtractor;
-import org.schabi.newpipe.extractor.channel.ChannelExtractor;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
@@ -725,12 +725,12 @@ private StreamInfoItemExtractor extractVideoPreviewInfo(final Element li) {
         return new YoutubeStreamInfoItemExtractor(li) {
 
             @Override
-            public String getWebPageUrl() throws ParsingException {
+            public String getUrl() throws ParsingException {
                 return li.select("a.content-link").first().attr("abs:href");
             }
 
             @Override
-            public String getTitle() throws ParsingException {
+            public String getName() throws ParsingException {
                 //todo: check NullPointerException causing
                 return li.select("span.title").first().text();
                 //this page causes the NullPointerException, after finding it by searching for "tjvg":
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamInfoItemExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamInfoItemExtractor.java
@@ -48,7 +48,7 @@ public boolean isAd() throws ParsingException {
     }
 
     @Override
-    public String getWebPageUrl() throws ParsingException {
+    public String getUrl() throws ParsingException {
         try {
             Element el = item.select("div[class*=\"yt-lockup-video\"").first();
             Element dl = el.select("h3").first().select("a").first();
@@ -59,7 +59,7 @@ public String getWebPageUrl() throws ParsingException {
     }
 
     @Override
-    public String getTitle() throws ParsingException {
+    public String getName() throws ParsingException {
         try {
             Element el = item.select("div[class*=\"yt-lockup-video\"").first();
             Element dl = el.select("h3").first().select("a").first();
@@ -70,13 +70,13 @@ public String getTitle() throws ParsingException {
     }
 
     @Override
-    public int getDuration() throws ParsingException {
+    public long getDuration() throws ParsingException {
         try {
             if (getStreamType() == StreamType.LIVE_STREAM) return -1;
 
             return YoutubeParsingHelper.parseDurationString(item.select("span[class*=\"video-time\"]").first().text());
         } catch (Exception e) {
-            throw new ParsingException("Could not get Duration: " + getTitle(), e);
+            throw new ParsingException("Could not get Duration: " + getUrl(), e);
         }
     }
 
@@ -116,7 +116,7 @@ public long getViewCount() throws ParsingException {
 
             input = meta.select("li").get(1).text();
         } catch (IndexOutOfBoundsException e) {
-            throw new ParsingException("Could not parse yt-lockup-meta although available: " + getTitle(), e);
+            throw new ParsingException("Could not parse yt-lockup-meta although available: " + getUrl(), e);
         }
 
         try {
diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java b/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java
diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItem.java b/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItem.java
diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemCollector.java b/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemCollector.java
diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemExtractor.java b/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemExtractor.java
diff --git a/src/main/java/org/schabi/newpipe/extractor/utils/DashMpdParser.java b/src/main/java/org/schabi/newpipe/extractor/utils/DashMpdParser.java
diff --git a/src/test/java/org/schabi/newpipe/Downloader.java b/src/test/java/org/schabi/newpipe/Downloader.java

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,9 @@ public abstract class Info implements Serializable {`
`16`	`16`	`public String name;`
`17`	`17`
`18`	`18`	`public List<Throwable> errors = new ArrayList<>();`
	`19`	`+`
	`20`	`+ @Override`
	`21`	`+ public String toString() {`
	`22`	`+ return getClass().getSimpleName() + "[url=\"" + url + "\", name=\"" + name + "\"]";`
	`23`	`+ }`
`19`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,5 +108,5 @@ public static ChannelInfo getInfo(ChannelExtractor extractor) throws ParsingExce`
`108`	`108`	`public String banner_url;`
`109`	`109`	`public String feed_url;`
`110`	`110`	`public long subscriber_count = -1;`
`111`		`- public String description = "";`
	`111`	`+ public String description;`
`112`	`112`	`}`