diff options
| author | Tom-Oliver Heidel <github@tom-oliver.eu> | 2020-11-10 23:27:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 23:27:55 +0100 |
| commit | c54f4aada5a952087e52ba2532bb59062b762d90 (patch) | |
| tree | 03a11a4b7754efac34296a8046b1d0e337ef05a0 /youtube_dlc/extractor | |
| parent | 0f8566e90bee77775be133d551045698a84a2bdd (diff) | |
| parent | 0e0cffb8fec06972b451fc15ffe14a651b2736bc (diff) | |
| download | hypervideo-pre-c54f4aada5a952087e52ba2532bb59062b762d90.tar.lz hypervideo-pre-c54f4aada5a952087e52ba2532bb59062b762d90.tar.xz hypervideo-pre-c54f4aada5a952087e52ba2532bb59062b762d90.zip | |
Merge branch 'master' into youtube-playlist-polymer
Diffstat (limited to 'youtube_dlc/extractor')
| -rw-r--r-- | youtube_dlc/extractor/youtube.py | 3 | ||||
| -rw-r--r-- | youtube_dlc/extractor/zoom.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dlc/extractor/youtube.py b/youtube_dlc/extractor/youtube.py index 0dbb3531c..d8d12a721 100644 --- a/youtube_dlc/extractor/youtube.py +++ b/youtube_dlc/extractor/youtube.py @@ -299,6 +299,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor): class YoutubeEntryListBaseInfoExtractor(YoutubeBaseInfoExtractor): + def _find_entries_in_json(self, extracted): entries = [] c = {} @@ -366,6 +367,7 @@ class YoutubeEntryListBaseInfoExtractor(YoutubeBaseInfoExtractor): 'https://www.youtube.com%s' % continuation_url, playlist_id, 'Downloading page #%s%s' % (page_num, ' (retry #%d)' % count if count else ''), + transform_source=uppercase_escape, query={ 'key': try_get(yt_conf, lambda x: x['INNERTUBE_API_KEY']) @@ -428,6 +430,7 @@ class YoutubePlaylistsBaseInfoExtractor(YoutubeEntryListBaseInfoExtractor): def _process_entries(self, entries, seen): for playlist_id in orderedSet(try_get(r, lambda x: x['playlistId']) for r in entries): + yield self.url_result( 'https://www.youtube.com/playlist?list=%s' % playlist_id, 'YoutubePlaylist') diff --git a/youtube_dlc/extractor/zoom.py b/youtube_dlc/extractor/zoom.py index 003e1f901..038a90297 100644 --- a/youtube_dlc/extractor/zoom.py +++ b/youtube_dlc/extractor/zoom.py @@ -13,7 +13,7 @@ from ..utils import ( class ZoomIE(InfoExtractor): IE_NAME = 'zoom' - _VALID_URL = r'https://(?:.*).?zoom.us/rec(?:ording)?/play/(?P<id>[A-Za-z0-9\-_]+)' + _VALID_URL = r'https://(?:.*).?zoom.us/rec(?:ording)?/(play|share)/(?P<id>[A-Za-z0-9\-_.]+)' _TEST = { 'url': 'https://zoom.us/recording/play/SILVuCL4bFtRwWTtOCFQQxAsBQsJljFtm9e4Z_bvo-A8B-nzUSYZRNuPl3qW5IGK', |