From: Sergey M․ <dstftw@gmail.com>
Date: Sun, 27 Sep 2015 19:15:13 +0000 (+0600)
Subject: [keek] Improve uploader fields regexes
X-Git-Tag: 2015.09.28~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1ab1c4ef5708fc1db50c5b875dcbcfe9ce984035;p=youtube-dl.git

[keek] Improve uploader fields regexes
---

diff --git a/youtube_dl/extractor/keek.py b/youtube_dl/extractor/keek.py
index dff4cb558d..dfd800a918 100644
--- a/youtube_dl/extractor/keek.py
+++ b/youtube_dl/extractor/keek.py
@@ -30,6 +30,10 @@ class KeekIE(InfoExtractor):
             'ext': 'mp4',
             'title': self._og_search_description(webpage),
             'thumbnail': self._og_search_thumbnail(webpage),
-            'uploader': self._search_regex(r'data-username="([^"]+)"', webpage, 'uploader', fatal=False),
-            'uploader_id': self._search_regex(r'data-user-id="([^"]+)"', webpage, 'uploader id', fatal=False),
+            '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'),
         }