[PeerTube] Apply changes in InfoItemExtractors

AudricV · AudricV · commit 0a6011a50ed0 · 2023-08-12T22:56:29.000+02:00
Also lower the visibility of attributes of channels and playlists InfoItems to
private.
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelInfoItemExtractor.java
@@ -1,22 +1,24 @@
 package org.schabi.newpipe.extractor.services.peertube.extractors;
 
 import com.grack.nanojson.JsonObject;
+import org.schabi.newpipe.extractor.Image;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
 import javax.annotation.Nonnull;
-import java.util.Comparator;
+import java.util.List;
+
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getAvatarsFromOwnerAccountOrVideoChannelObject;
 
 public class PeertubeChannelInfoItemExtractor implements ChannelInfoItemExtractor {
 
-    final JsonObject item;
-    final JsonObject uploader;
-    final String baseUrl;
+    private final JsonObject item;
+    private final String baseUrl;
+
     public PeertubeChannelInfoItemExtractor(@Nonnull final JsonObject item,
                                             @Nonnull final String baseUrl) {
         this.item = item;
-        this.uploader = item.getObject("uploader");
         this.baseUrl = baseUrl;
     }
 
@@ -30,14 +32,10 @@ public String getUrl() throws ParsingException {
         return item.getString("url");
     }
 
+    @Nonnull
     @Override
-    public String getThumbnailUrl() throws ParsingException {
-        return item.getArray("avatars").stream()
-                .filter(JsonObject.class::isInstance)
-                .map(JsonObject.class::cast)
-                .max(Comparator.comparingInt(avatar -> avatar.getInt("width")))
-                .map(avatar -> baseUrl + avatar.getString("path"))
-                .orElse(null);
+    public List<Image> getThumbnails() throws ParsingException {
+        return getAvatarsFromOwnerAccountOrVideoChannelObject(baseUrl, item);
     }
 
     @Override
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
@@ -6,21 +6,24 @@
 import com.grack.nanojson.JsonWriter;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
+import org.schabi.newpipe.extractor.Image;
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.ServiceList;
 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.services.peertube.PeertubeParsingHelper;
 import org.schabi.newpipe.extractor.stream.Description;
 import org.schabi.newpipe.extractor.utils.JsonUtils;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.nio.charset.StandardCharsets;
+import java.util.List;
 import java.util.Objects;
 
 import static org.schabi.newpipe.extractor.services.peertube.extractors.PeertubeCommentsExtractor.CHILDREN;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getAvatarsFromOwnerAccountOrVideoChannelObject;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.parseDateFrom;
 
 public class PeertubeCommentsInfoItemExtractor implements CommentsInfoItemExtractor {
     @Nonnull
@@ -52,15 +55,10 @@ public String getUrl() throws ParsingException {
         return url + "/" + getCommentId();
     }
 
+    @Nonnull
     @Override
-    public String getThumbnailUrl() {
-        String value;
-        try {
-            value = JsonUtils.getString(item, "account.avatar.path");
-        } catch (final Exception e) {
-            value = "/client/assets/images/default-avatar.png";
-        }
-        return baseUrl + value;
+    public List<Image> getThumbnails() {
+        return getUploaderAvatars();
     }
 
     @Override
@@ -76,7 +74,7 @@ public String getTextualUploadDate() throws ParsingException {
     @Override
     public DateWrapper getUploadDate() throws ParsingException {
         final String textualUploadDate = getTextualUploadDate();
-        return new DateWrapper(PeertubeParsingHelper.parseDateFrom(textualUploadDate));
+        return new DateWrapper(parseDateFrom(textualUploadDate));
     }
 
     @Override
@@ -97,15 +95,10 @@ public String getCommentId() {
         return Objects.toString(item.getLong("id"), null);
     }
 
+    @Nonnull
     @Override
-    public String getUploaderAvatarUrl() {
-        String value;
-        try {
-            value = JsonUtils.getString(item, "account.avatar.path");
-        } catch (final Exception e) {
-            value = "/client/assets/images/default-avatar.png";
-        }
-        return baseUrl + value;
+    public List<Image> getUploaderAvatars() {
+        return getAvatarsFromOwnerAccountOrVideoChannelObject(baseUrl, item.getObject("account"));
     }
 
     @Override
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubePlaylistInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubePlaylistInfoItemExtractor.java
@@ -2,19 +2,22 @@
 
 import com.grack.nanojson.JsonObject;
 
+import org.schabi.newpipe.extractor.Image;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItemExtractor;
 import org.schabi.newpipe.extractor.stream.Description;
 
 import javax.annotation.Nonnull;
+import java.util.List;
 
 import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getThumbnailsFromPlaylistOrVideoItem;
 
-public class PeertubePlaylistInfoItemExtractor implements PlaylistInfoItemExtractor  {
+public class PeertubePlaylistInfoItemExtractor implements PlaylistInfoItemExtractor {
 
-    final JsonObject item;
-    final JsonObject uploader;
-    final String baseUrl;
+    private final JsonObject item;
+    private final JsonObject uploader;
+    private final String baseUrl;
 
     public PeertubePlaylistInfoItemExtractor(@Nonnull final JsonObject item,
                                              @Nonnull final String baseUrl) {
@@ -33,9 +36,10 @@ public String getUrl() throws ParsingException {
         return item.getString("url");
     }
 
+    @Nonnull
     @Override
-    public String getThumbnailUrl() throws ParsingException {
-        return baseUrl + item.getString("thumbnailPath");
+    public List<Image> getThumbnails() throws ParsingException {
+        return getThumbnailsFromPlaylistOrVideoItem(baseUrl, item);
     }
 
     @Override
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamInfoItemExtractor.java
@@ -1,15 +1,20 @@
 package org.schabi.newpipe.extractor.services.peertube.extractors;
 
 import com.grack.nanojson.JsonObject;
+import org.schabi.newpipe.extractor.Image;
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.localization.DateWrapper;
-import org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.utils.JsonUtils;
 
-import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+import java.util.List;
+
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getAvatarsFromOwnerAccountOrVideoChannelObject;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getThumbnailsFromPlaylistOrVideoItem;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.parseDateFrom;
 
 public class PeertubeStreamInfoItemExtractor implements StreamInfoItemExtractor {
 
@@ -27,9 +32,10 @@ public String getUrl() throws ParsingException {
         return ServiceList.PeerTube.getStreamLHFactory().fromId(uuid, baseUrl).getUrl();
     }
 
+    @Nonnull
     @Override
-    public String getThumbnailUrl() throws ParsingException {
-        return baseUrl + JsonUtils.getString(item, "thumbnailPath");
+    public List<Image> getThumbnails() throws ParsingException {
+        return getThumbnailsFromPlaylistOrVideoItem(baseUrl, item);
     }
 
     @Override
@@ -56,14 +62,10 @@ public String getUploaderUrl() throws ParsingException {
                 .fromId("accounts/" + name + "@" + host, baseUrl).getUrl();
     }
 
-    @Nullable
+    @Nonnull
     @Override
-    public String getUploaderAvatarUrl() {
-        final JsonObject account = item.getObject("account");
-        if (account.has("avatar") && !account.isNull("avatar")) {
-            return baseUrl + account.getObject("avatar").getString("path");
-        }
-        return null;
+    public List<Image> getUploaderAvatars() {
+        return getAvatarsFromOwnerAccountOrVideoChannelObject(baseUrl, item.getObject("account"));
     }
 
     @Override
@@ -89,7 +91,7 @@ public DateWrapper getUploadDate() throws ParsingException {
             return null;
         }
 
-        return new DateWrapper(PeertubeParsingHelper.parseDateFrom(textualUploadDate));
+        return new DateWrapper(parseDateFrom(textualUploadDate));
     }
 
     @Override
