Merge tag 'upstream/2013.08.08'

[youtubedl] / youtube_dl / extractor / keek.py

diff --git a/youtube_dl/extractor/keek.py b/youtube_dl/extractor/keek.py
index e2093a0be92dd700002a20c00dd93f6e525e6da1..a7b88d2d96c728dab476d425cf0be3842dd57c6d 100644 (file)
--- a/youtube_dl/extractor/keek.py
+++ b/youtube_dl/extractor/keek.py
@@ -4,8 +4,17 @@ from .common import InfoExtractor
 
 
 class KeekIE(InfoExtractor):
 
 
 class KeekIE(InfoExtractor):

-    _VALID_URL = r'http://(?: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 = u'keek'

+    _TEST = {
+        u'url': u'https://www.keek.com/ytdl/keeks/NODfbab',
+        u'file': u'NODfbab.mp4',
+        u'md5': u'9b0636f8c0f7614afa4ea5e4c6e57e83',
+        u'info_dict': {
+            u"uploader": u"ytdl", 
+            u"title": u"test chars: \"'/\\\u00e4<>This is a test video for youtube-dl.For more information, contact phihag@phihag.de ."
+        }
+    }

 
     def _real_extract(self, url):
         m = re.match(self._VALID_URL, url)
 
     def _real_extract(self, url):
         m = re.match(self._VALID_URL, url)


@@ -15,8 +24,7 @@ class KeekIE(InfoExtractor):
         thumbnail = u'http://cdn.keek.com/keek/thumbnail/%s/w100/h75' % video_id
         webpage = self._download_webpage(url, 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')
+        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, u'uploader', fatal=False)
 
         uploader = self._html_search_regex(r'<div class="user-name-and-bio">[\S\s]+?<h2>(?P<uploader>.+?)</h2>',
             webpage, u'uploader', fatal=False)