Removed likeCount and added textualVoteCount

litetex · litetex · commit 10cf08114555 · 2021-05-20T20:10:14.000+02:00
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItem.java b/extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItem.java
@@ -16,7 +16,7 @@ public class CommentsInfoItem extends InfoItem {
     private String textualUploadDate;
     @Nullable
     private DateWrapper uploadDate;
-    private int likeCount;
+    private String textualVoteCount;
     private boolean heartedByUploader;
     private boolean pinned;
 
@@ -81,12 +81,12 @@ public void setUploadDate(@Nullable DateWrapper uploadDate) {
         this.uploadDate = uploadDate;
     }
 
-    public int getLikeCount() {
-        return likeCount;
+    public String getTextualVoteCount() {
+        return textualVoteCount;
     }
 
-    public void setLikeCount(int likeCount) {
-        this.likeCount = likeCount;
+    public void setTextualVoteCount(String textualVoteCount) {
+        this.textualVoteCount = textualVoteCount;
     }
 
     public void setHeartedByUploader(boolean isHeartedByUploader) {
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemExtractor.java
@@ -4,17 +4,19 @@
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.stream.StreamExtractor;
+import org.schabi.newpipe.extractor.utils.Utils;
 
 import javax.annotation.Nullable;
 
 public interface CommentsInfoItemExtractor extends InfoItemExtractor {
-
     /**
-     * Return the like count of the comment, or -1 if it's unavailable
+     * The formatted text (e.g. 420, 4K, 4.2M) of the votes
      *
-     * @see StreamExtractor#getLikeCount()
+     * May be language dependent
      */
-    int getLikeCount() throws ParsingException;
+    default String getTextualVoteCount() throws ParsingException {
+        return Utils.EMPTY_STRING;
+    }
 
     /**
      * The text of the comment
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemsCollector.java b/extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemsCollector.java
@@ -6,7 +6,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 public class CommentsInfoItemsCollector extends InfoItemsCollector<CommentsInfoItem, CommentsInfoItemExtractor> {
 
@@ -61,7 +60,7 @@ public CommentsInfoItem extract(CommentsInfoItemExtractor extractor) throws Pars
             addError(e);
         }
         try {
-            resultItem.setLikeCount(extractor.getLikeCount());
+            resultItem.setTextualVoteCount(extractor.getTextualVoteCount());
         } catch (Exception e) {
             addError(e);
         }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampCommentsInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampCommentsInfoItemExtractor.java
@@ -4,6 +4,7 @@
 import org.schabi.newpipe.extractor.comments.CommentsInfoItemExtractor;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.localization.DateWrapper;
+import org.schabi.newpipe.extractor.utils.Utils;
 
 import javax.annotation.Nullable;
 
@@ -32,11 +33,6 @@ public String getThumbnailUrl() throws ParsingException {
         return writing.getElementsByClass("thumb").attr("src");
     }
 
-    @Override
-    public int getLikeCount() {
-        return -1;
-    }
-
     @Override
     public String getCommentText() {
         return writing.getElementsByClass("text").first().ownText();
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java
@@ -57,11 +57,6 @@ public DateWrapper getUploadDate() throws ParsingException {
         return new DateWrapper(PeertubeParsingHelper.parseDateFrom(textualUploadDate));
     }
 
-    @Override
-    public int getLikeCount() {
-        return -1;
-    }
-
     @Override
     public String getCommentText() throws ParsingException {
         final String htmlText = JsonUtils.getString(item, "text");
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudCommentsInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudCommentsInfoItemExtractor.java
@@ -69,11 +69,6 @@ public DateWrapper getUploadDate() throws ParsingException {
         return new DateWrapper(SoundcloudParsingHelper.parseDateFrom(getTextualUploadDate()));
     }
 
-    @Override
-    public int getLikeCount() {
-        return -1;
-    }
-
     @Override
     public String getName() throws ParsingException {
         return json.getObject("user").getString("permalink");
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsInfoItemExtractor.java
@@ -71,11 +71,33 @@ public DateWrapper getUploadDate() throws ParsingException {
     }
 
     @Override
-    public int getLikeCount() throws ParsingException {
+    public String getTextualVoteCount() throws ParsingException {
+        /**
+         * Example results are as of 2021-05-20:
+         * Language = English
+         * 3.3M
+         * 48K
+         * 1.4K
+         * 270K
+         * 19
+         * 6
+         *
+         * Language = German
+         * 3,3 Mio
+         * 48.189
+         * 1419
+         * 270.984
+         * 19
+         * 6
+         */
         try {
-            return json.getInt("likeCount");
+            final JsonObject voteCountObj = JsonUtils.getObject(json, "voteCount");
+            if(voteCountObj.isEmpty()) {
+                return EMPTY_STRING;
+            }
+            return getTextFromObject(voteCountObj);
         } catch (Exception e) {
-            throw new ParsingException("Could not get like count", e);
+            throw new ParsingException("Could not get vote count", e);
         }
     }
 
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampCommentsExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampCommentsExtractorTest.java
@@ -16,7 +16,6 @@
 import static org.junit.Assert.*;
 import static org.junit.Assert.assertFalse;
 import static org.schabi.newpipe.extractor.ServiceList.Bandcamp;
-import static org.schabi.newpipe.extractor.ServiceList.YouTube;
 
 public class BandcampCommentsExtractorTest {
 
@@ -46,7 +45,7 @@ public void testGetCommentsAllData() throws IOException, ExtractionException {
             assertFalse(Utils.isBlank(c.getName()));
             assertFalse(Utils.isBlank(c.getThumbnailUrl()));
             assertFalse(Utils.isBlank(c.getUrl()));
-            assertEquals(-1, c.getLikeCount());
+            assertTrue(Utils.isBlank(c.getTextualVoteCount()));
         }
     }
 }
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeCommentsExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeCommentsExtractorTest.java
@@ -75,7 +75,7 @@ public void testGetCommentsAllData() throws IOException, ExtractionException {
                 assertFalse(Utils.isBlank(c.getTextualUploadDate()));
                 assertFalse(Utils.isBlank(c.getThumbnailUrl()));
                 assertFalse(Utils.isBlank(c.getUrl()));
-                assertFalse(c.getLikeCount() != -1);
+                assertTrue(Utils.isBlank(c.getTextualVoteCount()));
             }
         }
 
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeCommentsExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeCommentsExtractorTest.java
@@ -98,7 +98,7 @@ public void testGetCommentsAllData() throws IOException, ExtractionException {
                 assertNotNull(c.getUploadDate());
                 assertFalse(Utils.isBlank(c.getThumbnailUrl()));
                 assertFalse(Utils.isBlank(c.getUrl()));
-                assertFalse(c.getLikeCount() < 0);
+                assertFalse(Utils.isBlank(c.getTextualVoteCount()));
             }
         }
 
@@ -148,7 +148,7 @@ public void testGetCommentsAllData() throws IOException, ExtractionException {
                 assertNotNull(c.getUploadDate());
                 assertFalse(Utils.isBlank(c.getThumbnailUrl()));
                 assertFalse(Utils.isBlank(c.getUrl()));
-                assertFalse(c.getLikeCount() < 0);
+                assertFalse(Utils.isBlank(c.getTextualVoteCount()));
                 if (c.getCommentId().equals("Ugga_h1-EXdHB3gCoAEC")) { // comment without text
                     assertTrue(Utils.isBlank(c.getCommentText()));
                 } else {
@@ -191,7 +191,7 @@ public void testGetCommentsAllData() throws IOException, ExtractionException {
                 assertNotNull(c.getUploadDate());
                 assertFalse(Utils.isBlank(c.getThumbnailUrl()));
                 assertFalse(Utils.isBlank(c.getUrl()));
-                assertFalse(c.getLikeCount() < 0);
+                assertFalse(Utils.isBlank(c.getTextualVoteCount()));
                 assertFalse(Utils.isBlank(c.getCommentText()));
                 if (c.isHeartedByUploader()) {
                     heartedByUploader = true;
@@ -232,7 +232,7 @@ public void testGetCommentsAllData() throws IOException, ExtractionException {
                 assertNotNull(c.getUploadDate());
                 assertFalse(Utils.isBlank(c.getThumbnailUrl()));
                 assertFalse(Utils.isBlank(c.getUrl()));
-                assertFalse(c.getLikeCount() < 0);
+                assertFalse(Utils.isBlank(c.getTextualVoteCount()));
                 assertFalse(Utils.isBlank(c.getCommentText()));
             }
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`import java.util.ArrayList;`
`8`	`8`	`import java.util.List;`
`9`		`-import java.util.Vector;`
`10`	`9`
`11`	`10`	`public class CommentsInfoItemsCollector extends InfoItemsCollector<CommentsInfoItem, CommentsInfoItemExtractor> {`
`12`	`11`
`@@ -61,7 +60,7 @@ public CommentsInfoItem extract(CommentsInfoItemExtractor extractor) throws Pars`
`61`	`60`	`addError(e);`
`62`	`61`	`}`
`63`	`62`	`try {`
`64`		`- resultItem.setLikeCount(extractor.getLikeCount());`
	`63`	`+ resultItem.setTextualVoteCount(extractor.getTextualVoteCount());`
`65`	`64`	`} catch (Exception e) {`
`66`	`65`	`addError(e);`
`67`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`import static org.junit.Assert.*;`
`17`	`17`	`import static org.junit.Assert.assertFalse;`
`18`	`18`	`import static org.schabi.newpipe.extractor.ServiceList.Bandcamp;`
`19`		`-import static org.schabi.newpipe.extractor.ServiceList.YouTube;`
`20`	`19`
`21`	`20`	`public class BandcampCommentsExtractorTest {`
`22`	`21`
`@@ -46,7 +45,7 @@ public void testGetCommentsAllData() throws IOException, ExtractionException {`
`46`	`45`	`assertFalse(Utils.isBlank(c.getName()));`
`47`	`46`	`assertFalse(Utils.isBlank(c.getThumbnailUrl()));`
`48`	`47`	`assertFalse(Utils.isBlank(c.getUrl()));`
`49`		`- assertEquals(-1, c.getLikeCount());`
	`48`	`+ assertTrue(Utils.isBlank(c.getTextualVoteCount()));`
`50`	`49`	`}`
`51`	`50`	`}`
`52`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public void testGetCommentsAllData() throws IOException, ExtractionException {`
`75`	`75`	`assertFalse(Utils.isBlank(c.getTextualUploadDate()));`
`76`	`76`	`assertFalse(Utils.isBlank(c.getThumbnailUrl()));`
`77`	`77`	`assertFalse(Utils.isBlank(c.getUrl()));`
`78`		`- assertFalse(c.getLikeCount() != -1);`
	`78`	`+ assertTrue(Utils.isBlank(c.getTextualVoteCount()));`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`