Merge pull request #310 from B0pol/soundcloudComments

Add support for soundcloud comments

Author: wb9688

extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsExtractor.java

@@ -2,13 +2,21 @@
 
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
 
+import javax.annotation.Nonnull;
+
 public abstract class CommentsExtractor extends ListExtractor<CommentsInfoItem> {
 
     public CommentsExtractor(StreamingService service, ListLinkHandler uiHandler) {
         super(service, uiHandler);
         // TODO Auto-generated constructor stub
     }
 
+    @Nonnull
+    @Override
+    public String getName() throws ParsingException {
+        return "Comments";
+    }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItem.java

@@ -9,11 +9,12 @@ public class CommentsInfoItem extends InfoItem {
 
     private String commentId;
     private String commentText;
-    private String authorName;
-    private String authorThumbnail;
-    private String authorEndpoint;
-    private String textualPublishedTime;
-    @Nullable private DateWrapper publishedTime;
+    private String uploaderName;
+    private String uploaderAvatarUrl;
+    private String uploaderUrl;
+    private String textualUploadDate;
+    @Nullable
+    private DateWrapper uploadDate;
     private int likeCount;
 
     public CommentsInfoItem(int serviceId, String url, String name) {
@@ -36,45 +37,45 @@ public void setCommentText(String commentText) {
         this.commentText = commentText;
     }
 
-    public String getAuthorName() {
-        return authorName;
+    public String getUploaderName() {
+        return uploaderName;
     }
 
-    public void setAuthorName(String authorName) {
-        this.authorName = authorName;
+    public void setUploaderName(String uploaderName) {
+        this.uploaderName = uploaderName;
     }
 
-    public String getAuthorThumbnail() {
-        return authorThumbnail;
+    public String getUploaderAvatarUrl() {
+        return uploaderAvatarUrl;
     }
 
-    public void setAuthorThumbnail(String authorThumbnail) {
-        this.authorThumbnail = authorThumbnail;
+    public void setUploaderAvatarUrl(String uploaderAvatarUrl) {
+        this.uploaderAvatarUrl = uploaderAvatarUrl;
     }
 
-    public String getAuthorEndpoint() {
-        return authorEndpoint;
+    public String getUploaderUrl() {
+        return uploaderUrl;
     }
 
-    public void setAuthorEndpoint(String authorEndpoint) {
-        this.authorEndpoint = authorEndpoint;
+    public void setUploaderUrl(String uploaderUrl) {
+        this.uploaderUrl = uploaderUrl;
     }
 
-    public String getTextualPublishedTime() {
-        return textualPublishedTime;
+    public String getTextualUploadDate() {
+        return textualUploadDate;
     }
 
-    public void setTextualPublishedTime(String textualPublishedTime) {
-        this.textualPublishedTime = textualPublishedTime;
+    public void setTextualUploadDate(String textualUploadDate) {
+        this.textualUploadDate = textualUploadDate;
     }
 
     @Nullable
-    public DateWrapper getPublishedTime() {
-        return publishedTime;
+    public DateWrapper getUploadDate() {
+        return uploadDate;
     }
 
-    public void setPublishedTime(@Nullable DateWrapper publishedTime) {
-        this.publishedTime = publishedTime;
+    public void setUploadDate(@Nullable DateWrapper uploadDate) {
+        this.uploadDate = uploadDate;
     }
 
     public int getLikeCount() {

extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemExtractor.java

@@ -3,17 +3,41 @@
 import org.schabi.newpipe.extractor.InfoItemExtractor;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.localization.DateWrapper;
+import org.schabi.newpipe.extractor.stream.StreamExtractor;
 
 import javax.annotation.Nullable;
 
 public interface CommentsInfoItemExtractor extends InfoItemExtractor {
-    String getCommentId() throws ParsingException;
+
+    /**
+     * Return the like count of the comment, or -1 if it's unavailable
+     * @see StreamExtractor#getLikeCount()
+     */
+    int getLikeCount() throws ParsingException;
+
+    /**
+     * The text of the comment
+     */
     String getCommentText() throws ParsingException;
-    String getAuthorName() throws ParsingException;
-    String getAuthorThumbnail() throws ParsingException;
-    String getAuthorEndpoint() throws ParsingException;
-    String getTextualPublishedTime() throws ParsingException;
+
+    /**
+     * The upload date given by the service, unmodified
+     * @see StreamExtractor#getTextualUploadDate()
+     */
+    String getTextualUploadDate() throws ParsingException;
+
+    /**
+     * The upload date wrapped with DateWrapper class
+     * @see StreamExtractor#getUploadDate()
+     */
     @Nullable
-    DateWrapper getPublishedTime() throws ParsingException;
-    int getLikeCount() throws ParsingException;
+    DateWrapper getUploadDate() throws ParsingException;
+
+    String getCommentId() throws ParsingException;
+
+    String getUploaderUrl() throws ParsingException;
+
+    String getUploaderName() throws ParsingException;
+
+    String getUploaderAvatarUrl() throws ParsingException;
 }

extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemsCollector.java

@@ -35,27 +35,27 @@ public CommentsInfoItem extract(CommentsInfoItemExtractor extractor) throws Pars
             addError(e);
         }
         try {
-            resultItem.setAuthorName(extractor.getAuthorName());
+            resultItem.setUploaderName(extractor.getUploaderName());
         } catch (Exception e) {
             addError(e);
         }
         try {
-            resultItem.setAuthorThumbnail(extractor.getAuthorThumbnail());
+            resultItem.setUploaderAvatarUrl(extractor.getUploaderAvatarUrl());
         } catch (Exception e) {
             addError(e);
         }
         try {
-            resultItem.setAuthorEndpoint(extractor.getAuthorEndpoint());
+            resultItem.setUploaderUrl(extractor.getUploaderUrl());
         } catch (Exception e) {
             addError(e);
         }
         try {
-            resultItem.setTextualPublishedTime(extractor.getTextualPublishedTime());
+            resultItem.setTextualUploadDate(extractor.getTextualUploadDate());
         } catch (Exception e) {
             addError(e);
         }
         try {
-            resultItem.setPublishedTime(extractor.getPublishedTime());
+            resultItem.setUploadDate(extractor.getUploadDate());
         } catch (Exception e) {
             addError(e);
         }

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsExtractor.java

@@ -33,11 +33,6 @@ public PeertubeCommentsExtractor(StreamingService service, ListLinkHandler uiHan
         super(service, uiHandler);
     }
 
-    @Override
-    public String getName() throws ParsingException {
-        return "Comments";
-    }
-
     @Override
     public InfoItemsPage<CommentsInfoItem> getInitialPage() throws IOException, ExtractionException {
         super.fetchPage();

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java

@@ -45,13 +45,13 @@ public String getName() throws ParsingException {
     }
 
     @Override
-    public String getTextualPublishedTime() throws ParsingException {
+    public String getTextualUploadDate() throws ParsingException {
         return JsonUtils.getString(item, "createdAt");
     }
 
     @Override
-    public DateWrapper getPublishedTime() throws ParsingException {
-        String textualUploadDate = getTextualPublishedTime();
+    public DateWrapper getUploadDate() throws ParsingException {
+        String textualUploadDate = getTextualUploadDate();
         return new DateWrapper(PeertubeParsingHelper.parseDateFrom(textualUploadDate));
     }
 
@@ -78,7 +78,7 @@ public String getCommentId() throws ParsingException {
     }
 
     @Override
-    public String getAuthorThumbnail() throws ParsingException {
+    public String getUploaderAvatarUrl() throws ParsingException {
         String value;
         try {
             value = JsonUtils.getString(item, "account.avatar.path");
@@ -89,12 +89,12 @@ public String getAuthorThumbnail() throws ParsingException {
     }
 
     @Override
-    public String getAuthorName() throws ParsingException {
+    public String getUploaderName() throws ParsingException {
         return JsonUtils.getString(item, "account.name") + "@" + JsonUtils.getString(item, "account.host");
     }
 
     @Override
-    public String getAuthorEndpoint() throws ParsingException {
+    public String getUploaderUrl() throws ParsingException {
         String name = JsonUtils.getString(item, "account.name");
         String host = JsonUtils.getString(item, "account.host");
         return ServiceList.PeerTube.getChannelLHFactory().fromId("accounts/" + name + "@" + host, baseUrl).getUrl();

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelper.java

@@ -15,6 +15,9 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.services.soundcloud.extractors.SoundcloudChannelInfoItemExtractor;
+import org.schabi.newpipe.extractor.services.soundcloud.extractors.SoundcloudStreamExtractor;
+import org.schabi.newpipe.extractor.services.soundcloud.extractors.SoundcloudStreamInfoItemExtractor;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
 import org.schabi.newpipe.extractor.utils.Parser;
 import org.schabi.newpipe.extractor.utils.Parser.RegexException;
@@ -86,10 +89,12 @@ static boolean checkIfHardcodedClientIdIsValid() {
         }
     }
 
-    static Calendar parseDate(String textualUploadDate) throws ParsingException {
+    public static Calendar parseDateFrom(String textualUploadDate) throws ParsingException {
         Date date;
         try {
-            date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(textualUploadDate);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+            sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
+            date = sdf.parse(textualUploadDate);
         } catch (ParseException e1) {
             try {
                 date = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss +0000").parse(textualUploadDate);
@@ -256,13 +261,13 @@ public static String getStreamsFromApi(StreamInfoItemsCollector collector, Strin
     }
 
     @Nonnull
-    static String getUploaderUrl(JsonObject object) {
+    public static String getUploaderUrl(JsonObject object) {
         String url = object.getObject("user").getString("permalink_url", EMPTY_STRING);
         return replaceHttpWithHttps(url);
     }
 
     @Nonnull
-    static String getAvatarUrl(JsonObject object) {
+    public static String getAvatarUrl(JsonObject object) {
         String url = object.getObject("user").getString("avatar_url", EMPTY_STRING);
         return replaceHttpWithHttps(url);
     }

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudService.java

@@ -10,18 +10,21 @@
 import org.schabi.newpipe.extractor.localization.ContentCountry;
 import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
 import org.schabi.newpipe.extractor.search.SearchExtractor;
+import org.schabi.newpipe.extractor.services.soundcloud.extractors.*;
+import org.schabi.newpipe.extractor.services.soundcloud.linkHandler.*;
 import org.schabi.newpipe.extractor.stream.StreamExtractor;
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 
 import java.util.List;
 
-import static java.util.Collections.singletonList;
+import static java.util.Arrays.asList;
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
+import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
 
 public class SoundcloudService extends StreamingService {
 
     public SoundcloudService(int id) {
-        super(id, "SoundCloud", singletonList(AUDIO));
+        super(id, "SoundCloud", asList(AUDIO, COMMENTS));
     }
 
     @Override
@@ -117,13 +120,13 @@ public SubscriptionExtractor getSubscriptionExtractor() {
 
     @Override
     public ListLinkHandlerFactory getCommentsLHFactory() {
-        return null;
+        return SoundcloudCommentsLinkHandlerFactory.getInstance();
     }
 
     @Override
     public CommentsExtractor getCommentsExtractor(ListLinkHandler linkHandler)
             throws ExtractionException {
-        return null;
+        return new SoundcloudCommentsExtractor(this, linkHandler);
     }
 
 }

…undcloud/SoundcloudChannelExtractor.java …tractors/SoundcloudChannelExtractor.javaextractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java renamed to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelExtractor.java extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java renamed to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelExtractor.java

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.extractor.services.soundcloud;
+package org.schabi.newpipe.extractor.services.soundcloud.extractors;
 
 import com.grack.nanojson.JsonArray;
 import com.grack.nanojson.JsonObject;
@@ -10,6 +10,7 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
+import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudParsingHelper;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
 

…/SoundcloudChannelInfoItemExtractor.java …/SoundcloudChannelInfoItemExtractor.javaextractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelInfoItemExtractor.java renamed to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelInfoItemExtractor.java extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelInfoItemExtractor.java renamed to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelInfoItemExtractor.java

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.extractor.services.soundcloud;
+package org.schabi.newpipe.extractor.services.soundcloud.extractors;
 
 import com.grack.nanojson.JsonObject;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;