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鈥檒l occasionally send you account related emails.
Already on GitHub? Sign in to your account
[extractor/abc] Fix #6433 by add 2 re patterns #7434
Merged
Merged
Conversation
This file contains 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
instead of adding more if/else statements, I think this could be done like this diff --git a/yt_dlp/extractor/abc.py b/yt_dlp/extractor/abc.py
index 0ca76b85a..b45e4d12c 100644
--- a/yt_dlp/extractor/abc.py
+++ b/yt_dlp/extractor/abc.py
@@ -12,6 +12,7 @@
int_or_none,
parse_iso8601,
str_or_none,
+ traverse_obj,
try_get,
unescapeHTML,
update_url_query,
@@ -107,7 +108,7 @@ def _real_extract(self, url):
video = True
if mobj is None:
- mobj = re.search(r'(?P<type>)"sources": (?P<json_data>\[[^\]]+\]),', webpage)
+ mobj = re.search(r'(?P<type>)"(?:sources|files|renditions)":\s*(?P<json_data>\[[^\]]+\])', webpage)
if mobj is None:
mobj = re.search(
r'inline(?P<type>Video|Audio|YouTube)Data\.push\((?P<json_data>[^)]+)\);',
@@ -121,7 +122,7 @@ def _real_extract(self, url):
urls_info = self._parse_json(
mobj.group('json_data'), video_id, transform_source=js_to_json)
youtube = mobj.group('type') == 'YouTube'
- video = mobj.group('type') == 'Video' or urls_info[0]['contentType'] == 'video/mp4'
+ video = mobj.group('type') == 'Video' or traverse_obj(urls_info, (0, 'contentType')) == 'video/mp4'
if not isinstance(urls_info, list):
urls_info = [urls_info] |
bashonly
added
site-bug
Issue with a specific website
pending-fixes
PR has had changes requested
labels
Jun 26, 2023
That's way more better. Thank you. |
bashonly
approved these changes
Jun 26, 2023
bashonly
added
pending-review
PR needs a review
and removed
pending-fixes
PR has had changes requested
labels
Jun 26, 2023
Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>
aalsuwaidi
pushed a commit
to aalsuwaidi/yt-dlp
that referenced
this pull request
Apr 21, 2024
Closes yt-dlp#6433 Authored by: meliber
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
IMPORTANT: PRs without the template will be CLOSED
Description of your pull request and other information
ADD DESCRIPTION HERE
Fixes #6433
Template
Before submitting a pull request make sure you have:
In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under Unlicense. Check all of the following options that apply:
What is the purpose of your pull request?
Copilot Summary
馃 Generated by Copilot at 1e57797
Summary
馃帴馃啎馃И
Enhance
ABCIE
extractor to handle YouTube-embedded videos. Add a new test case foryt_dlp/extractor/abc.py
.Walkthrough
[link](https://github.com/yt-dlp/yt-dlp/pull/7434/files?diff=unified&w=0#diff-65fb45ff5464c45c0963dd9a56a6ea7b3f85fab95e15cbd3fe360391c073051bR108-R116)
)