[CanalAlpha] Add extractor. #1655
Merged
Conversation
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
pukkandan
requested changes
Nov 16, 2021
yt_dlp/extractor/canalalpha.py
Outdated
| def _real_extract(self, url): | ||
| id = self._match_id(url) | ||
| webpage = self._download_webpage(url, id) | ||
| data_json = self._parse_json(self._search_regex(r'window\.__SERVER_STATE__\s?=\s?({(?:(?!};)[^"]|"([^"]|\\")*")+})\s?;', webpage, 'data_json'), id)['1']['data']['data'] |
yt_dlp/extractor/canalalpha.py
Outdated
Comment on lines
79
to
87
| for video in try_get(data_json, lambda x: x['video']['mp4'], expected_type=list) or []: | ||
| video_url = video.get('$url') | ||
| if video_url: | ||
| formats.append({ | ||
| 'url': video_url, | ||
| 'ext': 'mp4', | ||
| 'width': try_get(video, lambda x: x['res']['width'], expected_type=int), | ||
| 'height': try_get(video, lambda x: x['res']['height'], expected_type=int), | ||
| }) |
There was a problem hiding this comment.
I'd set formats to this before adding manifests. But not gonna force u tbh
formats = [
{...}
for video in ...
if video.get('$url')])
yt_dlp/extractor/canalalpha.py
Outdated
| 'title': data_json.get('title').strip(), | ||
| 'description': clean_html(data_json.get('longDesc') or data_json.get('shortDesc')), | ||
| 'thumbnail': data_json.get('poster'), | ||
| 'upload_date': unified_strdate(data_json.get('webPublishAt') or data_json.get('featuredAt') or data_json.get('diffusionDate')), |
yt_dlp/extractor/canalalpha.py
Outdated
| return { | ||
| 'id': id, | ||
| 'title': data_json.get('title').strip(), | ||
| 'description': clean_html(data_json.get('longDesc') or data_json.get('shortDesc')), |
pukkandan
approved these changes
Nov 16, 2021
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 yt-dlp 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
closes #1528
TODO:
Add testsImprove json regex to not break for"Parse subtitles if avilable(Not available)