[MediaCCC] Apply changes in Extractors

Also remove usage of the conference logo as the banner of a conference, as it
is a logo and not a banner.

Author: AudricV

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

@@ -7,6 +7,7 @@
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.MultiInfoItemsCollector;
+import org.schabi.newpipe.extractor.Image;
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
@@ -21,10 +22,13 @@
 import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCConferenceLinkHandlerFactory;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
 
 import javax.annotation.Nonnull;
 
+import static org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCParsingHelper.getImageListFromLogoImageUrl;
+
 public class MediaCCCConferenceExtractor extends ChannelExtractor {
     private JsonObject conferenceData;
 
@@ -33,14 +37,16 @@ public MediaCCCConferenceExtractor(final StreamingService service,
         super(service, linkHandler);
     }
 
+    @Nonnull
     @Override
-    public String getAvatarUrl() {
-        return conferenceData.getString("logo_url");
+    public List<Image> getAvatars() {
+        return getImageListFromLogoImageUrl(conferenceData.getString("logo_url"));
     }
 
+    @Nonnull
     @Override
-    public String getBannerUrl() {
-        return conferenceData.getString("logo_url");
+    public List<Image> getBanners() {
+        return Collections.emptyList();
     }
 
     @Override
@@ -68,9 +74,10 @@ public String getParentChannelUrl() {
         return "";
     }
 
+    @Nonnull
     @Override
-    public String getParentChannelAvatarUrl() {
-        return "";
+    public List<Image> getParentChannelAvatars() {
+        return Collections.emptyList();
     }
 
     @Override

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

@@ -1,11 +1,13 @@
 package org.schabi.newpipe.extractor.services.media_ccc.extractors;
 
+import static org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCParsingHelper.getThumbnailsFromLiveStreamItem;
 import static org.schabi.newpipe.extractor.stream.AudioStream.UNKNOWN_BITRATE;
 import static org.schabi.newpipe.extractor.stream.Stream.ID_UNKNOWN;
 
 import com.grack.nanojson.JsonArray;
 import com.grack.nanojson.JsonObject;
 
+import org.schabi.newpipe.extractor.Image;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.downloader.Downloader;
@@ -77,8 +79,8 @@ public String getName() throws ParsingException {
 
     @Nonnull
     @Override
-    public String getThumbnailUrl() throws ParsingException {
-        return room.getString("thumb");
+    public List<Image> getThumbnails() throws ParsingException {
+       return getThumbnailsFromLiveStreamItem(room);
     }
 
     @Nonnull

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

@@ -9,16 +9,17 @@
 import com.grack.nanojson.JsonParser;
 import com.grack.nanojson.JsonParserException;
 
+import org.schabi.newpipe.extractor.Image;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.MetaInfo;
+import org.schabi.newpipe.extractor.MultiInfoItemsCollector;
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;
 import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandler;
-import org.schabi.newpipe.extractor.MultiInfoItemsCollector;
 import org.schabi.newpipe.extractor.search.SearchExtractor;
 import org.schabi.newpipe.extractor.services.media_ccc.extractors.infoItems.MediaCCCStreamInfoItemExtractor;
 import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCConferencesListLinkHandlerFactory;
@@ -157,9 +158,10 @@ public String getUrl() {
                         return item.getUrl();
                     }
 
+                    @Nonnull
                     @Override
-                    public String getThumbnailUrl() {
-                        return item.getThumbnailUrl();
+                    public List<Image> getThumbnails() {
+                        return item.getThumbnails();
                     }
                 });
             }

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

@@ -1,5 +1,8 @@
 package org.schabi.newpipe.extractor.services.media_ccc.extractors;
 
+import static org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCParsingHelper.getImageListFromLogoImageUrl;
+import static org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCParsingHelper.getThumbnailsFromStreamItem;
+import static org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCParsingHelper.parseDateFrom;
 import static org.schabi.newpipe.extractor.stream.AudioStream.UNKNOWN_BITRATE;
 import static org.schabi.newpipe.extractor.stream.Stream.ID_UNKNOWN;
 
@@ -8,6 +11,7 @@
 import com.grack.nanojson.JsonParser;
 import com.grack.nanojson.JsonParserException;
 
+import org.schabi.newpipe.extractor.Image;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.downloader.Downloader;
@@ -51,13 +55,13 @@ public String getTextualUploadDate() {
     @Nonnull
     @Override
     public DateWrapper getUploadDate() throws ParsingException {
-        return new DateWrapper(MediaCCCParsingHelper.parseDateFrom(getTextualUploadDate()));
+        return new DateWrapper(parseDateFrom(getTextualUploadDate()));
     }
 
     @Nonnull
     @Override
-    public String getThumbnailUrl() {
-        return data.getString("thumb_url");
+    public List<Image> getThumbnails() {
+        return getThumbnailsFromStreamItem(data);
     }
 
     @Nonnull
@@ -91,8 +95,8 @@ public String getUploaderName() {
 
     @Nonnull
     @Override
-    public String getUploaderAvatarUrl() {
-        return conferenceData.getString("logo_url");
+    public List<Image> getUploaderAvatars() {
+        return getImageListFromLogoImageUrl(conferenceData.getString("logo_url"));
     }
 
     @Override