w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[keek] Simplify and use unicode_literals

Browse source
This commit is contained in:
Jaime Marquínez Ferrándiz 2014-01-28 18:47:31 +01:00
parent 869baf3565
commit 5aaca50d60
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
youtube_dl/extractor/keek.py
View file

@ -1,3 +1,5 @@
from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
@ -5,36 +7,34 @@ 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<videoID>\w+)'
IE_NAME = u'keek' IE_NAME = 'keek'
_TEST = { _TEST = {
u'url': u'https://www.keek.com/ytdl/keeks/NODfbab', 'url': 'https://www.keek.com/ytdl/keeks/NODfbab',
u'file': u'NODfbab.mp4', 'file': 'NODfbab.mp4',
u'md5': u'9b0636f8c0f7614afa4ea5e4c6e57e83', 'md5': '9b0636f8c0f7614afa4ea5e4c6e57e83',
u'info_dict': { 'info_dict': {
u"uploader": u"ytdl", 'uploader': 'ytdl',
u"title": u"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) m = re.match(self._VALID_URL, url)
video_id = m.group('videoID') video_id = m.group('videoID')
video_url = u'http://cdn.keek.com/keek/video/%s' % video_id video_url = 'http://cdn.keek.com/keek/video/%s' % video_id
thumbnail = u'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)
video_title = self._og_search_title(webpage) uploader = self._html_search_regex(
r'<div class="user-name-and-bio">[\S\s]+?<h2>(?P<uploader>.+?)</h2>',
webpage, 'uploader', fatal=False)
uploader = self._html_search_regex(r'<div class="user-name-and-bio">[\S\s]+?<h2>(?P<uploader>.+?)</h2>', return {
webpage, u'uploader', fatal=False)
info = {
'id': video_id, 'id': video_id,
'url': video_url, 'url': video_url,
'ext': 'mp4', 'ext': 'mp4',
'title': video_title, 'title': self._og_search_title(webpage),
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'uploader': uploader 'uploader': uploader
} }
return [info]