forked from yt-dlp/yt-dlp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'yt-dlp:master' into master
- Loading branch information
Showing
25 changed files
with
616 additions
and
132 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| name: Anti-Spam | ||
| on: | ||
| issues: | ||
| types: [opened] | ||
|
|
||
| permissions: | ||
| issues: write | ||
|
|
||
| jobs: | ||
| lockdown: | ||
| name: Issue Lockdown | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: "Lock new issue" | ||
| env: | ||
| GH_TOKEN: ${{ github.token }} | ||
| ISSUE_NUMBER: ${{ github.event.issue.number }} | ||
| REPOSITORY: ${{ github.repository }} | ||
| run: | | ||
| gh issue lock "${ISSUE_NUMBER}" -r too_heated -R "${REPOSITORY}" |
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| from .common import InfoExtractor | ||
| from ..utils import ( | ||
| determine_ext, | ||
| int_or_none, | ||
| parse_duration, | ||
| parse_iso8601, | ||
| url_or_none, | ||
| ) | ||
| from ..utils.traversal import traverse_obj | ||
|
|
||
|
|
||
| class KikaIE(InfoExtractor): | ||
| IE_DESC = 'KiKA.de' | ||
| _VALID_URL = r'https?://(?:www\.)?kika\.de/[\w/-]+/videos/(?P<id>[a-z-]+\d+)' | ||
| _GEO_COUNTRIES = ['DE'] | ||
|
|
||
| _TESTS = [{ | ||
| 'url': 'https://www.kika.de/logo/videos/logo-vom-samstag-einunddreissig-august-zweitausendvierundzwanzig-100', | ||
| 'md5': 'fbfc8da483719ef06f396e5e5b938c69', | ||
| 'info_dict': { | ||
| 'id': 'logo-vom-samstag-einunddreissig-august-zweitausendvierundzwanzig-100', | ||
| 'ext': 'mp4', | ||
| 'upload_date': '20240831', | ||
| 'timestamp': 1725126600, | ||
| 'season_number': 2024, | ||
| 'modified_date': '20240831', | ||
| 'episode': 'Episode 476', | ||
| 'episode_number': 476, | ||
| 'season': 'Season 2024', | ||
| 'duration': 634, | ||
| 'title': 'logo! vom Samstag, 31. August 2024', | ||
| 'modified_timestamp': 1725129983, | ||
| }, | ||
| }, { | ||
| 'url': 'https://www.kika.de/kaltstart/videos/video92498', | ||
| 'md5': '710ece827e5055094afeb474beacb7aa', | ||
| 'info_dict': { | ||
| 'id': 'video92498', | ||
| 'ext': 'mp4', | ||
| 'title': '7. Wo ist Leo?', | ||
| 'description': 'md5:fb48396a5b75068bcac1df74f1524920', | ||
| 'duration': 436, | ||
| 'timestamp': 1702926876, | ||
| 'upload_date': '20231218', | ||
| 'episode_number': 7, | ||
| 'modified_date': '20240319', | ||
| 'modified_timestamp': 1710880610, | ||
| 'episode': 'Episode 7', | ||
| 'season_number': 1, | ||
| 'season': 'Season 1', | ||
| }, | ||
| }, { | ||
| 'url': 'https://www.kika.de/bernd-das-brot/astrobrot/videos/video90088', | ||
| 'md5': 'ffd1b700d7de0a6616a1d08544c77294', | ||
| 'info_dict': { | ||
| 'id': 'video90088', | ||
| 'ext': 'mp4', | ||
| 'upload_date': '20221102', | ||
| 'timestamp': 1667390580, | ||
| 'duration': 197, | ||
| 'modified_timestamp': 1711093771, | ||
| 'episode_number': 8, | ||
| 'title': 'Es ist nicht leicht, ein Astrobrot zu sein', | ||
| 'modified_date': '20240322', | ||
| 'description': 'md5:d3641deaf1b5515a160788b2be4159a9', | ||
| 'season_number': 1, | ||
| 'episode': 'Episode 8', | ||
| 'season': 'Season 1', | ||
| }, | ||
| }] | ||
|
|
||
| def _real_extract(self, url): | ||
| video_id = self._match_id(url) | ||
|
|
||
| doc = self._download_json(f'https://www.kika.de/_next-api/proxy/v1/videos/{video_id}', video_id) | ||
| video_assets = self._download_json(doc['assets']['url'], video_id) | ||
|
|
||
| subtitles = {} | ||
| if ttml_resource := url_or_none(video_assets.get('videoSubtitle')): | ||
| subtitles['de'] = [{ | ||
| 'url': ttml_resource, | ||
| 'ext': 'ttml', | ||
| }] | ||
| if webvtt_resource := url_or_none(video_assets.get('webvttUrl')): | ||
| subtitles.setdefault('de', []).append({ | ||
| 'url': webvtt_resource, | ||
| 'ext': 'vtt', | ||
| }) | ||
|
|
||
| return { | ||
| 'id': video_id, | ||
| 'formats': list(self._extract_formats(video_assets, video_id)), | ||
| 'subtitles': subtitles, | ||
| **traverse_obj(doc, { | ||
| 'title': ('title', {str}), | ||
| 'description': ('description', {str}), | ||
| 'timestamp': ('date', {parse_iso8601}), | ||
| 'modified_timestamp': ('modificationDate', {parse_iso8601}), | ||
| 'duration': (( | ||
| ('durationInSeconds', {int_or_none}), | ||
| ('duration', {parse_duration})), any), | ||
| 'episode_number': ('episodeNumber', {int_or_none}), | ||
| 'season_number': ('season', {int_or_none}), | ||
| }), | ||
| } | ||
|
|
||
| def _extract_formats(self, media_info, video_id): | ||
| for media in traverse_obj(media_info, ('assets', lambda _, v: url_or_none(v['url']))): | ||
| stream_url = media['url'] | ||
| ext = determine_ext(stream_url) | ||
| if ext == 'm3u8': | ||
| yield from self._extract_m3u8_formats( | ||
| stream_url, video_id, 'mp4', m3u8_id='hls', fatal=False) | ||
| else: | ||
| yield { | ||
| 'url': stream_url, | ||
| 'format_id': ext, | ||
| **traverse_obj(media, { | ||
| 'width': ('frameWidth', {int_or_none}), | ||
| 'height': ('frameHeight', {int_or_none}), | ||
| # NB: filesize is 0 if unknown, bitrate is -1 if unknown | ||
| 'filesize': ('fileSize', {int_or_none}, {lambda x: x or None}), | ||
| 'abr': ('bitrateAudio', {int_or_none}, {lambda x: None if x == -1 else x}), | ||
| 'vbr': ('bitrateVideo', {int_or_none}, {lambda x: None if x == -1 else x}), | ||
| }), | ||
| } |
Oops, something went wrong.