mirror of
https://github.com/blackjack4494/yt-dlc.git
synced 2024-12-23 08:17:00 +00:00
Merge remote-tracking branch 'kwbr/master'
This commit is contained in:
commit
117a7d1944
1 changed files with 26 additions and 23 deletions
|
@ -11,16 +11,16 @@ from ..utils import (
|
||||||
|
|
||||||
class InfoQIE(InfoExtractor):
|
class InfoQIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:www\.)?infoq\.com/[^/]+/(?P<id>[^/]+)$'
|
_VALID_URL = r'https?://(?:www\.)?infoq\.com/[^/]+/(?P<id>[^/]+)$'
|
||||||
|
|
||||||
_TEST = {
|
_TEST = {
|
||||||
"name": "InfoQ",
|
u'name': u'InfoQ',
|
||||||
"url": "http://www.infoq.com/presentations/A-Few-of-My-Favorite-Python-Things",
|
u'url': u'http://www.infoq.com/presentations/A-Few-of-My-Favorite-Python-Things',
|
||||||
"file": "12-jan-pythonthings.mp4",
|
u'md5': u'fcaa3d995e04080dcb9465d86b5eef62',
|
||||||
"info_dict": {
|
u'info_dict': {
|
||||||
"description": "Mike Pirnat presents some tips and tricks, standard libraries and third party packages that make programming in Python a richer experience.",
|
u'id': u'12-jan-pythonthings',
|
||||||
"title": "A Few of My Favorite [Python] Things",
|
u'ext': u'mp4',
|
||||||
},
|
u'description': u'Mike Pirnat presents some tips and tricks, standard libraries and third party packages that make programming in Python a richer experience.',
|
||||||
"params": {
|
u'title': u'A Few of My Favorite [Python] Things',
|
||||||
"skip_download": True,
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,26 +30,29 @@ class InfoQIE(InfoExtractor):
|
||||||
|
|
||||||
webpage = self._download_webpage(url, video_id)
|
webpage = self._download_webpage(url, video_id)
|
||||||
|
|
||||||
|
self.report_extraction(video_id)
|
||||||
|
|
||||||
|
video_title = self._html_search_regex(r'<title>(.*?)</title>', webpage, 'title')
|
||||||
|
video_description = self._html_search_meta('description', webpage, 'description')
|
||||||
|
|
||||||
|
# The server URL is hardcoded
|
||||||
|
video_url = 'rtmpe://video.infoq.com/cfx/st/'
|
||||||
|
|
||||||
# Extract video URL
|
# Extract video URL
|
||||||
encoded_id = self._search_regex(r"jsclassref ?= ?'([^']*)'", webpage, 'encoded id')
|
encoded_id = self._search_regex(r"jsclassref ?= ?'([^']*)'", webpage, 'encoded id')
|
||||||
real_id = compat_urllib_parse.unquote(base64.b64decode(encoded_id.encode('ascii')).decode('utf-8'))
|
real_id = compat_urllib_parse.unquote(base64.b64decode(encoded_id.encode('ascii')).decode('utf-8'))
|
||||||
video_url = 'rtmpe://video.infoq.com/cfx/st/' + real_id
|
playpath = 'mp4:' + real_id
|
||||||
|
|
||||||
# Extract title
|
video_filename = playpath.split('/')[-1]
|
||||||
video_title = self._search_regex(r'contentTitle = "(.*?)";',
|
|
||||||
webpage, 'title')
|
|
||||||
|
|
||||||
# Extract description
|
|
||||||
video_description = self._html_search_regex(r'<meta name="description" content="(.*)"(?:\s*/)?>',
|
|
||||||
webpage, 'description', fatal=False)
|
|
||||||
|
|
||||||
video_filename = video_url.split('/')[-1]
|
|
||||||
video_id, extension = video_filename.split('.')
|
video_id, extension = video_filename.split('.')
|
||||||
|
|
||||||
return {
|
return [{
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'url': video_url,
|
|
||||||
'title': video_title,
|
'title': video_title,
|
||||||
'ext': extension, # Extension is always(?) mp4, but seems to be flv
|
|
||||||
'description': video_description,
|
'description': video_description,
|
||||||
}
|
'formats': [{
|
||||||
|
'url': video_url,
|
||||||
|
'ext': extension,
|
||||||
|
'play_path': playpath,
|
||||||
|
}],
|
||||||
|
}]
|
||||||
|
|
Loading…
Reference in a new issue