Update upstream source from tag 'upstream/2018.11.07'

[youtubedl] / youtube_dl / extractor / rudo.py

diff --git a/youtube_dl/extractor/rudo.py b/youtube_dl/extractor/rudo.py
index 38366b784e7fbedce2b2d7de3669db752a6528d0..f036f67579c543dac08123a91f65544589e5641c 100644 (file)
--- a/youtube_dl/extractor/rudo.py
+++ b/youtube_dl/extractor/rudo.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 import re
 
 
 import re
 

-from .jwplatform import JWPlatformBaseIE
+from .common import InfoExtractor

 from ..utils import (
     js_to_json,
     get_element_by_class,
 from ..utils import (
     js_to_json,
     get_element_by_class,


@@ -11,7 +11,7 @@ from ..utils import (
 )
 
 
 )
 
 

-class RudoIE(JWPlatformBaseIE):
+class RudoIE(InfoExtractor):

     _VALID_URL = r'https?://rudo\.video/vod/(?P<id>[0-9a-zA-Z]+)'
 
     _TEST = {
     _VALID_URL = r'https?://rudo\.video/vod/(?P<id>[0-9a-zA-Z]+)'
 
     _TEST = {


@@ -26,9 +26,9 @@ class RudoIE(JWPlatformBaseIE):
     }
 
     @classmethod
     }
 
     @classmethod

-    def _extract_url(self, webpage):
+    def _extract_url(cls, webpage):

         mobj = re.search(
         mobj = re.search(

-            '<iframe[^>]+src=(?P<q1>[\'"])(?P<url>(?:https?:)?//rudo\.video/vod/[0-9a-zA-Z]+)(?P=q1)',
+            r'<iframe[^>]+src=(?P<q1>[\'"])(?P<url>(?:https?:)?//rudo\.video/vod/[0-9a-zA-Z]+)(?P=q1)',

             webpage)
         if mobj:
             return mobj.group('url')
             webpage)
         if mobj:
             return mobj.group('url')


@@ -43,7 +43,7 @@ class RudoIE(JWPlatformBaseIE):
             transform_source=lambda s: js_to_json(re.sub(r'encodeURI\([^)]+\)', '""', s)))
 
         info_dict = self._parse_jwplayer_data(
             transform_source=lambda s: js_to_json(re.sub(r'encodeURI\([^)]+\)', '""', s)))
 
         info_dict = self._parse_jwplayer_data(

-            jwplayer_data, video_id, require_title=False, m3u8_id='hls')
+            jwplayer_data, video_id, require_title=False, m3u8_id='hls', mpd_id='dash')

 
         info_dict.update({
             'title': self._og_search_title(webpage),
 
         info_dict.update({
             'title': self._og_search_title(webpage),