From: remitamine <remitamine@gmail.com>
Date: Sat, 26 Sep 2015 17:04:25 +0000 (+0100)
Subject: [keek] extract more info
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=6a24cb3d22876826477dc2857f9d46fe65a9fc28

[keek] extract more info
---

diff --git a/youtube_dl/extractor/keek.py b/youtube_dl/extractor/keek.py
index 4493a929d..24f5c7cb7 100644
--- a/youtube_dl/extractor/keek.py
+++ b/youtube_dl/extractor/keek.py
@@ -1,5 +1,7 @@
 from __future__ import unicode_literals
 
+import re
+
 from .common import InfoExtractor
 
 
@@ -13,6 +15,9 @@ class KeekIE(InfoExtractor):
             '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': 'test chars: "\'/\\ä<>This is a test video for youtube-dl.For more information, contact phihag@phihag.de .',
+            'uploader': 'ytdl',
+            'uploader_id': 'eGT5bab',
         },
     }
 
@@ -20,11 +25,18 @@ class KeekIE(InfoExtractor):
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(url, video_id)
+        uploader = uploader_id = None
+        matches = re.search(r'data-username="(?P<uploader>[^"]+)"[^>]*data-user-id="(?P<uploader_id>[^"]+)"', webpage)
+        if matches:
+            uploader, uploader_id = matches.groups()
 
         return {
             'id': video_id,
             'url': self._og_search_video_url(webpage),
             'ext': 'mp4',
             'title': self._og_search_title(webpage),
+            'description': self._og_search_description(webpage),
             'thumbnail': self._og_search_thumbnail(webpage),
+            'uploader': uploader,
+            'uploader_id': uploader_id,
         }