projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd467d3
)
[keek] fix info extraction
author
remitamine
<remitamine@gmail.com>
Thu, 24 Sep 2015 21:38:00 +0000
(22:38 +0100)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 27 Sep 2015 19:02:59 +0000
(
01:02
+0600)
youtube_dl/extractor/keek.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/keek.py
b/youtube_dl/extractor/keek.py
index c0956ba0902be3b8fd9a9188872eb90ab9acdefa..4493a929d647fc45516271381abe6388e8d84f14 100644
(file)
--- a/
youtube_dl/extractor/keek.py
+++ b/
youtube_dl/extractor/keek.py
@@
-4,43
+4,27
@@
from .common import InfoExtractor
class KeekIE(InfoExtractor):
class KeekIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?keek\.com/
(?:!|\w+/keeks/)
(?P<id>\w+)'
+ _VALID_URL = r'https?://(?:www\.)?keek\.com/
keek/
(?P<id>\w+)'
IE_NAME = 'keek'
_TEST = {
IE_NAME = 'keek'
_TEST = {
- 'url': 'https://www.keek.com/
ytdl/keeks
/NODfbab',
- 'md5': '
09c5c109067536c1cec8bac8c21fea05
',
+ 'url': 'https://www.keek.com/
keek
/NODfbab',
+ 'md5': '
9b0636f8c0f7614afa4ea5e4c6e57e83
',
'info_dict': {
'id': 'NODfbab',
'ext': 'mp4',
'info_dict': {
'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: "\'/\\ä<>This is a test video for youtube-dl.For more information, contact phihag@phihag.de . - Video - Videos on Keek',
},
}
def _real_extract(self, url):
video_id = self._match_id(url)
},
}
def _real_extract(self, url):
video_id = self._match_id(url)
- video_url = 'http://cdn.keek.com/keek/video/%s' % 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)
- raw_desc = self._html_search_meta('description', webpage)
- if raw_desc:
- 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 {
'id': video_id,
return {
'id': video_id,
- 'url':
video_url
,
+ 'url':
self._og_search_video_url(webpage)
,
'ext': 'mp4',
'title': self._og_search_title(webpage),
'ext': 'mp4',
'title': self._og_search_title(webpage),
- 'thumbnail': thumbnail,
- 'uploader': uploader,
- 'uploader_id': uploader_id,
+ 'thumbnail': self._og_search_thumbnail(webpage),
}
}