From 7dea2d0d27552d0bf3c528fb8897584c61c88ff0 Mon Sep 17 00:00:00 2001 From: AudricV <74829229+AudricV@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:31:03 +0100 Subject: [PATCH] [YouTube] Remove Channels channel tab support This tab has been removed by YouTube. --- .../youtube/extractors/YoutubeChannelExtractor.java | 3 --- .../youtube/extractors/YoutubeChannelTabExtractor.java | 8 ++------ .../linkHandler/YoutubeChannelTabLinkHandlerFactory.java | 8 +++----- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java index b7fb96261..226d3ea38 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java @@ -448,9 +448,6 @@ public class YoutubeChannelExtractor extends ChannelExtractor { case "playlists": addNonVideosTab.accept(ChannelTabs.PLAYLISTS); break; - case "channels": - addNonVideosTab.accept(ChannelTabs.CHANNELS); - break; } } }); 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 index 27524ee16..e8488d709 100644 --- 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 @@ -80,10 +80,9 @@ public class YoutubeChannelTabExtractor extends ChannelTabExtractor { return "EgdzdHJlYW1z8gYECgJ6AA%3D%3D"; case ChannelTabs.PLAYLISTS: return "EglwbGF5bGlzdHPyBgQKAkIA"; - case ChannelTabs.CHANNELS: - return "EghjaGFubmVsc_IGBAoCUgA%3D"; + default: + throw new ParsingException("Unsupported channel tab: " + name); } - throw new ParsingException("Unsupported channel tab: " + name); } @Override @@ -313,9 +312,6 @@ public class YoutubeChannelTabExtractor extends ChannelTabExtractor { } else if (item.has("gridPlaylistRenderer")) { getCommitPlaylistConsumer(collector, channelIds, item.getObject("gridPlaylistRenderer")); - } else if (item.has("gridChannelRenderer")) { - collector.commit(new YoutubeChannelInfoItemExtractor( - item.getObject("gridChannelRenderer"))); } else if (item.has("shelfRenderer")) { return collectItem(collector, item.getObject("shelfRenderer") .getObject("content"), channelIds); diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeChannelTabLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeChannelTabLinkHandlerFactory.java index e83808a63..cbfaf1fb2 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeChannelTabLinkHandlerFactory.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeChannelTabLinkHandlerFactory.java @@ -31,10 +31,9 @@ public final class YoutubeChannelTabLinkHandlerFactory extends ListLinkHandlerFa return "/streams"; case ChannelTabs.PLAYLISTS: return "/playlists"; - case ChannelTabs.CHANNELS: - return "/channels"; + default: + throw new UnsupportedTabException(tab); } - throw new UnsupportedTabException(tab); } @Override @@ -66,8 +65,7 @@ public final class YoutubeChannelTabLinkHandlerFactory extends ListLinkHandlerFa ChannelTabs.VIDEOS, ChannelTabs.SHORTS, ChannelTabs.LIVESTREAMS, - ChannelTabs.PLAYLISTS, - ChannelTabs.CHANNELS + ChannelTabs.PLAYLISTS }; } }