Update upstream source from tag 'upstream/2019.09.28'

[youtubedl] / youtube_dl / extractor / normalboots.py

diff --git a/youtube_dl/extractor/normalboots.py b/youtube_dl/extractor/normalboots.py
index 5952d136f7b3efd3e9f91843ba12de6a13d989ba..61fe571dfea17a3fab3206eb6eea0b7a2cbb979b 100644 (file)
--- a/youtube_dl/extractor/normalboots.py
+++ b/youtube_dl/extractor/normalboots.py
@@ -1,7 +1,8 @@
-# encoding: utf-8
+# coding: utf-8

 from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from __future__ import unicode_literals
 
 from .common import InfoExtractor

+from .jwplatform import JWPlatformIE

 
 from ..utils import (
     unified_strdate,
 
 from ..utils import (
     unified_strdate,


@@ -9,10 +10,9 @@ from ..utils import (
 
 
 class NormalbootsIE(InfoExtractor):
 
 
 class NormalbootsIE(InfoExtractor):

-    _VALID_URL = r'http://(?:www\.)?normalboots\.com/video/(?P<id>[0-9a-z-]*)/?$'
+    _VALID_URL = r'https?://(?:www\.)?normalboots\.com/video/(?P<id>[0-9a-z-]*)/?$'

     _TEST = {
         'url': 'http://normalboots.com/video/home-alone-games-jontron/',
     _TEST = {
         'url': 'http://normalboots.com/video/home-alone-games-jontron/',

-        'md5': '8bf6de238915dd501105b44ef5f1e0f6',

         'info_dict': {
             'id': 'home-alone-games-jontron',
             'ext': 'mp4',
         'info_dict': {
             'id': 'home-alone-games-jontron',
             'ext': 'mp4',


@@ -22,9 +22,10 @@ class NormalbootsIE(InfoExtractor):
             'upload_date': '20140125',
         },
         'params': {
             'upload_date': '20140125',
         },
         'params': {

-            # rtmp download
+            # m3u8 download

             'skip_download': True,
         },
             'skip_download': True,
         },

+        'add_ie': ['JWPlatform'],

     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):


@@ -38,16 +39,13 @@ class NormalbootsIE(InfoExtractor):
             r'<span style="text-transform:uppercase; font-size:inherit;">[A-Za-z]+, (?P<date>.*)</span>',
             webpage, 'date', fatal=False))
 
             r'<span style="text-transform:uppercase; font-size:inherit;">[A-Za-z]+, (?P<date>.*)</span>',
             webpage, 'date', fatal=False))
 

-        player_url = self._html_search_regex(
-            r'<iframe\swidth="[0-9]+"\sheight="[0-9]+"\ssrc="(?P<url>[\S]+)"',
-            webpage, 'player url')
-        player_page = self._download_webpage(player_url, video_id)
-        video_url = self._html_search_regex(
-            r"file:\s'(?P<file>[^']+\.mp4)'", player_page, 'file')
+        jwplatform_url = JWPlatformIE._extract_url(webpage)

 
         return {
 
         return {

+            '_type': 'url_transparent',

             'id': video_id,
             'id': video_id,

-            'url': video_url,
+            'url': jwplatform_url,
+            'ie_key': JWPlatformIE.ie_key(),

             'title': self._og_search_title(webpage),
             'description': self._og_search_description(webpage),
             'thumbnail': self._og_search_thumbnail(webpage),
             'title': self._og_search_title(webpage),
             'description': self._og_search_description(webpage),
             'thumbnail': self._og_search_thumbnail(webpage),