forked from ytdl-org/youtube-dl
-
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.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/ytdl-org/youtube-dl: [screencastomatic] fix extraction(closes ytdl-org#11976, closes ytdl-org#24489) [palcomp3] Add new extractor(closes ytdl-org#13120) [arnes] Add new extractor(closes ytdl-org#28483) [youtube:tab] Add support for hashtag videos extraction(closes ytdl-org#28308) release 2021.04.01 [ChangeLog] Actualize [ci skip] [youtube] Setup CONSENT cookie when needed (closes ytdl-org#28604)
- Loading branch information
Showing
12 changed files
with
408 additions
and
84 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,101 @@ | ||
| # coding: utf-8 | ||
| from __future__ import unicode_literals | ||
|
|
||
| from .common import InfoExtractor | ||
| from ..compat import ( | ||
| compat_parse_qs, | ||
| compat_urllib_parse_urlparse, | ||
| ) | ||
| from ..utils import ( | ||
| float_or_none, | ||
| int_or_none, | ||
| parse_iso8601, | ||
| remove_start, | ||
| ) | ||
|
|
||
|
|
||
| class ArnesIE(InfoExtractor): | ||
| IE_NAME = 'video.arnes.si' | ||
| IE_DESC = 'Arnes Video' | ||
| _VALID_URL = r'https?://video\.arnes\.si/(?:[a-z]{2}/)?(?:watch|embed|api/(?:asset|public/video))/(?P<id>[0-9a-zA-Z]{12})' | ||
| _TESTS = [{ | ||
| 'url': 'https://video.arnes.si/watch/a1qrWTOQfVoU?t=10', | ||
| 'md5': '4d0f4d0a03571b33e1efac25fd4a065d', | ||
| 'info_dict': { | ||
| 'id': 'a1qrWTOQfVoU', | ||
| 'ext': 'mp4', | ||
| 'title': 'Linearna neodvisnost, definicija', | ||
| 'description': 'Linearna neodvisnost, definicija', | ||
| 'license': 'PRIVATE', | ||
| 'creator': 'Polona Oblak', | ||
| 'timestamp': 1585063725, | ||
| 'upload_date': '20200324', | ||
| 'channel': 'Polona Oblak', | ||
| 'channel_id': 'q6pc04hw24cj', | ||
| 'channel_url': 'https://video.arnes.si/?channel=q6pc04hw24cj', | ||
| 'duration': 596.75, | ||
| 'view_count': int, | ||
| 'tags': ['linearna_algebra'], | ||
| 'start_time': 10, | ||
| } | ||
| }, { | ||
| 'url': 'https://video.arnes.si/api/asset/s1YjnV7hadlC/play.mp4', | ||
| 'only_matching': True, | ||
| }, { | ||
| 'url': 'https://video.arnes.si/embed/s1YjnV7hadlC', | ||
| 'only_matching': True, | ||
| }, { | ||
| 'url': 'https://video.arnes.si/en/watch/s1YjnV7hadlC', | ||
| 'only_matching': True, | ||
| }, { | ||
| 'url': 'https://video.arnes.si/embed/s1YjnV7hadlC?t=123&hideRelated=1', | ||
| 'only_matching': True, | ||
| }, { | ||
| 'url': 'https://video.arnes.si/api/public/video/s1YjnV7hadlC', | ||
| 'only_matching': True, | ||
| }] | ||
| _BASE_URL = 'https://video.arnes.si' | ||
|
|
||
| def _real_extract(self, url): | ||
| video_id = self._match_id(url) | ||
|
|
||
| video = self._download_json( | ||
| self._BASE_URL + '/api/public/video/' + video_id, video_id)['data'] | ||
| title = video['title'] | ||
|
|
||
| formats = [] | ||
| for media in (video.get('media') or []): | ||
| media_url = media.get('url') | ||
| if not media_url: | ||
| continue | ||
| formats.append({ | ||
| 'url': self._BASE_URL + media_url, | ||
| 'format_id': remove_start(media.get('format'), 'FORMAT_'), | ||
| 'format_note': media.get('formatTranslation'), | ||
| 'width': int_or_none(media.get('width')), | ||
| 'height': int_or_none(media.get('height')), | ||
| }) | ||
| self._sort_formats(formats) | ||
|
|
||
| channel = video.get('channel') or {} | ||
| channel_id = channel.get('url') | ||
| thumbnail = video.get('thumbnailUrl') | ||
|
|
||
| return { | ||
| 'id': video_id, | ||
| 'title': title, | ||
| 'formats': formats, | ||
| 'thumbnail': self._BASE_URL + thumbnail, | ||
| 'description': video.get('description'), | ||
| 'license': video.get('license'), | ||
| 'creator': video.get('author'), | ||
| 'timestamp': parse_iso8601(video.get('creationTime')), | ||
| 'channel': channel.get('name'), | ||
| 'channel_id': channel_id, | ||
| 'channel_url': self._BASE_URL + '/?channel=' + channel_id if channel_id else None, | ||
| 'duration': float_or_none(video.get('duration'), 1000), | ||
| 'view_count': int_or_none(video.get('views')), | ||
| 'tags': video.get('hashtags'), | ||
| 'start_time': int_or_none(compat_parse_qs( | ||
| compat_urllib_parse_urlparse(url).query).get('t', [None])[0]), | ||
| } |
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,148 @@ | ||
| # coding: utf-8 | ||
| from __future__ import unicode_literals | ||
|
|
||
| import re | ||
|
|
||
| from .common import InfoExtractor | ||
| from ..compat import compat_str | ||
| from ..utils import ( | ||
| int_or_none, | ||
| str_or_none, | ||
| try_get, | ||
| ) | ||
|
|
||
|
|
||
| class PalcoMP3BaseIE(InfoExtractor): | ||
| _GQL_QUERY_TMPL = '''{ | ||
| artist(slug: "%s") { | ||
| %s | ||
| } | ||
| }''' | ||
| _ARTIST_FIELDS_TMPL = '''music(slug: "%%s") { | ||
| %s | ||
| }''' | ||
| _MUSIC_FIELDS = '''duration | ||
| hls | ||
| mp3File | ||
| musicID | ||
| plays | ||
| title''' | ||
|
|
||
| def _call_api(self, artist_slug, artist_fields): | ||
| return self._download_json( | ||
| 'https://www.palcomp3.com.br/graphql/', artist_slug, query={ | ||
| 'query': self._GQL_QUERY_TMPL % (artist_slug, artist_fields), | ||
| })['data'] | ||
|
|
||
| def _parse_music(self, music): | ||
| music_id = compat_str(music['musicID']) | ||
| title = music['title'] | ||
|
|
||
| formats = [] | ||
| hls_url = music.get('hls') | ||
| if hls_url: | ||
| formats.append({ | ||
| 'url': hls_url, | ||
| 'protocol': 'm3u8_native', | ||
| 'ext': 'mp4', | ||
| }) | ||
| mp3_file = music.get('mp3File') | ||
| if mp3_file: | ||
| formats.append({ | ||
| 'url': mp3_file, | ||
| }) | ||
|
|
||
| return { | ||
| 'id': music_id, | ||
| 'title': title, | ||
| 'formats': formats, | ||
| 'duration': int_or_none(music.get('duration')), | ||
| 'view_count': int_or_none(music.get('plays')), | ||
| } | ||
|
|
||
| def _real_initialize(self): | ||
| self._ARTIST_FIELDS_TMPL = self._ARTIST_FIELDS_TMPL % self._MUSIC_FIELDS | ||
|
|
||
| def _real_extract(self, url): | ||
| artist_slug, music_slug = re.match(self._VALID_URL, url).groups() | ||
| artist_fields = self._ARTIST_FIELDS_TMPL % music_slug | ||
| music = self._call_api(artist_slug, artist_fields)['artist']['music'] | ||
| return self._parse_music(music) | ||
|
|
||
|
|
||
| class PalcoMP3IE(PalcoMP3BaseIE): | ||
| IE_NAME = 'PalcoMP3:song' | ||
| _VALID_URL = r'https?://(?:www\.)?palcomp3\.com(?:\.br)?/(?P<artist>[^/]+)/(?P<id>[^/?&#]+)' | ||
| _TESTS = [{ | ||
| 'url': 'https://www.palcomp3.com/maiaraemaraisaoficial/nossas-composicoes-cuida-bem-dela/', | ||
| 'md5': '99fd6405b2d8fd589670f6db1ba3b358', | ||
| 'info_dict': { | ||
| 'id': '3162927', | ||
| 'ext': 'mp3', | ||
| 'title': 'Nossas Composições - CUIDA BEM DELA', | ||
| 'duration': 210, | ||
| 'view_count': int, | ||
| } | ||
| }] | ||
|
|
||
| @classmethod | ||
| def suitable(cls, url): | ||
| return False if PalcoMP3VideoIE.suitable(url) else super(PalcoMP3IE, cls).suitable(url) | ||
|
|
||
|
|
||
| class PalcoMP3ArtistIE(PalcoMP3BaseIE): | ||
| IE_NAME = 'PalcoMP3:artist' | ||
| _VALID_URL = r'https?://(?:www\.)?palcomp3\.com(?:\.br)?/(?P<id>[^/?&#]+)' | ||
| _TESTS = [{ | ||
| 'url': 'https://www.palcomp3.com.br/condedoforro/', | ||
| 'info_dict': { | ||
| 'id': '358396', | ||
| 'title': 'Conde do Forró', | ||
| }, | ||
| 'playlist_mincount': 188, | ||
| }] | ||
| _ARTIST_FIELDS_TMPL = '''artistID | ||
| musics { | ||
| nodes { | ||
| %s | ||
| } | ||
| } | ||
| name''' | ||
|
|
||
| @ classmethod | ||
| def suitable(cls, url): | ||
| return False if re.match(PalcoMP3IE._VALID_URL, url) else super(PalcoMP3ArtistIE, cls).suitable(url) | ||
|
|
||
| def _real_extract(self, url): | ||
| artist_slug = self._match_id(url) | ||
| artist = self._call_api(artist_slug, self._ARTIST_FIELDS_TMPL)['artist'] | ||
|
|
||
| def entries(): | ||
| for music in (try_get(artist, lambda x: x['musics']['nodes'], list) or []): | ||
| yield self._parse_music(music) | ||
|
|
||
| return self.playlist_result( | ||
| entries(), str_or_none(artist.get('artistID')), artist.get('name')) | ||
|
|
||
|
|
||
| class PalcoMP3VideoIE(PalcoMP3BaseIE): | ||
| IE_NAME = 'PalcoMP3:video' | ||
| _VALID_URL = r'https?://(?:www\.)?palcomp3\.com(?:\.br)?/(?P<artist>[^/]+)/(?P<id>[^/?&#]+)/?#clipe' | ||
| _TESTS = [{ | ||
| 'url': 'https://www.palcomp3.com/maiaraemaraisaoficial/maiara-e-maraisa-voce-faz-falta-aqui-ao-vivo-em-vicosa-mg/#clipe', | ||
| 'add_ie': ['Youtube'], | ||
| 'info_dict': { | ||
| 'id': '_pD1nR2qqPg', | ||
| 'ext': 'mp4', | ||
| 'title': 'Maiara e Maraisa - Você Faz Falta Aqui - DVD Ao Vivo Em Campo Grande', | ||
| 'description': 'md5:7043342c09a224598e93546e98e49282', | ||
| 'upload_date': '20161107', | ||
| 'uploader_id': 'maiaramaraisaoficial', | ||
| 'uploader': 'Maiara e Maraisa', | ||
| } | ||
| }] | ||
| _MUSIC_FIELDS = 'youtubeID' | ||
|
|
||
| def _parse_music(self, music): | ||
| youtube_id = music['youtubeID'] | ||
| return self.url_result(youtube_id, 'Youtube', youtube_id) |
Oops, something went wrong.