Imported Upstream version 2015.11.27.1

[youtubedl] / youtube_dl / extractor / playvid.py

diff --git a/youtube_dl/extractor/playvid.py b/youtube_dl/extractor/playvid.py
index b1322f13f8b62a4618b1f857dadf0829b9752238..2eb4fd96dcbc071c1c2ecfb596ab20c4526018bd 100644 (file)
--- a/youtube_dl/extractor/playvid.py
+++ b/youtube_dl/extractor/playvid.py
@@ -3,31 +3,39 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

+from ..compat import (
+    compat_urllib_parse_unquote,
+    compat_urllib_parse_unquote_plus,
+)

 from ..utils import (
 from ..utils import (

-    compat_urllib_parse,
+    clean_html,
+    ExtractorError,

 )
 
 
 class PlayvidIE(InfoExtractor):
 )
 
 
 class PlayvidIE(InfoExtractor):

-    _VALID_URL = r'^https?://www\.playvid\.com/watch(\?v=|/)(?P<id>.+?)(?:#|$)'
+    _VALID_URL = r'https?://www\.playvid\.com/watch(\?v=|/)(?P<id>.+?)(?:#|$)'

     _TEST = {
     _TEST = {

-        'url': 'http://www.playvid.com/watch/agbDDi7WZTV',
-        'md5': '44930f8afa616efdf9482daf4fe53e1e',
+        'url': 'http://www.playvid.com/watch/RnmBNgtrrJu',
+        'md5': 'ffa2f6b2119af359f544388d8c01eb6c',

         'info_dict': {
         'info_dict': {

-            'id': 'agbDDi7WZTV',
+            'id': 'RnmBNgtrrJu',

             'ext': 'mp4',
             'ext': 'mp4',

-            'title': 'Michelle Lewin in Miami Beach',
-            'duration': 240,
+            'title': 'md5:9256d01c6317e3f703848b5906880dc8',
+            'duration': 82,

             'age_limit': 18,
         }
     }
 
     def _real_extract(self, url):
             'age_limit': 18,
         }
     }
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
-
+        video_id = self._match_id(url)

         webpage = self._download_webpage(url, video_id)
 
         webpage = self._download_webpage(url, video_id)
 

+        m_error = re.search(
+            r'<div class="block-error">\s*<div class="heading">\s*<div>(?P<msg>.+?)</div>\s*</div>', webpage)
+        if m_error:
+            raise ExtractorError(clean_html(m_error.group('msg')), expected=True)
+

         video_title = None
         duration = None
         video_thumbnail = None
         video_title = None
         duration = None
         video_thumbnail = None


@@ -37,7 +45,7 @@ class PlayvidIE(InfoExtractor):
         flashvars = self._html_search_regex(
             r'flashvars="(.+?)"', webpage, 'flashvars')
 
         flashvars = self._html_search_regex(
             r'flashvars="(.+?)"', webpage, 'flashvars')
 

-        infos = compat_urllib_parse.unquote(flashvars).split(r'&')
+        infos = compat_urllib_parse_unquote(flashvars).split(r'&')

         for info in infos:
             videovars_match = re.match(r'^video_vars\[(.+?)\]=(.+?)$', info)
             if videovars_match:
         for info in infos:
             videovars_match = re.match(r'^video_vars\[(.+?)\]=(.+?)$', info)
             if videovars_match:


@@ -45,7 +53,7 @@ class PlayvidIE(InfoExtractor):
                 val = videovars_match.group(2)
 
                 if key == 'title':
                 val = videovars_match.group(2)
 
                 if key == 'title':

-                    video_title = compat_urllib_parse.unquote_plus(val)
+                    video_title = compat_urllib_parse_unquote_plus(val)

                 if key == 'duration':
                     try:
                         duration = int(val)
                 if key == 'duration':
                     try:
                         duration = int(val)