Update upstream source from tag 'upstream/2020.09.14'

[youtubedl] / youtube_dl / extractor / hidive.py

diff --git a/youtube_dl/extractor/hidive.py b/youtube_dl/extractor/hidive.py
index eee517071e969b176891b34bc795e426c12b7a97..f26f80265678576217994746d9286482c5184a3d 100644 (file)
--- a/youtube_dl/extractor/hidive.py
+++ b/youtube_dl/extractor/hidive.py
@@ -8,6 +8,7 @@ from ..compat import compat_str
 from ..utils import (
     ExtractorError,
     int_or_none,
 from ..utils import (
     ExtractorError,
     int_or_none,

+    url_or_none,

     urlencode_postdata,
 )
 
     urlencode_postdata,
 )
 


@@ -17,6 +18,8 @@ class HiDiveIE(InfoExtractor):
     # Using X-Forwarded-For results in 403 HTTP error for HLS fragments,
     # so disabling geo bypass completely
     _GEO_BYPASS = False
     # Using X-Forwarded-For results in 403 HTTP error for HLS fragments,
     # so disabling geo bypass completely
     _GEO_BYPASS = False

+    _NETRC_MACHINE = 'hidive'
+    _LOGIN_URL = 'https://www.hidive.com/account/login'

 
     _TESTS = [{
         'url': 'https://www.hidive.com/stream/the-comic-artist-and-his-assistants/s01e001',
 
     _TESTS = [{
         'url': 'https://www.hidive.com/stream/the-comic-artist-and-his-assistants/s01e001',


@@ -31,8 +34,26 @@ class HiDiveIE(InfoExtractor):
         'params': {
             'skip_download': True,
         },
         'params': {
             'skip_download': True,
         },

+        'skip': 'Requires Authentication',

     }]
 
     }]
 

+    def _real_initialize(self):
+        email, password = self._get_login_info()
+        if email is None:
+            return
+
+        webpage = self._download_webpage(self._LOGIN_URL, None)
+        form = self._search_regex(
+            r'(?s)<form[^>]+action="/account/login"[^>]*>(.+?)</form>',
+            webpage, 'login form')
+        data = self._hidden_inputs(form)
+        data.update({
+            'Email': email,
+            'Password': password,
+        })
+        self._download_webpage(
+            self._LOGIN_URL, None, 'Logging in', data=urlencode_postdata(data))
+

     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
         title, key = mobj.group('title', 'key')
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
         title, key = mobj.group('title', 'key')


@@ -43,6 +64,7 @@ class HiDiveIE(InfoExtractor):
             data=urlencode_postdata({
                 'Title': title,
                 'Key': key,
             data=urlencode_postdata({
                 'Title': title,
                 'Key': key,

+                'PlayerId': 'f4f895ce1ca713ba263b91caeb1daa2d08904783',

             }))
 
         restriction = settings.get('restrictionReason')
             }))
 
         restriction = settings.get('restrictionReason')


@@ -59,8 +81,8 @@ class HiDiveIE(InfoExtractor):
             bitrates = rendition.get('bitrates')
             if not isinstance(bitrates, dict):
                 continue
             bitrates = rendition.get('bitrates')
             if not isinstance(bitrates, dict):
                 continue

-            m3u8_url = bitrates.get('hls')
-            if not isinstance(m3u8_url, compat_str):
+            m3u8_url = url_or_none(bitrates.get('hls'))
+            if not m3u8_url:

                 continue
             formats.extend(self._extract_m3u8_formats(
                 m3u8_url, video_id, 'mp4', entry_protocol='m3u8_native',
                 continue
             formats.extend(self._extract_m3u8_formats(
                 m3u8_url, video_id, 'mp4', entry_protocol='m3u8_native',


@@ -72,13 +94,13 @@ class HiDiveIE(InfoExtractor):
                 if not isinstance(cc_file, list) or len(cc_file) < 3:
                     continue
                 cc_lang = cc_file[0]
                 if not isinstance(cc_file, list) or len(cc_file) < 3:
                     continue
                 cc_lang = cc_file[0]

-                cc_url = cc_file[2]
-                if not isinstance(cc_lang, compat_str) or not isinstance(
-                        cc_url, compat_str):
+                cc_url = url_or_none(cc_file[2])
+                if not isinstance(cc_lang, compat_str) or not cc_url:

                     continue
                 subtitles.setdefault(cc_lang, []).append({
                     'url': cc_url,
                 })
                     continue
                 subtitles.setdefault(cc_lang, []).append({
                     'url': cc_url,
                 })

+        self._sort_formats(formats)

 
         season_number = int_or_none(self._search_regex(
             r's(\d+)', key, 'season number', default=None))
 
         season_number = int_or_none(self._search_regex(
             r's(\d+)', key, 'season number', default=None))