Merge branch 'master' into rtmpdump

[youtube-dl] / youtube_dl / extractor / keezmovies.py

diff --git a/youtube_dl/extractor/keezmovies.py b/youtube_dl/extractor/keezmovies.py
index 937caf6644749b8c3f0154b2eaff534f6036bb6a..29658a7d63c6396d33c370a35b07a4636d265d99 100644 (file)
--- a/youtube_dl/extractor/keezmovies.py
+++ b/youtube_dl/extractor/keezmovies.py
@@ -6,20 +6,20 @@ from ..utils import (
     compat_urllib_parse_urlparse,
     compat_urllib_request,
     compat_urllib_parse,
-    unescapeHTML,
 )
 from ..aes import (
     aes_decrypt_text
 )
 
 class KeezMoviesIE(InfoExtractor):
-    _VALID_URL = r'^(?:https?://)?(?:www\.)?(?P<url>keezmovies\.com/video/.+?(?P<videoid>[0-9]+))'
+    _VALID_URL = r'^(?:https?://)?(?:www\.)?(?P<url>keezmovies\.com/video/.+?(?P<videoid>[0-9]+))(?:[/?&]|$)'
     _TEST = {
         u'url': u'http://www.keezmovies.com/video/petite-asian-lady-mai-playing-in-bathtub-1214711',
         u'file': u'1214711.mp4',
         u'md5': u'6e297b7e789329923fcf83abb67c9289',
         u'info_dict': {
             u"title": u"Petite Asian Lady Mai Playing In Bathtub",
+            u"age_limit": 18,
         }
     }
 
@@ -36,17 +36,19 @@ class KeezMoviesIE(InfoExtractor):
         mobj = re.search(r'href="([^"]+)"></iframe>', webpage)
         if mobj:
             embedded_url = mobj.group(1)
-            return self.playlist_result([self.url_result(embedded_url)], playlist_id=video_id)
+            return self.url_result(embedded_url)
 
         video_title = self._html_search_regex(r'<h1 [^>]*>([^<]+)', webpage, u'title')
         video_url = compat_urllib_parse.unquote(self._html_search_regex(r'video_url=(.+?)&amp;', webpage, u'video_url'))
         if webpage.find('encrypted=true')!=-1:
             password = self._html_search_regex(r'video_title=(.+?)&amp;', webpage, u'password')
             video_url = aes_decrypt_text(video_url, password, 32).decode('utf-8')
-        path = compat_urllib_parse_urlparse( video_url ).path
-        extension = os.path.splitext( path )[1][1:]
+        path = compat_urllib_parse_urlparse(video_url).path
+        extension = os.path.splitext(path)[1][1:]
         format = path.split('/')[4].split('_')[:2]
-        format = "-".join( format )
+        format = "-".join(format)
+
+        age_limit = self._rta_search(webpage)
 
         return {
             'id': video_id,
@@ -55,4 +57,5 @@ class KeezMoviesIE(InfoExtractor):
             'ext': extension,
             'format': format,
             'format_id': format,
+            'age_limit': age_limit,
         }