[CBSNews] Fixed regex for news videos (fixes issue #13284) #13503
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
dstftw
requested changes
Jun 27, 2017
youtube_dl/extractor/cbsnews.py
Outdated
| @@ -60,7 +75,7 @@ def _real_extract(self, url): | |||
| webpage = self._download_webpage(url, video_id) | |||
|
|
|||
| video_info = self._parse_json(self._html_search_regex( | |||
| r'(?:<ul class="media-list items" id="media-related-items"><li data-video-info|<div id="cbsNewsVideoPlayer" data-video-player-options)=\'({.+?})\'', | |||
| r'(?:<ul class="media-list items" id="media-related-items"[^>]+><li data-video-info|<div id="cbsNewsVideoPlayer" data-video-player-options)=\'({.+?})\'', | |||
There was a problem hiding this comment.
Breaks all videos embedded with exact <ul class="media-list items" id="media-related-items"><li data-video-info.
There was a problem hiding this comment.
Good catch. Please see the updated regex - it should now include the exact match as well. Thanks!
dstftw
requested changes
Jun 28, 2017
youtube_dl/extractor/cbsnews.py
Outdated
| @@ -60,7 +75,7 @@ def _real_extract(self, url): | |||
| webpage = self._download_webpage(url, video_id) | |||
|
|
|||
| video_info = self._parse_json(self._html_search_regex( | |||
| r'(?:<ul class="media-list items" id="media-related-items"><li data-video-info|<div id="cbsNewsVideoPlayer" data-video-player-options)=\'({.+?})\'', | |||
| r'(?:<ul class="media-list items" id="media-related-items"(?:[^>]+)?><li data-video-info|<div id="cbsNewsVideoPlayer" data-video-player-options)=\'({.+?})\'', | |||
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.
Please follow the guide below
xinto all the boxes [ ] relevant to your pull request (like that [x])Before submitting a pull request make sure you have:
In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under Unlicense. Check one of the following options:
What is the purpose of your pull request?
Description of your pull request and other information
Updated the regex for the [CBSNews] extractor to grab the appropriate JSON data for news videos - issue #13284. Apparently the source html has changed for the news pages.
Cheers,
Parmjit V.