refactor: cleanup

ChanGu3 · ChanGu3 · commit 867695e2b974 · 2026-03-17T14:56:48.000-07:00
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/InfoItem.java b/extractor/src/main/java/org/schabi/newpipe/extractor/InfoItem.java
@@ -77,6 +77,6 @@ public enum InfoType {
         PLAYLIST,
         CHANNEL,
         COMMENT,
-        RENDERERLIST
+        RENDERER_LIST
     }
 }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/StreamingService.java b/extractor/src/main/java/org/schabi/newpipe/extractor/StreamingService.java
@@ -307,11 +307,6 @@ public ChannelTabExtractor getChannelTabExtractorFromIdAndBaseUrl(final String i
                 id, Collections.singletonList(tab), "", baseUrl));
     }
 
-    public ChannelListExtractor getChannelListExtractor(final String url)
-            throws ExtractionException {
-        return getChannelListExtractor(getChannelTabLHFactory().fromUrl(url));
-    }
-
     public ChannelListExtractor getChannelListExtractor(final String id,
                                                         final List<String> contentFilter,
                                                         final String baseUrl)
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/channel/list/ChannelListInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/list/ChannelListInfo.java
@@ -2,7 +2,6 @@
 
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.ListInfo;
-import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
@@ -22,18 +21,6 @@ public ChannelListInfo(final int serviceId,
         super(serviceId, linkHandler, name);
     }
 
-    public static ChannelListInfo getInfo(final String url)
-            throws IOException, ExtractionException {
-        return getInfo(NewPipe.getServiceByUrl(url), url);
-    }
-
-    public static ChannelListInfo getInfo(final StreamingService service, final String url)
-            throws IOException, ExtractionException {
-        final ChannelListExtractor extractor = service.getChannelListExtractor(url);
-        extractor.fetchPage();
-        return getInfo(extractor);
-    }
-
     /**
      * Get a {@link ChannelListInfo} instance from the given service and link handler.
      *
@@ -45,7 +32,8 @@ public static ChannelListInfo getInfo(final StreamingService service, final Stri
     public static ChannelListInfo getInfo(@Nonnull final StreamingService service,
                                          @Nonnull final ListLinkHandler linkHandler)
             throws ExtractionException, IOException {
-        final ChannelListExtractor extractor = service.getChannelListExtractor(linkHandler);
+        final ChannelListExtractor extractor = service
+                .getChannelListExtractor(linkHandler);
         extractor.fetchPage();
 
         return getInfo(extractor);
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/channel/tabs/ChannelTabs.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/tabs/ChannelTabs.java
@@ -5,7 +5,7 @@
  */
 public final class ChannelTabs {
 
-    public static final String FEATURED = "featured"; // Home Tab
+    public static final String FEATURED = "featured";
     public static final String VIDEOS = "videos";
     public static final String TRACKS = "tracks";
     public static final String SHORTS = "shorts";
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/channel/tabs/rendererlist/RendererListInfoItem.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/tabs/rendererlist/RendererListInfoItem.java
@@ -10,7 +10,7 @@ public class RendererListInfoItem extends InfoItem {
     private String rendererListItemType;
 
     public RendererListInfoItem(final int serviceId, final String url, final String name) {
-        super(InfoType.RENDERERLIST, serviceId, url, name);
+        super(InfoType.RENDERER_LIST, serviceId, url, name);
     }
 
     public String getTitle() {
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/channel/tabs/rendererlist/RendererListInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/tabs/rendererlist/RendererListInfoItemExtractor.java
@@ -7,14 +7,14 @@
 public interface RendererListInfoItemExtractor extends InfoItemExtractor {
 
     /**
-     * Get the list link handler of the rendererlist
+     * Get the list link handler of the renderer list item for extraction
      * @return the ListLinkHandler of the list
      */
     ListLinkHandler getListLinkHandler() throws ParsingException;
 
     /**
-     * Get the item type that exist in the renderer list
-     * @return the item type of the render list
+     * Gets the item type as a string for this render list item
+     * @return the item type of the render list string
      */
     String getRendererListItemType() throws ParsingException;
 
@@ -42,8 +42,11 @@ public interface RendererListInfoItemExtractor extends InfoItemExtractor {
      */
     boolean isUploaderVerified() throws ParsingException;
 
-
-    static String getRendererListIndexContentFilter(final int index) {
+    /**
+     * Creates a render list index that can be used in the content filter
+     * @return render list index string as a content filter
+     */
+    static String createIndexContentFilter(final int index) {
         return "rendererlist_index=" + index;
     }
 }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/channel/tabs/rendererlist/RendererListInfoItemsCollector.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/tabs/rendererlist/RendererListInfoItemsCollector.java
@@ -17,24 +17,23 @@ public RendererListInfoItem extract(final RendererListInfoItemExtractor extracto
         final RendererListInfoItem resultItem = new RendererListInfoItem(
                     getServiceId(), extractor.getUrl(), extractor.getName());
 
-            try {
-                resultItem.setTitle(extractor.getName());
-            } catch (final Exception e) {
-                addError(e);
-            }
-            try {
-                resultItem.setListLinkHandler(extractor.getListLinkHandler());
-            } catch (final Exception e) {
-                addError(e);
-            }
+        try {
+            resultItem.setTitle(extractor.getName());
+        } catch (final Exception e) {
+            addError(e);
+        }
+        try {
+            resultItem.setListLinkHandler(extractor.getListLinkHandler());
+        } catch (final Exception e) {
+            addError(e);
+        }
         try {
             resultItem.setRendererListItemType(extractor.getRendererListItemType());
         } catch (final Exception e) {
             addError(e);
         }
 
-
-            return resultItem;
+        return resultItem;
     }
 }
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
@@ -256,12 +256,12 @@ public static int parseDurationString(@Nonnull final String input)
     }
 
     /**
-     * Parses a param string expecting the string to match exactly rendererlist_index={index}
+     * Parses a param format string expecting the string to match exactly rendererlist_index={index}
      *
-     * @return the index of the rendererlist
-     * @throws ParsingException when the url does not match the expected format
+     * @return the index of the renderer list
+     * @throws ParsingException when the string does not match the expected format
      */
-    public static int parseRendererListIndexParam(@Nonnull final String input)
+    public static int parseParamFormatRendererListIndex(@Nonnull final String input)
             throws ParsingException, NumberFormatException {
         final Pattern pattern = Pattern.compile("^rendererlist_index=(\\d+)$");
         final Matcher matcher = pattern.matcher(input);
@@ -313,12 +313,12 @@ public static Optional<JsonObject> getTabData(@Nonnull final JsonObject jsonResp
     }
 
     /**
-     * Parses a json response of the channel tab featured gets the renderlist data
+     * Parses a json response of the channel tab featured gets the render list data
      *
      * @return the data of the renderer list
      */
-    public static JsonObject getRendererListData(@Nonnull final JsonObject jsonResponse,
-                                          final int rendererListIndex) {
+    public static JsonObject getFeaturedTabRendererListData(@Nonnull final JsonObject jsonResponse,
+                                                            final int rendererListIndex) {
         final Optional<JsonObject> tab = getTabData(jsonResponse, ChannelTabs.FEATURED);
 
         return tab.map(jsonObject -> jsonObject.getObject("content")
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelTabExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelTabExtractor.java
@@ -517,7 +517,10 @@ private void commitRendererList(@Nonnull final MultiInfoItemsCollector collector
         if (jsonObject.getObject("content")
                 .getObject("horizontalListRenderer").getArray("items").getObject(0)
                 .has("gridChannelRenderer")) {
-            listItemsType = YoutubeShelfRendererListInfoItemExtractor.FEATURED_CHANNEL_LIST;
+            listItemsType = YoutubeShelfRendererListInfoItemExtractor
+                    .retrieveRendererListTypeString(
+                            YoutubeShelfRendererListInfoItemExtractor
+                                    .RendererListTypes.FEATURED_CHANNEL_LIST);
         }
 
         if (listItemsType != null) {
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeFeaturedChannelListExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeFeaturedChannelListExtractor.java
@@ -56,13 +56,13 @@ public YoutubeFeaturedChannelListExtractor(final StreamingService service,
                 .findFirst();
 
         if (rendererlist.isEmpty()) {
-            throw new ExtractionException("content filter for featured channels "
-                    + "must contain rendererlist_index={index}"
+            throw new ExtractionException("content filter for featured channels"
+                    + " must contain rendererlist_index={index}"
                     + " to extract featured channels from featured tab");
         }
 
         this.rendererListIndex =  YoutubeParsingHelper
-                .parseRendererListIndexParam(rendererlist.get());
+                .parseParamFormatRendererListIndex(rendererlist.get());
     }
 
     @Nonnull
@@ -97,7 +97,7 @@ public void onFetchPage(@Nonnull final Downloader downloader)
         channelHeader = YoutubeChannelHelper.getChannelHeader(jsonResponse);
         channelId = data.channelId;
         jsonRendererListData = YoutubeParsingHelper
-                .getRendererListData(this.jsonResponse, this.rendererListIndex);
+                .getFeaturedTabRendererListData(this.jsonResponse, this.rendererListIndex);
 
         if (!this.jsonRendererListData.getObject("shelfRenderer")
                 .getObject("content")
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeShelfRendererListInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeShelfRendererListInfoItemExtractor.java
@@ -19,13 +19,27 @@
 
 public class YoutubeShelfRendererListInfoItemExtractor implements RendererListInfoItemExtractor {
 
-    public static final String FEATURED_CHANNEL_LIST = "FEATURED_CHANNELS_LIST";
+    public static final String FEATURED_CHANNEL_LIST_STRING = "FEATURED_CHANNELS_LIST";
+    public enum RendererListTypes {
+        FEATURED_CHANNEL_LIST,
+    }
+
+    public static String retrieveRendererListTypeString(final RendererListTypes type) {
+        switch (type) {
+            case FEATURED_CHANNEL_LIST:
+                return FEATURED_CHANNEL_LIST_STRING;
+            default:
+                return null; // defaults to nothing
+        }
+    }
     private final JsonObject rendererListInfoItem;
     private final String rendererListItemType;
 
     private final String id;
     private final List<String> contentFilter;
 
+    private static final String TITLE = "title";
+
     public YoutubeShelfRendererListInfoItemExtractor(final JsonObject rendererListInfoItem,
                                                      final String rendererListItemType,
                                                      final String id,
@@ -36,19 +50,19 @@ public YoutubeShelfRendererListInfoItemExtractor(final JsonObject rendererListIn
         this.contentFilter = List.of(
                 tab,
                 RendererListInfoItemExtractor
-                        .getRendererListIndexContentFilter(index));
+                        .createIndexContentFilter(index));
         this.id = id;
     }
 
 
     @Override
     public String getName() throws ParsingException {
         try {
-            final JsonObject title = this.rendererListInfoItem.getObject("title");
+            final JsonObject title = this.rendererListInfoItem.getObject(TITLE);
             String name = getTextFromObject(title);
 
-            if (name == null && this.rendererListInfoItem.isString("title")) {
-                name = this.rendererListInfoItem.getString("title");
+            if (name == null && this.rendererListInfoItem.isString(TITLE)) {
+                name = this.rendererListInfoItem.getString(TITLE);
             }
 
             return name;
@@ -60,14 +74,14 @@ public String getName() throws ParsingException {
     @Override
     public String getUrl() throws ParsingException {
         try {
-            final String url = getUrlFromObject(rendererListInfoItem.getObject("title"));
+            final String url = getUrlFromObject(rendererListInfoItem.getObject(TITLE));
 
             if (url == null) {
                 final String uploaderTabURL = getUploaderTabUrl();
 
                 if (uploaderTabURL != null && contentFilter.get(1) != null) {
                     final int index = YoutubeParsingHelper
-                            .parseRendererListIndexParam(contentFilter.get(1));
+                            .parseParamFormatRendererListIndex(contentFilter.get(1));
                     // virtual url since they are a list
                     return uploaderTabURL + "/rendererlist/" + index;
                 }
@@ -92,7 +106,7 @@ public ListLinkHandler getListLinkHandler() throws ParsingException {
     }
 
     @Override
-    public String getRendererListItemType() throws ParsingException {
+    public String getRendererListItemType() {
         return this.rendererListItemType;
     }
 
@@ -112,18 +126,28 @@ public String getUploaderTabUrl() throws ParsingException {
         }
     }
 
+    /** Will not exist in {@linkplain #rendererListInfoItem}
+     * Must Be overridden in Anonymous Inner Class Overriding
+     */
     @Override
     public String getUploaderName() throws ParsingException {
-        return null; // will not exist in rendererListInfoItem
+        return null;
     }
 
+
+    /** Will not exist in {@linkplain #rendererListInfoItem}
+     * Must Be overridden in Anonymous Inner Class Overriding
+     */
     @Override
     public String getUploaderUrl() throws ParsingException {
-        return null; // will not exist in rendererListInfoItem
+        return null;
     }
 
+    /** Will not exist in {@linkplain #rendererListInfoItem}
+     * Must Be overridden in Anonymous Inner Class Overriding
+     */
     @Override
     public boolean isUploaderVerified() throws ParsingException {
-        return false; // will not exist in rendererListInfoItem
+        return false;
     }
 }
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelTabExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelTabExtractorTest.java
@@ -27,7 +27,7 @@ protected ChannelTabExtractor createExtractor() throws Exception {
         @Override public String expectedId() throws Exception { return "UCXuqSBlHAE6Xw-yeJA0Tunw"; }
         @Override public String expectedUrlContains() throws Exception { return "https://www.youtube.com/channel/UCXuqSBlHAE6Xw-yeJA0Tunw/featured"; }
         @Override public String expectedOriginalUrlContains() throws Exception { return "https://www.youtube.com/user/LinusTechTips/featured"; }
-        @Override public InfoItem.InfoType expectedInfoItemType() { return InfoItem.InfoType.RENDERERLIST; }
+        @Override public InfoItem.InfoType expectedInfoItemType() { return InfoItem.InfoType.RENDERER_LIST; }
         @Override public boolean expectedHasMoreItems() { return false; }
     }
 
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeFeaturedChannelListExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeFeaturedChannelListExtractorTest.java
@@ -10,19 +10,13 @@
 import static org.schabi.newpipe.extractor.services.DefaultTests.defaultTestRelatedItems;
 
 import org.junit.jupiter.api.Test;
-import org.schabi.newpipe.extractor.ExtractorAsserts;
 import org.schabi.newpipe.extractor.channel.list.ChannelListExtractor;
 import org.schabi.newpipe.extractor.channel.tabs.rendererlist.RendererListInfoItemExtractor;
-import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.services.BaseListExtractorTest;
-import org.schabi.newpipe.extractor.services.BasePlaylistExtractorTest;
 import org.schabi.newpipe.extractor.services.DefaultSimpleExtractorTest;
 import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeFeaturedChannelListExtractor;
-import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubePlaylistExtractor;
-import org.schabi.newpipe.extractor.stream.Description;
 
 import java.util.List;
 
@@ -31,15 +25,15 @@
  */
 public class YoutubeFeaturedChannelListExtractorTest {
 
-    public static class NotAvailable implements InitYoutubeTest {
+    static class NotAvailable implements InitYoutubeTest {
 
         @Test
-        void invalidIndex() throws Exception {
+        void invalidRendererListExtractorIndex() throws Exception {
             final ChannelListExtractor extractor =
                     YouTube.getChannelListExtractor(
                             "user/LinusTechTips",
                             List.of("featured", RendererListInfoItemExtractor
-                                    .getRendererListIndexContentFilter(2)),
+                                    .createIndexContentFilter(2)),
                             "https://www.youtube.com");
             assertThrows(ExtractionException.class, extractor::fetchPage);
         }
@@ -53,13 +47,15 @@ protected YoutubeFeaturedChannelListExtractor createExtractor() throws Exception
             return (YoutubeFeaturedChannelListExtractor) YouTube.getChannelListExtractor(
                     this.idForExtraction(),
                     List.of("featured", RendererListInfoItemExtractor
-                            .getRendererListIndexContentFilter(this.rendererListIndexForExtraction())),
+                            .createIndexContentFilter(this.rendererListIndexForExtraction())),
                     "https://www.youtube.com");
         }
 
         protected abstract int rendererListIndexForExtraction();
 
         protected abstract String idForExtraction();
+
+
     }
 
     public static class LinusTechTips extends YoutubeFeaturedChannelListExtractorTest.Base {

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,6 @@ public enum InfoType {`
`77`	`77`	`PLAYLIST,`
`78`	`78`	`CHANNEL,`
`79`	`79`	`COMMENT,`
`80`		`- RENDERERLIST`
	`80`	`+ RENDERER_LIST`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class RendererListInfoItem extends InfoItem {`
`10`	`10`	`private String rendererListItemType;`
`11`	`11`
`12`	`12`	`public RendererListInfoItem(final int serviceId, final String url, final String name) {`
`13`		`- super(InfoType.RENDERERLIST, serviceId, url, name);`
	`13`	`+ super(InfoType.RENDERER_LIST, serviceId, url, name);`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public String getTitle() {`