mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-25 03:32:05 +00:00
[keek] Modernize and extract uploader
This commit is contained in:
parent
1cc79574fc
commit
7129bed51b
1 changed files with 18 additions and 10 deletions
|
@ -6,29 +6,36 @@ from .common import InfoExtractor
|
||||||
|
|
||||||
|
|
||||||
class KeekIE(InfoExtractor):
|
class KeekIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:www\.)?keek\.com/(?:!|\w+/keeks/)(?P<videoID>\w+)'
|
_VALID_URL = r'https?://(?:www\.)?keek\.com/(?:!|\w+/keeks/)(?P<id>\w+)'
|
||||||
IE_NAME = 'keek'
|
IE_NAME = 'keek'
|
||||||
_TEST = {
|
_TEST = {
|
||||||
'url': 'https://www.keek.com/ytdl/keeks/NODfbab',
|
'url': 'https://www.keek.com/ytdl/keeks/NODfbab',
|
||||||
'file': 'NODfbab.mp4',
|
'md5': '09c5c109067536c1cec8bac8c21fea05',
|
||||||
'md5': '9b0636f8c0f7614afa4ea5e4c6e57e83',
|
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'uploader': 'ytdl',
|
'id': 'NODfbab',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'uploader': 'youtube-dl project',
|
||||||
|
'uploader_id': 'ytdl',
|
||||||
'title': 'test chars: "\'/\\\u00e4<>This is a test video for youtube-dl.For more information, contact phihag@phihag.de .',
|
'title': 'test chars: "\'/\\\u00e4<>This is a test video for youtube-dl.For more information, contact phihag@phihag.de .',
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
m = re.match(self._VALID_URL, url)
|
video_id = self._match_id(url)
|
||||||
video_id = m.group('videoID')
|
|
||||||
|
|
||||||
video_url = 'http://cdn.keek.com/keek/video/%s' % video_id
|
video_url = 'http://cdn.keek.com/keek/video/%s' % video_id
|
||||||
thumbnail = 'http://cdn.keek.com/keek/thumbnail/%s/w100/h75' % video_id
|
thumbnail = 'http://cdn.keek.com/keek/thumbnail/%s/w100/h75' % video_id
|
||||||
webpage = self._download_webpage(url, video_id)
|
webpage = self._download_webpage(url, video_id)
|
||||||
|
|
||||||
uploader = self._html_search_regex(
|
raw_desc = self._html_search_meta('description', webpage)
|
||||||
r'<div class="user-name-and-bio">[\S\s]+?<h2>(?P<uploader>.+?)</h2>',
|
if raw_desc:
|
||||||
webpage, 'uploader', fatal=False)
|
uploader = self._html_search_regex(
|
||||||
|
r'Watch (.*?)\s+\(', raw_desc, 'uploader', fatal=False)
|
||||||
|
uploader_id = self._html_search_regex(
|
||||||
|
r'Watch .*?\(@(.+?)\)', raw_desc, 'uploader_id', fatal=False)
|
||||||
|
else:
|
||||||
|
uploader = None
|
||||||
|
uploader_id = None
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
|
@ -36,5 +43,6 @@ class KeekIE(InfoExtractor):
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': self._og_search_title(webpage),
|
'title': self._og_search_title(webpage),
|
||||||
'thumbnail': thumbnail,
|
'thumbnail': thumbnail,
|
||||||
'uploader': uploader
|
'uploader': uploader,
|
||||||
|
'uploader_id': uploader_id,
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue