X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fkeek.py;h=94a03d277a227733480b8a73f5535f9f3410be15;hb=4c76aa06665621c7689938afd7bbdbc797b5c7ea;hp=99154112bb4fead1bd1e12fb689d7f9b911f08ba;hpb=98e1c935a1ed676ca747c04c28d98370f740cadc;p=youtube-dl

diff --git a/youtube_dl/extractor/keek.py b/youtube_dl/extractor/keek.py
index 99154112b..94a03d277 100644
--- a/youtube_dl/extractor/keek.py
+++ b/youtube_dl/extractor/keek.py
@@ -13,8 +13,7 @@ class KeekIE(InfoExtractor):
         'info_dict': {
             'id': 'NODfbab',
             'ext': 'mp4',
-            'title': 'test chars: "\'/\\ä<>This is a test video for youtube-dl.For more information, contact phihag@phihag.de . - Video - Videos on Keek',
-            'description': 'md5:35d42050a3ece241d5ddd7fdcc6fd896',
+            'title': 'md5:35d42050a3ece241d5ddd7fdcc6fd896',
             'uploader': 'ytdl',
             'uploader_id': 'eGT5bab',
         },
@@ -29,9 +28,12 @@ class KeekIE(InfoExtractor):
             'id': video_id,
             'url': self._og_search_video_url(webpage),
             'ext': 'mp4',
-            'title': self._og_search_title(webpage),
-            'description': self._og_search_description(webpage),
+            'title': self._og_search_description(webpage).strip(),
             'thumbnail': self._og_search_thumbnail(webpage),
-            'uploader': self._search_regex(r'data-username="([^"]+)"', webpage, 'uploader', None),
-            'uploader_id': self._search_regex(r'data-user-id="([^"]+)"', webpage, 'uploader id', None),
+            'uploader': self._search_regex(
+                r'data-username=(["\'])(?P<uploader>.+?)\1', webpage,
+                'uploader', fatal=False, group='uploader'),
+            'uploader_id': self._search_regex(
+                r'data-user-id=(["\'])(?P<uploader_id>.+?)\1', webpage,
+                'uploader id', fatal=False, group='uploader_id'),
         }