[tf1] fix wat id extraction (closes ytdl-org#21365) #21372
Closed
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 12, 2019
youtube_dl/extractor/tf1.py
Outdated
| }] | ||
|
|
||
| def _real_extract(self, url): | ||
| video_id = self._match_id(url) | ||
| webpage = self._download_webpage(url, video_id) | ||
| wat_id = self._html_search_regex( | ||
| r'(["\'])(?:https?:)?//www\.wat\.tv/embedframe/.*?(?P<id>\d{8})\1', | ||
| r'"streamId":"(?P<id>\d{8})"', |
There was a problem hiding this comment.
- Do not remove the old pattern.
- Relax regex.
There was a problem hiding this comment.
What should I do with the old pattern? Comment it out?
There was a problem hiding this comment.
No. As already said you must keep the old pattern along with the new.
dstftw
requested changes
Jun 12, 2019
dstftw
requested changes
Jun 12, 2019
dstftw
requested changes
Jun 12, 2019
dstftw
requested changes
Jun 13, 2019
youtube_dl/extractor/tf1.py
Outdated
| }] | ||
|
|
||
| def _real_extract(self, url): | ||
| video_id = self._match_id(url) | ||
| webpage = self._download_webpage(url, video_id) | ||
| slug = self._search_regex( | ||
| r'(?<=/)(?P<slug>[^/]+)(?=\.html$)', | ||
| url, 'slug', group='slug', default='') |
There was a problem hiding this comment.
It's already extracted as video_id.
|
Can we have this merged? |
dstftw
requested changes
Jun 18, 2019
| r'(["\'])(?:https?:)?//www\.wat\.tv/embedframe/.*?(?P<id>\d{8})\1', | ||
| webpage, 'wat id', group='id') | ||
| vids_data_string = self._html_search_regex( | ||
| r'<script>\s*window\.__APOLLO_STATE__\s*=\s*(?P<vids_data_string>\{.*?\})\s*;?\s*</script>', |
There was a problem hiding this comment.
- Remove script tags, it's unique enough without them.
- Do not use named group when there is only one group.
- Curly braces don't need escaping.
- Do not capture empty dict.
| if vids_data_string is not None: | ||
| vids_data = self._parse_json( | ||
| vids_data_string, video_id, | ||
| transform_source=js_to_json) |
| vids_data = self._parse_json( | ||
| vids_data_string, video_id, | ||
| transform_source=js_to_json) | ||
| video_data = [v for v in vids_data.values() |
There was a problem hiding this comment.
video_data is totally useless. Write directly to id variable when found.
| vids_data_string, video_id, | ||
| transform_source=js_to_json) | ||
| video_data = [v for v in vids_data.values() | ||
| if 'slug' in v and v['slug'] == video_id] |
There was a problem hiding this comment.
vmay not be dict.v.get('slug').
|
What's missing to get this merged? |
meunierd
referenced
this pull request
in meunierd/youtube-dl
Dec 27, 2019
meunierd
referenced
this pull request
in meunierd/youtube-dl
Feb 13, 2020
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
Explanation of your pull request in arbitrary form goes here. Please make sure the description explains the purpose and effect of your pull request and is worded well enough to be understood. Provide as much context and examples as possible.