aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-06-23 22:16:41 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-06-23 22:16:41 +0200
commit2c64df03991e1d65b0d12d4068267d69d918535d (patch)
tree3f8f949f50a7112da2d5fc173d388ea2847aee75
parent828400422abb04ef6161ba87e178d22fd61170fb (diff)
downloadyoutube-dl-2c64df03991e1d65b0d12d4068267d69d918535d.tar.xz
[keek] move into own file
-rwxr-xr-xyoutube_dl/InfoExtractors.py28
-rw-r--r--youtube_dl/extractor/keek.py32
2 files changed, 33 insertions, 27 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 4002c9485..95d65b377 100755
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -35,6 +35,7 @@ from .extractor.googleplus import GooglePlusIE
from .extractor.googlesearch import GoogleSearchIE
from .extractor.infoq import InfoQIE
from .extractor.justintv import JustinTVIE
+from .extractor.keek import KeekIE
from .extractor.metacafe import MetacafeIE
from .extractor.mixcloud import MixcloudIE
from .extractor.mtv import MTVIE
@@ -85,33 +86,6 @@ from .extractor.zdf import ZDFIE
-class KeekIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?keek\.com/(?:!|\w+/keeks/)(?P<videoID>\w+)'
- IE_NAME = u'keek'
-
- def _real_extract(self, url):
- m = re.match(self._VALID_URL, url)
- video_id = m.group('videoID')
-
- video_url = u'http://cdn.keek.com/keek/video/%s' % video_id
- thumbnail = u'http://cdn.keek.com/keek/thumbnail/%s/w100/h75' % video_id
- webpage = self._download_webpage(url, video_id)
-
- video_title = self._html_search_regex(r'<meta property="og:title" content="(?P<title>.*?)"',
- webpage, u'title')
-
- uploader = self._html_search_regex(r'<div class="user-name-and-bio">[\S\s]+?<h2>(?P<uploader>.+?)</h2>',
- webpage, u'uploader', fatal=False)
-
- info = {
- 'id': video_id,
- 'url': video_url,
- 'ext': 'mp4',
- 'title': video_title,
- 'thumbnail': thumbnail,
- 'uploader': uploader
- }
- return [info]
class MySpassIE(InfoExtractor):
diff --git a/youtube_dl/extractor/keek.py b/youtube_dl/extractor/keek.py
new file mode 100644
index 000000000..e2093a0be
--- /dev/null
+++ b/youtube_dl/extractor/keek.py
@@ -0,0 +1,32 @@
+import re
+
+from .common import InfoExtractor
+
+
+class KeekIE(InfoExtractor):
+ _VALID_URL = r'http://(?:www\.)?keek\.com/(?:!|\w+/keeks/)(?P<videoID>\w+)'
+ IE_NAME = u'keek'
+
+ def _real_extract(self, url):
+ m = re.match(self._VALID_URL, url)
+ video_id = m.group('videoID')
+
+ video_url = u'http://cdn.keek.com/keek/video/%s' % video_id
+ thumbnail = u'http://cdn.keek.com/keek/thumbnail/%s/w100/h75' % video_id
+ webpage = self._download_webpage(url, video_id)
+
+ video_title = self._html_search_regex(r'<meta property="og:title" content="(?P<title>.*?)"',
+ webpage, u'title')
+
+ uploader = self._html_search_regex(r'<div class="user-name-and-bio">[\S\s]+?<h2>(?P<uploader>.+?)</h2>',
+ webpage, u'uploader', fatal=False)
+
+ info = {
+ 'id': video_id,
+ 'url': video_url,
+ 'ext': 'mp4',
+ 'title': video_title,
+ 'thumbnail': thumbnail,
+ 'uploader': uploader
+ }
+ return [info]