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

[archiveorg] Fix extraction (closes #21330, closes #23586, closes #23700)

Browse Source
This commit is contained in:
TinyToweringTree 2020-01-24 15:03:48 +01:00
parent 2a5c26c980
commit 8df0c2c7a5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/archiveorg.py
View File

@ -40,9 +40,12 @@ class ArchiveOrgIE(InfoExtractor):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage( webpage = self._download_webpage(
'http://archive.org/embed/' + video_id, video_id) 'http://archive.org/embed/' + video_id, video_id)
input_element_with_playlist = self._search_regex(
r'(<\s*input.*\s*class\s*=\s*[\'"].*\s*js-play8-playlist\s*.*[\'"]\s*.*>)',
webpage, 'jwplayer playlist')
jwplayer_playlist = self._parse_json(self._search_regex( jwplayer_playlist = self._parse_json(self._search_regex(
r"(?s)Play\('[^']+'\s*,\s*(\[.+\])\s*,\s*{.*?}\)", r'.*\s+value\s*=\s*[\'"](.+)[\'"][\s/]',
webpage, 'jwplayer playlist'), video_id) input_element_with_playlist, 'playlist data'), video_id)
info = self._parse_jwplayer_data( info = self._parse_jwplayer_data(
{'playlist': jwplayer_playlist}, video_id, base_url=url) {'playlist': jwplayer_playlist}, video_id, base_url=url)
@ -52,7 +55,7 @@ class ArchiveOrgIE(InfoExtractor):
metadata = self._download_json( metadata = self._download_json(
'http://archive.org/details/' + video_id, video_id, query={ 'http://archive.org/details/' + video_id, video_id, query={
'output': 'json', 'output': 'json',
})['metadata'] }).get('metadata', {})
info.update({ info.update({
'title': get_optional(metadata, 'title') or info.get('title'), 'title': get_optional(metadata, 'title') or info.get('title'),
'description': clean_html(get_optional(metadata, 'description')), 'description': clean_html(get_optional(metadata, 'description')),