Add parent channel info to StreamExtractor: name, url & avatar url

Author: Royosef

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCStreamExtractor.java

@@ -112,7 +112,25 @@ public String getUploaderAvatarUrl() {
 
     @Nonnull
     @Override
-    public String getDashMpdUrl() {
+    public String getParentChannelUrl() throws ParsingException {
+        return "";
+    }
+
+    @Nonnull
+    @Override
+    public String getParentChannelName() throws ParsingException {
+        return "";
+    }
+
+    @Nonnull
+    @Override
+    public String getParentChannelAvatarUrl() throws ParsingException {
+        return "";
+    }
+
+    @Nonnull
+    @Override
+    public String getDashMpdUrl() throws ParsingException {
         return "";
     }
 

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

@@ -75,6 +75,21 @@ public String getDescription() throws ParsingException {
         }
     }
 
+    @Override
+    public String getParentChannelName() throws ParsingException {
+        return "";
+    }
+
+    @Override
+    public String getParentChannelUrl() throws ParsingException {
+        return "";
+    }
+
+    @Override
+    public String getParentChannelAvatarUrl() throws ParsingException {
+        return "";
+    }
+
     @Override
     public InfoItemsPage<StreamInfoItem> getInitialPage() throws IOException, ExtractionException {
         super.fetchPage();

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

@@ -147,6 +147,29 @@ public String getUploaderAvatarUrl() throws ParsingException {
         return baseUrl + value;
     }
 
+    @Override
+    public String getParentChannelUrl() throws ParsingException {
+        return JsonUtils.getString(json, "channel.url");
+    }
+
+    @Nonnull
+    @Override
+    public String getParentChannelName() throws ParsingException {
+        return JsonUtils.getString(json, "channel.displayName");
+    }
+
+    @Nonnull
+    @Override
+    public String getParentChannelAvatarUrl() throws ParsingException {
+        String value;
+        try {
+            value = JsonUtils.getString(json, "channel.avatar.path");
+        } catch (Exception e) {
+            value = "/client/assets/images/default-avatar.png";
+        }
+        return baseUrl + value;
+    }
+
     @Override
     public String getDashMpdUrl() throws ParsingException {
         return "";

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamExtractor.java

@@ -142,6 +142,24 @@ public String getUploaderAvatarUrl() {
         return SoundcloudParsingHelper.getAvatarUrl(track);
     }
 
+    @Nonnull
+    @Override
+    public String getParentChannelUrl() throws ParsingException {
+        return "";
+    }
+
+    @Nonnull
+    @Override
+    public String getParentChannelName() throws ParsingException {
+        return "";
+    }
+
+    @Nonnull
+    @Override
+    public String getParentChannelAvatarUrl() throws ParsingException {
+        return "";
+    }
+
     @Nonnull
     @Override
     public String getDashMpdUrl() {

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

@@ -352,6 +352,24 @@ public String getUploaderAvatarUrl() throws ParsingException {
         }
     }
 
+    @Nonnull
+    @Override
+    public String getParentChannelUrl() throws ParsingException {
+        return "";
+    }
+
+    @Nonnull
+    @Override
+    public String getParentChannelName() throws ParsingException {
+        return "";
+    }
+
+    @Nonnull
+    @Override
+    public String getParentChannelAvatarUrl() throws ParsingException {
+        return "";
+    }
+
     @Nonnull
     @Override
     public String getDashMpdUrl() throws ParsingException {

extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java

@@ -178,6 +178,39 @@ public StreamExtractor(StreamingService service, LinkHandler linkHandler) {
     @Nonnull
     public abstract String getUploaderAvatarUrl() throws ParsingException;
 
+    /**
+     * The Url to the page of the parent chanel of the stream. This must not be a homepage,
+     * but the page offered by the service the extractor handles. This url will be handled by the
+     * <a href="https://teamnewpipe.github.io/documentation/03_Implement_a_service/#channel">ChannelExtractor</a>,
+     * so be sure to implement that one before you return a value here, otherwise NewPipe will crash if one selects
+     * this url.
+     *
+     * @return the url to the page of the parent chanel of the stream or an empty String
+     * @throws ParsingException
+     */
+    @Nonnull
+    public abstract String getParentChannelUrl() throws ParsingException;
+
+    /**
+     * The name of the parent chanel of the stream.
+     * If the name is not available you can simply return an empty string.
+     *
+     * @return the name of the parent chanel of the stream or an empty String
+     * @throws ParsingException
+     */
+    @Nonnull
+    public abstract String getParentChannelName() throws ParsingException;
+
+    /**
+     * The url to the image file/profile picture/avatar of the parent chanel of the stream.
+     * If the url is not available you can return an empty String.
+     *
+     * @return The url of the image file of the parent chanel or an empty String
+     * @throws ParsingException
+     */
+    @Nonnull
+    public abstract String getParentChannelAvatarUrl() throws ParsingException;
+
     /**
      * Get the dash mpd url. If you don't know what a dash MPD is you can read about it
      * <a href="https://www.brendanlong.com/the-structure-of-an-mpeg-dash-mpd.html">here</a>.

extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java

@@ -224,27 +224,44 @@ private static StreamInfo extractOptionalData(StreamInfo streamInfo, StreamExtra
             streamInfo.addError(e);
         }
         try {
-            streamInfo.setDescription(extractor.getDescription());
+            streamInfo.setUploaderAvatarUrl(extractor.getUploaderAvatarUrl());
         } catch (Exception e) {
             streamInfo.addError(e);
         }
+
         try {
-            streamInfo.setViewCount(extractor.getViewCount());
+            streamInfo.setParentChannelName(extractor.getParentChannelName());
         } catch (Exception e) {
             streamInfo.addError(e);
         }
         try {
-            streamInfo.setTextualUploadDate(extractor.getTextualUploadDate());
+            streamInfo.setParentChannelUrl(extractor.getParentChannelUrl());
         } catch (Exception e) {
             streamInfo.addError(e);
         }
         try {
-            streamInfo.setUploadDate(extractor.getUploadDate());
+            streamInfo.setParentChannelAvatarUrl(extractor.getParentChannelAvatarUrl());
         } catch (Exception e) {
             streamInfo.addError(e);
         }
+
         try {
-            streamInfo.setUploaderAvatarUrl(extractor.getUploaderAvatarUrl());
+            streamInfo.setDescription(extractor.getDescription());
+        } catch (Exception e) {
+            streamInfo.addError(e);
+        }
+        try {
+            streamInfo.setViewCount(extractor.getViewCount());
+        } catch (Exception e) {
+            streamInfo.addError(e);
+        }
+        try {
+            streamInfo.setTextualUploadDate(extractor.getTextualUploadDate());
+        } catch (Exception e) {
+            streamInfo.addError(e);
+        }
+        try {
+            streamInfo.setUploadDate(extractor.getUploadDate());
         } catch (Exception e) {
             streamInfo.addError(e);
         }
@@ -332,6 +349,10 @@ private static StreamInfo extractOptionalData(StreamInfo streamInfo, StreamExtra
     private String uploaderUrl = "";
     private String uploaderAvatarUrl = "";
 
+    private String parentChannelName = "";
+    private String parentChannelUrl = "";
+    private String parentChannelAvatarUrl = "";
+
     private List<VideoStream> videoStreams = new ArrayList<>();
     private List<AudioStream> audioStreams = new ArrayList<>();
     private List<VideoStream> videoOnlyStreams = new ArrayList<>();
@@ -486,6 +507,30 @@ public void setUploaderAvatarUrl(String uploaderAvatarUrl) {
         this.uploaderAvatarUrl = uploaderAvatarUrl;
     }
 
+    public String getParentChannelName() {
+        return parentChannelName;
+    }
+
+    public void setParentChannelName(String parentChannelName) {
+        this.parentChannelName = parentChannelName;
+    }
+
+    public String getParentChannelUrl() {
+        return parentChannelUrl;
+    }
+
+    public void setParentChannelUrl(String parentChannelUrl) {
+        this.parentChannelUrl = parentChannelUrl;
+    }
+
+    public String getParentChannelAvatarUrl() {
+        return parentChannelAvatarUrl;
+    }
+
+    public void setParentChannelAvatarUrl(String parentChannelAvatarUrl) {
+        this.parentChannelAvatarUrl = parentChannelAvatarUrl;
+    }
+
     public List<VideoStream> getVideoStreams() {
         return videoStreams;
     }