Update changelog.

[youtubedl] / youtube_dl / extractor / fox.py

diff --git a/youtube_dl/extractor/fox.py b/youtube_dl/extractor/fox.py
index facc665f606238fb2ebb54193fe4e525141216f4..11d6c9c3251ff86c6ea26a27a83dec064963ac2c 100644 (file)
--- a/youtube_dl/extractor/fox.py
+++ b/youtube_dl/extractor/fox.py
@@ -2,12 +2,16 @@
 from __future__ import unicode_literals
 
 from .adobepass import AdobePassIE
 from __future__ import unicode_literals
 
 from .adobepass import AdobePassIE

+from .uplynk import UplynkPreplayIE
+from ..compat import compat_str

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

+    HEADRequest,

     int_or_none,
     parse_age_limit,
     parse_duration,
     try_get,
     unified_timestamp,
     int_or_none,
     parse_age_limit,
     parse_duration,
     try_get,
     unified_timestamp,

+    update_url_query,

 )
 
 
 )
 
 


@@ -53,20 +57,14 @@ class FOXIE(AdobePassIE):
             })
 
         title = video['name']
             })
 
         title = video['name']

-
-        m3u8_url = self._download_json(
-            video['videoRelease']['url'], video_id)['playURL']
-
-        formats = self._extract_m3u8_formats(
-            m3u8_url, video_id, 'mp4',
-            entry_protocol='m3u8_native', m3u8_id='hls')
-        self._sort_formats(formats)
+        release_url = video['videoRelease']['url']

 
         description = video.get('description')
         duration = int_or_none(video.get('durationInSeconds')) or int_or_none(
             video.get('duration')) or parse_duration(video.get('duration'))
         timestamp = unified_timestamp(video.get('datePublished'))
 
         description = video.get('description')
         duration = int_or_none(video.get('durationInSeconds')) or int_or_none(
             video.get('duration')) or parse_duration(video.get('duration'))
         timestamp = unified_timestamp(video.get('datePublished'))

-        age_limit = parse_age_limit(video.get('contentRating'))
+        rating = video.get('contentRating')
+        age_limit = parse_age_limit(rating)

 
         data = try_get(
             video, lambda x: x['trackingData']['properties'], dict) or {}
 
         data = try_get(
             video, lambda x: x['trackingData']['properties'], dict) or {}


@@ -81,10 +79,26 @@ class FOXIE(AdobePassIE):
         release_year = int_or_none(video.get('releaseYear'))
 
         if data.get('authRequired'):
         release_year = int_or_none(video.get('releaseYear'))
 
         if data.get('authRequired'):

-            # TODO: AP
-            pass
+            resource = self._get_mvpd_resource(
+                'fbc-fox', title, video.get('guid'), rating)
+            release_url = update_url_query(
+                release_url, {
+                    'auth': self._extract_mvpd_auth(
+                        url, video_id, 'fbc-fox', resource)
+                })
+
+        subtitles = {}
+        for doc_rel in video.get('documentReleases', []):
+            rel_url = doc_rel.get('url')
+            if not url or doc_rel.get('format') != 'SCC':
+                continue
+            subtitles['en'] = [{
+                'url': rel_url,
+                'ext': 'scc',
+            }]
+            break

 
 

-        return {
+        info = {

             'id': video_id,
             'title': title,
             'description': description,
             'id': video_id,
             'title': title,
             'description': description,


@@ -97,5 +111,23 @@ class FOXIE(AdobePassIE):
             'episode': episode,
             'episode_number': episode_number,
             'release_year': release_year,
             'episode': episode,
             'episode_number': episode_number,
             'release_year': release_year,

-            'formats': formats,
+            'subtitles': subtitles,

         }
         }

+
+        urlh = self._request_webpage(HEADRequest(release_url), video_id)
+        video_url = compat_str(urlh.geturl())
+
+        if UplynkPreplayIE.suitable(video_url):
+            info.update({
+                '_type': 'url_transparent',
+                'url': video_url,
+                'ie_key': UplynkPreplayIE.ie_key(),
+            })
+        else:
+            m3u8_url = self._download_json(release_url, video_id)['playURL']
+            formats = self._extract_m3u8_formats(
+                m3u8_url, video_id, 'mp4',
+                entry_protocol='m3u8_native', m3u8_id='hls')
+            self._sort_formats(formats)
+            info['formats'] = formats
+        return info