R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update youtube.py

Browse Source 
Fixed other calls with now wrong extract_videos_from_page_impl() argument count.
This commit is contained in:
Crypto90 2020-07-01 13:46:43 +02:00 committed by GitHub
parent 2a56ab7fd5
commit 4fd0424fbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/youtube.py
View File

@ -2758,6 +2758,7 @@ class YoutubePlaylistIE(YoutubePlaylistBaseInfoExtractor):
def extract_videos_from_page(self, page): def extract_videos_from_page(self, page):
ids_in_page = [] ids_in_page = []
titles_in_page = [] titles_in_page = []
durations_in_page = []
for item in re.findall( for item in re.findall(
r'(<[^>]*\bdata-video-id\s*=\s*["\'][0-9A-Za-z_-]{11}[^>]+>)', page): r'(<[^>]*\bdata-video-id\s*=\s*["\'][0-9A-Za-z_-]{11}[^>]+>)', page):
@ -2768,20 +2769,21 @@ class YoutubePlaylistIE(YoutubePlaylistBaseInfoExtractor):
video_title = video_title.strip() video_title = video_title.strip()
ids_in_page.append(video_id) ids_in_page.append(video_id)
titles_in_page.append(video_title) titles_in_page.append(video_title)
#TODO ADD VIDEO DURATION HERE TOO?
# Fallback with old _VIDEO_RE # Fallback with old _VIDEO_RE
self.extract_videos_from_page_impl( self.extract_videos_from_page_impl(
self._VIDEO_RE, page, ids_in_page, titles_in_page) self._VIDEO_RE, page, ids_in_page, titles_in_page, durations_in_page)
# Relaxed fallbacks # Relaxed fallbacks
self.extract_videos_from_page_impl( self.extract_videos_from_page_impl(
r'href="\s*/watch\?v\s*=\s*(?P<id>[0-9A-Za-z_-]{11})', page, r'href="\s*/watch\?v\s*=\s*(?P<id>[0-9A-Za-z_-]{11})', page,
ids_in_page, titles_in_page) ids_in_page, titles_in_page, durations_in_page)
self.extract_videos_from_page_impl( self.extract_videos_from_page_impl(
r'data-video-ids\s*=\s*["\'](?P<id>[0-9A-Za-z_-]{11})', page, r'data-video-ids\s*=\s*["\'](?P<id>[0-9A-Za-z_-]{11})', page,
ids_in_page, titles_in_page) ids_in_page, titles_in_page, durations_in_page)
return zip(ids_in_page, titles_in_page) return zip(ids_in_page, titles_in_page, durations_in_page)
def _extract_mix(self, playlist_id): def _extract_mix(self, playlist_id):
# The mixes are generated from a single video # The mixes are generated from a single video