-
-
Notifications
You must be signed in to change notification settings - Fork 543
[YouTube] Make channelId resolution follow redirects and fix YoutubeStreamInfoItemLockupExtractor building incorrect handles
#1347
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
4701c56
[YT] Build correct handle
litetex f91454d
[YT] Correctly resolve redirects when resolving channel ids
litetex b05347d
Redirection doesn't always seem to happen
litetex aa70b5a
Create ``YouTubeChannelHelperTest``
litetex 6397b2e
Fix missing paranthesis in condition and improve null-safety
TobiGr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
...src/test/java/org/schabi/newpipe/extractor/services/youtube/YouTubeChannelHelperTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package org.schabi.newpipe.extractor.services.youtube; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.ValueSource; | ||
| import org.schabi.newpipe.extractor.exceptions.ExtractionException; | ||
|
|
||
| class YouTubeChannelHelperTest implements InitYoutubeTest { | ||
|
|
||
| @ParameterizedTest | ||
| @ValueSource(strings = { | ||
| "@TheDailyShow", | ||
| "thedailyshow", | ||
| "channel/UCwWhs_6x42TyRM4Wstoq8HA", | ||
| "UCwWhs_6x42TyRM4Wstoq8HA" | ||
| }) | ||
| void resolveSuccessfulTheDailyShow(final String idOrPath) { | ||
| final String id = assertDoesNotThrow( | ||
| () -> YoutubeChannelHelper.resolveChannelId(idOrPath)); | ||
| assertEquals("UCwWhs_6x42TyRM4Wstoq8HA", id); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @ValueSource(strings = { | ||
| "@Gronkh", | ||
| "gronkh", | ||
| "channel/UCYJ61XIK64sp6ZFFS8sctxw", | ||
| "UCYJ61XIK64sp6ZFFS8sctxw" | ||
| }) | ||
| void resolveSuccessfulGronkh(final String idOrPath) { | ||
| final String id = assertDoesNotThrow( | ||
| () -> YoutubeChannelHelper.resolveChannelId(idOrPath)); | ||
| assertEquals("UCYJ61XIK64sp6ZFFS8sctxw", id); | ||
| } | ||
|
|
||
| @Test | ||
| void resolveFailNonExistingTag() { | ||
| assertThrows(ExtractionException.class, () -> YoutubeChannelHelper.resolveChannelId( | ||
| "@nonExistingHandleThatWillNeverExist15464")); | ||
|
litetex marked this conversation as resolved.
|
||
| } | ||
| } | ||
96 changes: 96 additions & 0 deletions
96
.../org/schabi/newpipe/extractor/services/youtube/youtubechannelhelper/generated_mock_0.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| { | ||
| "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-security-policy": [ | ||
| "require-trusted-types-for \u0027script\u0027" | ||
| ], | ||
| "content-security-policy-report-only": [ | ||
| "script-src \u0027unsafe-eval\u0027 \u0027self\u0027 \u0027unsafe-inline\u0027 https://www.google.com https://apis.google.com https://ssl.gstatic.com https://www.gstatic.com https://www.googletagmanager.com https://www.google-analytics.com https://*.youtube.com https://*.google.com https://*.gstatic.com https://youtube.com https://www.youtube.com https://google.com https://*.doubleclick.net https://*.googleapis.com https://www.googleadservices.com https://tpc.googlesyndication.com https://www.youtubekids.com;report-uri /cspreport/allowlist" | ||
| ], | ||
| "content-type": [ | ||
| "text/javascript; charset\u003dutf-8" | ||
| ], | ||
| "cross-origin-opener-policy": [ | ||
| "same-origin; report-to\u003d\"youtube_main\"" | ||
| ], | ||
| "date": [ | ||
| "Thu, 31 Jul 2025 09:08:16 GMT" | ||
| ], | ||
| "document-policy": [ | ||
| "include-js-call-stacks-in-crash-reports" | ||
| ], | ||
| "expires": [ | ||
| "Thu, 31 Jul 2025 09:08:16 GMT" | ||
| ], | ||
| "origin-trial": [ | ||
| "AmhMBR6zCLzDDxpW+HfpP67BqwIknWnyMOXOQGfzYswFmJe+fgaI6XZgAzcxOrzNtP7hEDsOo1jdjFnVr2IdxQ4AAAB4eyJvcmlnaW4iOiJodHRwczovL3lvdXR1YmUuY29tOjQ0MyIsImZlYXR1cmUiOiJXZWJWaWV3WFJlcXVlc3RlZFdpdGhEZXByZWNhdGlvbiIsImV4cGlyeSI6MTc1ODA2NzE5OSwiaXNTdWJkb21haW4iOnRydWV9" | ||
| ], | ||
| "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-factors\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\"}]}" | ||
| ], | ||
| "reporting-endpoints": [ | ||
| "default\u003d\"/web-reports?context\u003deJwNz3tIU3EUB3Bv3zLdnbv3d4RCDRIRimyi0ymWJhQ-Ei2DInGWOt18NKfNuzXLIsIsSaKwUmsFFaRU2gMKZFr9ERiBFT7-yJQeIiFZ1h-ZZGXnjw-Hw5dzOEfnWzEWeUCqXqqRorOd0v2jB6WidS4p43W9lLdKk1ozNWn-lib1-DVpNtIjWaI8UseYR3K890qLU17pmlqwzB5esMzL_IU62O06_OzU4ceEDg1zOlhiZFCsjJEcGbM7ZDzukuF_KGPyswy3RY_vJXokuvWonddjJj8EA50hGB4JwcbdBqS2GtDdZ0D-oAHnWcUfA779NSApTUFvlgKPTUG3Q4HsUXC5RUF8u4IsFnRdweqXCgaiVQSVqNAx80UVw1dUBN9T4RtSMfFLxebfKvaFCmgbBPoTBUrNAkmbBJrSBXx7BLYXC0yyvAqBsmqBGw0CjY2cM-tJga1nBF61cj0rMNcmYLogsOWSwNPbApF3BN71CET0Ciw9EQh6wf2QQOiowPhbgTUzAslzAp8WBCoX2T-BcwEEQzChJozwLJzQF0HoWEvwsakowsB6QkICwcwCzYShFEJpKqE-ndC1jfAokzDOYrIJD9hSDqEwl1DE9rMSZmXlzM4qWTVzMCerYy6mMQ_zssOskV3dSQjYRWhmX_YSci2Ej0U8U0yoqOAdbJEFu_m-I5wfI4SdICywvGbCVyafIqSxptOElS2EgjbC8nb-8ybf1MW_dhM-9BAy_DzTT1AGCaQPOj5993mg-mZ6tAVRxoZat-a22mIP2axGu6vWqRltznJjmatKqyordRSb4kzmuGRTSmx8XHFd3H8KrcfX\"" | ||
| ], | ||
| "server": [ | ||
| "ESF" | ||
| ], | ||
| "set-cookie": [ | ||
| "YSC\u003dYhEHSiU9_R8; Domain\u003d.youtube.com; Path\u003d/; Secure; HttpOnly; SameSite\u003dnone", | ||
| "VISITOR_INFO1_LIVE\u003d; Domain\u003d.youtube.com; Expires\u003dFri, 04-Nov-2022 09:08:16 GMT; Path\u003d/; Secure; HttpOnly; SameSite\u003dnone" | ||
| ], | ||
| "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" | ||
| } | ||
| } |
92 changes: 92 additions & 0 deletions
92
.../org/schabi/newpipe/extractor/services/youtube/youtubechannelhelper/generated_mock_1.json
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not really important, but I wonder whether the contrary is more common instead. If so, this comment should updated.