Merge pull request #1147 from petlyh/youtube-albums

[YouTube] Add Albums channel tab

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

@@ -445,6 +445,9 @@ private List<ListLinkHandler> getTabsForNonAgeRestrictedChannels() throws Parsin
                             case "streams":
                                 addNonVideosTab.accept(ChannelTabs.LIVESTREAMS);
                                 break;
+                            case "releases":
+                                addNonVideosTab.accept(ChannelTabs.ALBUMS);
+                                break;
                             case "playlists":
                                 addNonVideosTab.accept(ChannelTabs.PLAYLISTS);
                                 break;

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

@@ -78,6 +78,8 @@ private String getChannelTabsParameters() throws ParsingException {
                 return "EgZzaG9ydHPyBgUKA5oBAA%3D%3D";
             case ChannelTabs.LIVESTREAMS:
                 return "EgdzdHJlYW1z8gYECgJ6AA%3D%3D";
+            case ChannelTabs.ALBUMS:
+                return "EghyZWxlYXNlc_IGBQoDsgEA";
             case ChannelTabs.PLAYLISTS:
                 return "EglwbGF5bGlzdHPyBgQKAkIA";
             default:
@@ -304,7 +306,7 @@ private Optional<JsonObject> collectItem(@Nonnull final MultiInfoItemsCollector
                         richItem.getObject("reelItemRenderer"));
             } else if (richItem.has("playlistRenderer")) {
                 getCommitPlaylistConsumer(collector, channelIds,
-                        item.getObject("playlistRenderer"));
+                        richItem.getObject("playlistRenderer"));
             }
         } else if (item.has("gridVideoRenderer")) {
             getCommitVideoConsumer(collector, timeAgoParser, channelIds,

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeChannelTabLinkHandlerFactory.java

@@ -29,6 +29,8 @@ public static String getUrlSuffix(@Nonnull final String tab)
                 return "/shorts";
             case ChannelTabs.LIVESTREAMS:
                 return "/streams";
+            case ChannelTabs.ALBUMS:
+                return "/releases";
             case ChannelTabs.PLAYLISTS:
                 return "/playlists";
             default:
@@ -65,6 +67,7 @@ public String[] getAvailableContentFilter() {
                 ChannelTabs.VIDEOS,
                 ChannelTabs.SHORTS,
                 ChannelTabs.LIVESTREAMS,
+                ChannelTabs.ALBUMS,
                 ChannelTabs.PLAYLISTS
         };
     }

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelTabExtractorTest.java

@@ -112,6 +112,28 @@ static void setUp() throws IOException, ExtractionException {
         @Override public boolean expectedHasMoreItems() { return true; }
     }
 
+    static class Albums extends DefaultListExtractorTest<ChannelTabExtractor> {
+        private static YoutubeChannelTabExtractor extractor;
+
+        @BeforeAll
+        static void setUp() throws IOException, ExtractionException {
+            YoutubeTestsUtils.ensureStateless();
+            NewPipe.init(DownloaderFactory.getDownloader(RESOURCE_PATH + "albums"));
+            extractor = (YoutubeChannelTabExtractor) YouTube.getChannelTabExtractorFromId(
+                    "@Radiohead", ChannelTabs.ALBUMS);
+            extractor.fetchPage();
+        }
+
+        @Override public ChannelTabExtractor extractor() throws Exception { return extractor; }
+        @Override public StreamingService expectedService() throws Exception { return YouTube; }
+        @Override public String expectedName() throws Exception { return ChannelTabs.ALBUMS; }
+        @Override public String expectedId() throws Exception { return "UCq19-LqvG35A-30oyAiPiqA"; }
+        @Override public String expectedUrlContains() throws Exception { return "https://www.youtube.com/channel/UCq19-LqvG35A-30oyAiPiqA/releases"; }
+        @Override public String expectedOriginalUrlContains() throws Exception { return "https://www.youtube.com/@Radiohead/releases"; }
+        @Override public InfoItem.InfoType expectedInfoItemType() { return InfoItem.InfoType.PLAYLIST; }
+        @Override public boolean expectedHasMoreItems() { return true; }
+    }
+
 
     // TESTS FOR TABS OF AGE RESTRICTED CHANNELS
     // Fetching the tabs individually would use the standard tabs without fallback to

extractor/src/test/resources/org/schabi/newpipe/extractor/services/youtube/extractor/channelTabs/albums/generated_mock_0.json

@@ -0,0 +1,85 @@
+{
+  "request": {
+    "httpMethod": "GET",
+    "url": "https://www.youtube.com/sw.js",
+    "headers": {
+      "Referer": [
+        "https://www.youtube.com"
+      ],
+      "Origin": [
+        "https://www.youtube.com"
+      ],
+      "Accept-Language": [
+        "en-GB, en;q\u003d0.9"
+      ]
+    },
+    "localization": {
+      "languageCode": "en",
+      "countryCode": "GB"
+    }
+  },
+  "response": {
+    "responseCode": 200,
+    "responseMessage": "",
+    "responseHeaders": {
+      "access-control-allow-credentials": [
+        "true"
+      ],
+      "access-control-allow-origin": [
+        "https://www.youtube.com"
+      ],
+      "alt-svc": [
+        "h3\u003d\":443\"; ma\u003d2592000,h3-29\u003d\":443\"; ma\u003d2592000"
+      ],
+      "cache-control": [
+        "private, max-age\u003d0"
+      ],
+      "content-type": [
+        "text/javascript; charset\u003dutf-8"
+      ],
+      "cross-origin-opener-policy": [
+        "same-origin; report-to\u003d\"youtube_main\""
+      ],
+      "date": [
+        "Sat, 30 Dec 2023 13:43:25 GMT"
+      ],
+      "expires": [
+        "Sat, 30 Dec 2023 13:43:25 GMT"
+      ],
+      "origin-trial": [
+        "AvC9UlR6RDk2crliDsFl66RWLnTbHrDbp+DiY6AYz/PNQ4G4tdUTjrHYr2sghbkhGQAVxb7jaPTHpEVBz0uzQwkAAAB4eyJvcmlnaW4iOiJodHRwczovL3lvdXR1YmUuY29tOjQ0MyIsImZlYXR1cmUiOiJXZWJWaWV3WFJlcXVlc3RlZFdpdGhEZXByZWNhdGlvbiIsImV4cGlyeSI6MTcxOTUzMjc5OSwiaXNTdWJkb21haW4iOnRydWV9"
+      ],
+      "p3p": [
+        "CP\u003d\"This is not a P3P policy! See http://support.google.com/accounts/answer/151657?hl\u003den-GB for more info.\""
+      ],
+      "permissions-policy": [
+        "ch-ua-arch\u003d*, ch-ua-bitness\u003d*, ch-ua-full-version\u003d*, ch-ua-full-version-list\u003d*, ch-ua-model\u003d*, ch-ua-wow64\u003d*, ch-ua-form-factor\u003d*, ch-ua-platform\u003d*, ch-ua-platform-version\u003d*"
+      ],
+      "report-to": [
+        "{\"group\":\"youtube_main\",\"max_age\":2592000,\"endpoints\":[{\"url\":\"https://csp.withgoogle.com/csp/report-to/youtube_main\"}]}"
+      ],
+      "server": [
+        "ESF"
+      ],
+      "set-cookie": [
+        "YSC\u003dpk4qlD0k7qs; Domain\u003d.youtube.com; Path\u003d/; Secure; HttpOnly; SameSite\u003dnone",
+        "VISITOR_INFO1_LIVE\u003d; Domain\u003d.youtube.com; Expires\u003dSun, 04-Apr-2021 13:43:25 GMT; Path\u003d/; Secure; HttpOnly; SameSite\u003dnone",
+        "CONSENT\u003dPENDING+551; expires\u003dMon, 29-Dec-2025 13:43:25 GMT; path\u003d/; domain\u003d.youtube.com; Secure"
+      ],
+      "strict-transport-security": [
+        "max-age\u003d31536000"
+      ],
+      "x-content-type-options": [
+        "nosniff"
+      ],
+      "x-frame-options": [
+        "SAMEORIGIN"
+      ],
+      "x-xss-protection": [
+        "0"
+      ]
+    },
+    "responseBody": "\n  self.addEventListener(\u0027install\u0027, event \u003d\u003e {\n    event.waitUntil(self.skipWaiting());\n  });\n  self.addEventListener(\u0027activate\u0027, event \u003d\u003e {\n    event.waitUntil(\n      self.clients.claim().then(() \u003d\u003e self.registration.unregister()));\n  });\n  ",
+    "latestUrl": "https://www.youtube.com/sw.js"
+  }
+}